diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.BL')
4 files changed, 13 insertions, 7 deletions
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs index 75049fa88..5e54c70c1 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs @@ -12,6 +12,8 @@ namespace Tango.BL.DTO { public List<IdsPackDTO> IdsPacks { get; set; } + public HardwareVersionDTO HardwareVersion { get; set; } + [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationDisplayPanelVersion) + "." + nameof(Configuration.ApplicationDisplayPanelVersion.Name))] public String ApplicationDisplayPanelVersionName { get; set; } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs index c6758aeff..4b8dcbeee 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs @@ -11,21 +11,17 @@ namespace Tango.BL.DTO { public ConfigurationDTO Configuration { get; set; } - //public List<CatDTO> Cats { get; set; } + public OrganizationDTO Organization { get; set; } + + public MachineVersionDTO MachineVersion { get; set; } public List<SpoolDTO> Spools { get; set; } public MachineDTO() { - //Cats = new List<CatDTO>(); Spools = new List<SpoolDTO>(); } - //protected override bool OnShouldActionLogIgnore(string propName) - //{ - // return propName == nameof(MachineDTO.Cats); - //} - protected override string OnGetActionLogName() { return $"Machine '{SerialNumber}'"; diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs index e6253c85c..db6b5d1ee 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs @@ -9,6 +9,11 @@ namespace Tango.BL.DTO { public class PublishedProcedureProjectDTO : PublishedProcedureProjectDTOBase { + public List<PublishedProcedureProjectsVersionDTO> PublishedProcedureProjectsVersions { get; set; } + public PublishedProcedureProjectDTO() + { + PublishedProcedureProjectsVersions = new List<PublishedProcedureProjectsVersionDTO>(); + } } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/User.cs b/Software/Visual_Studio/Tango.BL/Entities/User.cs index f13a5e20c..f0bad3bef 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/User.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/User.cs @@ -51,6 +51,7 @@ namespace Tango.BL.Entities /// Gets the aggregated user roles. /// </summary> [NotMapped] + [JsonIgnore] public List<Role> Roles { get { return UsersRoles.Select(x => x.Role).ToList(); } @@ -60,6 +61,7 @@ namespace Tango.BL.Entities /// Gets the aggregated FSE user roles. /// </summary> [NotMapped] + [JsonIgnore] public List<Role> FSERoles { get { return UsersRoles.Select(x => x.Role).Where(x => x.Name.StartsWith("FSE")).ToList(); } @@ -69,6 +71,7 @@ namespace Tango.BL.Entities /// Gets the aggregated user permissions as enumerations. /// </summary> [NotMapped] + [JsonIgnore] public List<Permission> Permissions { get |