diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.BL/DTO')
76 files changed, 40 insertions, 1931 deletions
diff --git a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs deleted file mode 100644 index a847c6f24..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class ActionLogDTO : ActionLogDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs deleted file mode 100644 index 24cf4e94f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/ActionLogDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class ActionLogDTOBase : ObservableEntityDTO<ActionLogDTO, ActionLog> - { - - /// <summary> - /// type - /// </summary> - public Int32 Type - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - /// <summary> - /// related object name - /// </summary> - public String RelatedObjectName - { - get; set; - } - - /// <summary> - /// related object guid - /// </summary> - public String RelatedObjectGuid - { - get; set; - } - - /// <summary> - /// message - /// </summary> - public String Message - { - get; set; - } - - /// <summary> - /// difference - /// </summary> - public String Difference - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs index fd1d707b5..447509ba7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTO.cs @@ -9,14 +9,6 @@ namespace Tango.BL.DTO { public class BrushStopDTO : BrushStopDTOBase { - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(Corrected); - } - protected override string OnGetActionLogName() - { - return $"BrushStop '{StopIndex}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs index e561871d7..41fa3ed57 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs @@ -285,13 +285,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is transparent - /// </summary> - public Boolean IsTransparent - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs index ab141e930..43d24848b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CatDTO.cs @@ -4,26 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class CatDTO : CatDTOBase { - [ObservableDTOProperty(MapsTo = nameof(Cat.LiquidType) + "." + nameof(Cat.LiquidType.Name))] - public String LiquidTypeName { get; set; } - [ObservableDTOProperty(MapsTo = nameof(Cat.Rml) + "." + nameof(Cat.Rml.Name))] - public String RmlName { get; set; } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(CatDTO.Data); - } - - protected override string OnGetActionLogName() - { - return $"'{RmlName}' => '{LiquidTypeName}' Calibration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs index 20d534950..31de24ec0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CatDTOBase.cs @@ -53,13 +53,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// data - /// </summary> - public Byte[] Data - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs index 65cf781f8..96fc02a9e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CctDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class CctDTO : CctDTOBase { - protected override string OnGetActionLogName() - { - return $"CCT '{FileName}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs index 5bfc59bb5..1205a857e 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/CctDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// data - /// </summary> - public Byte[] Data - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs index 7daa98aca..012e7aede 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogDTO : ColorCatalogDTOBase { - public List<ColorCatalogsGroupDTO> ColorCatalogsGroups { get; set; } - public ColorCatalogDTO() - { - ColorCatalogsGroups = new List<ColorCatalogsGroupDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Catalog"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs index bd829e18f..2643b1d29 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogDTOBase.cs @@ -53,21 +53,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// logo - /// </summary> - public Byte[] Logo - { - get; set; - } - - /// <summary> - /// image - /// </summary> - public Byte[] Image - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs index 50c5e051e..8115923e5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsGroupDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogsGroupDTO : ColorCatalogsGroupDTOBase { - public List<ColorCatalogsItemDTO> ColorCatalogsItems { get; set; } - public ColorCatalogsGroupDTO() - { - ColorCatalogsItems = new List<ColorCatalogsItemDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Color Group '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs index 5e0fd3115..46b33b715 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTO.cs @@ -9,11 +9,6 @@ namespace Tango.BL.DTO { public class ColorCatalogsItemDTO : ColorCatalogsItemDTOBase { - public List<ColorCatalogsItemsRecipeDTO> ColorCatalogsItemsRecipes { get; set; } - protected override string OnGetActionLogName() - { - return $"Color Item '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs index 06979a3bb..07c7695e1 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemsRecipeDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class ColorCatalogsItemsRecipeDTO : ColorCatalogsItemsRecipeDTOBase { - [ObservableDTOProperty(MapsTo = nameof(ColorCatalogsItemsRecipe.Rml) + "." + nameof(ColorCatalogsItemsRecipe.Rml.Name))] - public String RmlName { get; set; } - protected override string OnGetActionLogName() - { - return $"Color Recipe for RML '{(RmlName != null ? RmlName : RmlGuid)}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs index 3a3fb4d14..ddb367fc5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorSpaceDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// thumbnail - /// </summary> - public Byte[] Thumbnail - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs index 75049fa88..605a905db 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ConfigurationDTO.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { @@ -12,29 +11,9 @@ namespace Tango.BL.DTO { public List<IdsPackDTO> IdsPacks { get; set; } - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationDisplayPanelVersion) + "." + nameof(Configuration.ApplicationDisplayPanelVersion.Name))] - public String ApplicationDisplayPanelVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationFirmwareVersion) + "." + nameof(Configuration.ApplicationFirmwareVersion.Name))] - public String ApplicationFirmwareVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.ApplicationOsVersion) + "." + nameof(Configuration.ApplicationOsVersion.Name))] - public String ApplicationOsVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.EmbeddedFirmwareVersion) + "." + nameof(Configuration.EmbeddedFirmwareVersion.Name))] - public String EmbeddedFirmwareVersionName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Configuration.HardwareVersion) + "." + nameof(Configuration.HardwareVersion.Name))] - public String HardwareVersionName { get; set; } - public ConfigurationDTO() { IdsPacks = new List<IdsPackDTO>(); } - - protected override string OnGetActionLogName() - { - return "Configuration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs deleted file mode 100644 index 3262970a1..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs +++ /dev/null @@ -1,38 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; -using Tango.DataStore; - -namespace Tango.BL.DTO -{ - public class DataStoreItemDTO : DataStoreItemDTOBase - { - protected override string OnGetActionLogName() - { - return $"'{CollectionName}' => '{Key}'"; - } - - public DataType Type { get; set; } - - public String Val { get; set; } - - protected override void OnFromObservableCompleted(DataStoreItem observable) - { - base.OnFromObservableCompleted(observable); - Type = (DataType)observable.DataType; - Val = DataStoreHelper.FormatDataStoreValue(Type, DataStoreHelper.CreateObject(Type, observable.Value)); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return - propName == nameof(Value) || - propName == nameof(DataType) || - propName == nameof(IsSynchronized); - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs deleted file mode 100644 index 9951338ec..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTOBase.cs +++ /dev/null @@ -1,81 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class DataStoreItemDTOBase : ObservableEntityDTO<DataStoreItemDTO, DataStoreItem> - { - - /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> - /// collection name - /// </summary> - public String CollectionName - { - get; set; - } - - /// <summary> - /// key - /// </summary> - public String Key - { - get; set; - } - - /// <summary> - /// data type - /// </summary> - public Int32 DataType - { - get; set; - } - - /// <summary> - /// value - /// </summary> - public Byte[] Value - { - get; set; - } - - /// <summary> - /// is deleted - /// </summary> - public Boolean IsDeleted - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs index af9c9c7f2..890c87f7b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTO.cs @@ -4,13 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; namespace Tango.BL.DTO { public class DispenserDTO : DispenserDTOBase { - [ActionLogIgnore] - public DispenserTypeDTO DispenserType { get; set; } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs index 6146f01dd..16e19d78a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/DispenserDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// calibration data - /// </summary> - public Byte[] CalibrationData - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs index da6c8eabd..7b8e30dff 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class EventTypeDTOBase : ObservableEntityDTO<EventTypeDTO, EventType> { @@ -117,13 +122,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// persistent - /// </summary> - public Boolean Persistent - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs deleted file mode 100644 index d905492cc..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class FseVersionDTO : FseVersionDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs deleted file mode 100644 index 8a0a55488..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/FseVersionDTOBase.cs +++ /dev/null @@ -1,65 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class FseVersionDTOBase : ObservableEntityDTO<FseVersionDTO, FseVersion> - { - - /// <summary> - /// version - /// </summary> - public String Version - { - get; set; - } - - /// <summary> - /// blob name - /// </summary> - public String BlobName - { - get; set; - } - - /// <summary> - /// installer blob name - /// </summary> - public String InstallerBlobName - { - get; set; - } - - /// <summary> - /// comments - /// </summary> - public String Comments - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs deleted file mode 100644 index c296b01a1..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class GlobalDataStoreItemDTO : GlobalDataStoreItemDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs deleted file mode 100644 index c518aa185..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/GlobalDataStoreItemDTOBase.cs +++ /dev/null @@ -1,57 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class GlobalDataStoreItemDTOBase : ObservableEntityDTO<GlobalDataStoreItemDTO, GlobalDataStoreItem> - { - - /// <summary> - /// collection name - /// </summary> - public String CollectionName - { - get; set; - } - - /// <summary> - /// key - /// </summary> - public String Key - { - get; set; - } - - /// <summary> - /// data type - /// </summary> - public Int32 DataType - { - get; set; - } - - /// <summary> - /// value - /// </summary> - public Byte[] Value - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs index 041f58553..be8a50ca1 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareBlowerDTO : HardwareBlowerDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareBlower.HardwareBlowerType) + "." + nameof(HardwareBlower.HardwareBlowerType.Description))] - public String HardwareBlowerTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareBlowerTypeDTO HardwareBlowerType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Blower '{HardwareBlowerTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs index 4420c2d2c..9fb6b0bdd 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class HardwareBlowerDTOBase : ObservableEntityDTO<HardwareBlowerDTO, HardwareBlower> { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs index a39b0f64b..968070be0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBreakSensorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareBreakSensorDTO : HardwareBreakSensorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareBreakSensor.HardwareBreakSensorType) + "." + nameof(HardwareBreakSensor.HardwareBreakSensorType.Description))] - public String HardwareBreakSensorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareBreakSensorTypeDTO HardwareBreakSensorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Break Sensor '{HardwareBreakSensorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs index 187f7081e..1963ae9d7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareDancerDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareDancerDTO : HardwareDancerDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareDancer.HardwareDancerType) + "." + nameof(HardwareDancer.HardwareDancerType.Description))] - public String HardwareDancerTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareDancerTypeDTO HardwareDancerType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Dancer '{HardwareDancerTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs index eb84f168b..41d53bf2a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareMotorDTO : HardwareMotorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareMotor.HardwareMotorType) + "." + nameof(HardwareMotor.HardwareMotorType.Description))] - public String HardwareMotorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareMotorTypeDTO HardwareMotorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Motor '{HardwareMotorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs index d7d8bf001..4c3125bf7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class HardwareMotorDTOBase : ObservableEntityDTO<HardwareMotorDTO, HardwareMotor> { @@ -309,13 +314,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// p01 config word - /// </summary> - public Int32 P01ConfigWord - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs index 6248ae55c..bd6e344a7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwarePidControlDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwarePidControlDTO : HardwarePidControlDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwarePidControl.HardwarePidControlType) + "." + nameof(HardwarePidControl.HardwarePidControlType.Description))] - public String HardwarePidControlTypeDescription { get; set; } - [ActionLogIgnore] - public HardwarePidControlTypeDTO HardwarePidControlType { get; set; } - - protected override string OnGetActionLogName() - { - return $"PID Control '{HardwarePidControlTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs index 0d0c67d31..14eae14ae 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareSpeedSensorDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareSpeedSensorDTO : HardwareSpeedSensorDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareSpeedSensor.HardwareSpeedSensorType) + "." + nameof(HardwareSpeedSensor.HardwareSpeedSensorType.Description))] - public String HardwareSpeedSensorTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareSpeedSensorTypeDTO HardwareSpeedSensorType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Speed Sensor '{HardwareSpeedSensorTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs index 36681162b..55065b301 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareVersionDTO.cs @@ -9,28 +9,6 @@ namespace Tango.BL.DTO { public class HardwareVersionDTO : HardwareVersionDTOBase { - public List<HardwareBlowerDTO> HardwareBlowers { get; set; } - public List<HardwareBreakSensorDTO> HardwareBreakSensors { get; set; } - public List<HardwareDancerDTO> HardwareDancers { get; set; } - public List<HardwareMotorDTO> HardwareMotors { get; set; } - public List<HardwarePidControlDTO> HardwarePidControls { get; set; } - public List<HardwareSpeedSensorDTO> HardwareSpeedSensors { get; set; } - public List<HardwareWinderDTO> HardwareWinders { get; set; } - public HardwareVersionDTO() - { - HardwareBlowers = new List<HardwareBlowerDTO>(); - HardwareBreakSensors = new List<HardwareBreakSensorDTO>(); - HardwareDancers = new List<HardwareDancerDTO>(); - HardwareMotors = new List<HardwareMotorDTO>(); - HardwarePidControls = new List<HardwarePidControlDTO>(); - HardwareSpeedSensors = new List<HardwareSpeedSensorDTO>(); - HardwareWinders = new List<HardwareWinderDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Hardware Version '{Name} v{Version}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs index 328813083..a65d81791 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareWinderDTO.cs @@ -4,22 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class HardwareWinderDTO : HardwareWinderDTOBase { - [ObservableDTOProperty(MapsTo = nameof(HardwareWinder.HardwareWinderType) + "." + nameof(HardwareWinder.HardwareWinderType.Description))] - public String HardwareWinderTypeDescription { get; set; } - [ActionLogIgnore] - public HardwareWinderTypeDTO HardwareWinderType { get; set; } - - protected override string OnGetActionLogName() - { - return $"Winder '{HardwareWinderTypeDescription}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs index 59b66cc50..3ca1e798b 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/IdsPackDTO.cs @@ -4,46 +4,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.ActionLogs; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class IdsPackDTO : IdsPackDTOBase { - [ObservableDTOProperty(MapsTo = nameof(IdsPack.CartridgeType) + "." + nameof(IdsPack.CartridgeType.Name))] - public String CartridgeTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.IdsPackFormula) + "." + nameof(IdsPack.IdsPackFormula.Name))] - public String IdsPackFormulaName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.LiquidType) + "." + nameof(IdsPack.LiquidType.Name))] - public String LiquidTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.MidTankType) + "." + nameof(IdsPack.MidTankType.Name))] - public String MidTankTypeName { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(IdsPack.Dispenser) + "." + nameof(IdsPack.Dispenser.SerialNumber))] - public String DispenserSerialNumber { get; set; } - - [ActionLogIgnore] public CartridgeTypeDTO CartridgeType { get; set; } - - [ActionLogIgnore] - public DispenserDTO Dispenser { get; set; } - - [ActionLogIgnore] public IdsPackFormulaDTO IdsPackFormula { get; set; } - - [ActionLogIgnore] public LiquidTypeDTO LiquidType { get; set; } - - [ActionLogIgnore] public MidTankTypeDTO MidTankType { get; set; } - - protected override string OnGetActionLogName() - { - return $"IDS Pack '{PackIndex}'"; - } + public DispenserDTO Dispenser { get; set; } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs index 85b51cdc3..137d7b4b3 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTO.cs @@ -9,33 +9,6 @@ namespace Tango.BL.DTO { public class JobDTO : JobDTOBase { - public List<SegmentDTO> Segments { get; set; } - public JobDTO() - { - Segments = new List<SegmentDTO>(); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(JobDTO.LastRun) || - propName == nameof(JobDTO.Status) || - propName == nameof(JobDTO.IsSynchronized) || - propName == nameof(JobDTO.EstimatedDurationMili) || - propName == nameof(JobDTO.EditingState) || - propName == nameof(JobDTO.FineTuningApproveDate) || - propName == nameof(JobDTO.FineTuningStatus) || - propName == nameof(JobDTO.JobIndex) || - propName == nameof(JobDTO.LastRun) || - propName == nameof(JobDTO.SampleDyeApproveDate) || - propName == nameof(JobDTO.SampleDyeStatus) || - propName == nameof(JobDTO.Source) || - propName == nameof(JobDTO.Status); - } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Job"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs index ddf76bff0..f2842c4fd 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class JobDTOBase : ObservableEntityDTO<JobDTO, Job> { @@ -142,14 +147,6 @@ namespace Tango.BL.DTO } /// <summary> - /// embroidery file data - /// </summary> - public Byte[] EmbroideryFileData - { - get; set; - } - - /// <summary> /// embroidery file name /// </summary> public String EmbroideryFileName @@ -158,14 +155,6 @@ namespace Tango.BL.DTO } /// <summary> - /// embroidery jpeg - /// </summary> - public Byte[] EmbroideryJpeg - { - get; set; - } - - /// <summary> /// status /// </summary> public Int32 Status @@ -285,21 +274,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - /// <summary> - /// source - /// </summary> - public Int32 Source - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs index 789aacbb2..112694e1a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs @@ -18,18 +18,15 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class JobRunDTOBase : ObservableEntityDTO<JobRunDTO, JobRun> { /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> /// job guid /// </summary> public String JobGuid @@ -38,54 +35,6 @@ namespace Tango.BL.DTO } /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - /// <summary> - /// user guid - /// </summary> - public String UserGuid - { - get; set; - } - - /// <summary> - /// job name - /// </summary> - public String JobName - { - get; set; - } - - /// <summary> - /// job designation - /// </summary> - public Int32 JobDesignation - { - get; set; - } - - /// <summary> - /// job source - /// </summary> - public Int32 JobSource - { - get; set; - } - - /// <summary> - /// job string - /// </summary> - public String JobString - { - get; set; - } - - /// <summary> /// start date /// </summary> public DateTime StartDate @@ -94,30 +43,6 @@ namespace Tango.BL.DTO } /// <summary> - /// uploading start date - /// </summary> - public Nullable<DateTime> UploadingStartDate - { - get; set; - } - - /// <summary> - /// heating start date - /// </summary> - public Nullable<DateTime> HeatingStartDate - { - get; set; - } - - /// <summary> - /// actual start date - /// </summary> - public Nullable<DateTime> ActualStartDate - { - get; set; - } - - /// <summary> /// end date /// </summary> public DateTime EndDate @@ -134,94 +59,6 @@ namespace Tango.BL.DTO } /// <summary> - /// job length - /// </summary> - public Double JobLength - { - get; set; - } - - /// <summary> - /// is gradient - /// </summary> - public Boolean IsGradient - { - get; set; - } - - /// <summary> - /// gradient resolution cm - /// </summary> - public Int32 GradientResolutionCm - { - get; set; - } - - /// <summary> - /// liquid quantity string - /// </summary> - public String LiquidQuantityString - { - get; set; - } - - /// <summary> - /// cyan quantity - /// </summary> - public Int32 CyanQuantity - { - get; set; - } - - /// <summary> - /// magenta quantity - /// </summary> - public Int32 MagentaQuantity - { - get; set; - } - - /// <summary> - /// yellow quantity - /// </summary> - public Int32 YellowQuantity - { - get; set; - } - - /// <summary> - /// black quantity - /// </summary> - public Int32 BlackQuantity - { - get; set; - } - - /// <summary> - /// transparent quantity - /// </summary> - public Int32 TransparentQuantity - { - get; set; - } - - /// <summary> - /// lubricant quantity - /// </summary> - public Int32 LubricantQuantity - { - get; set; - } - - /// <summary> - /// cleaner quantity - /// </summary> - public Int32 CleanerQuantity - { - get; set; - } - - /// <summary> /// end position /// </summary> public Double EndPosition @@ -237,21 +74,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is head cleaning - /// </summary> - public Boolean IsHeadCleaning - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs index e00510433..cec4185fc 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class LiquidTypeDTO : LiquidTypeDTOBase { - protected override string OnGetActionLogName() - { - return $"Liquid Type '{Name}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs index f58c60b57..6b24599d9 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypeDTOBase.cs @@ -69,13 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// short name - /// </summary> - public String ShortName - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs index e7d940ca4..787a00391 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class LiquidTypesRmlDTO : LiquidTypesRmlDTOBase { - [ObservableDTOProperty(MapsTo = nameof(LiquidTypesRml.LiquidType) + "." + nameof(LiquidTypesRml.LiquidType.Name))] - public String LiquidTypeName { get; set; } - protected override string OnGetActionLogName() - { - return LiquidTypeName != null ? $"Liquid Factor '{LiquidTypeName}'" : $"Liquid Factor '{Guid}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs index 1133f7cc8..badbaf0bc 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/LiquidTypesRmlDTOBase.cs @@ -45,13 +45,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// default cat data - /// </summary> - public Byte[] DefaultCatData - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs index c6758aeff..41eca6693 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTO.cs @@ -9,26 +9,6 @@ namespace Tango.BL.DTO { public class MachineDTO : MachineDTOBase { - public ConfigurationDTO Configuration { get; set; } - //public List<CatDTO> Cats { 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/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs index f88f164cd..e3adf4e0f 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs @@ -54,14 +54,6 @@ namespace Tango.BL.DTO } /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> /// machine version guid /// </summary> public String MachineVersionGuid @@ -261,21 +253,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// head type - /// </summary> - public Int32 HeadType - { - get; set; - } - - /// <summary> - /// activation key - /// </summary> - public String ActivationKey - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs index e990f2a31..8a044f7e8 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/MachinesEventDTOBase.cs @@ -69,13 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs index 66a4625dc..0378ac70a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/OrganizationDTO.cs @@ -9,13 +9,6 @@ namespace Tango.BL.DTO { public class OrganizationDTO : OrganizationDTOBase { - public AddressDTO Address { get; set; } - public ContactDTO Contact { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{Name}' Organization"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs index 84da600a8..9959b2254 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTO.cs @@ -9,9 +9,6 @@ namespace Tango.BL.DTO { public class ProcessParametersTableDTO : ProcessParametersTableDTOBase { - protected override string OnGetActionLogName() - { - return $"Process Table '{Name}'"; - } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index f0699bc72..e8892c64a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -197,93 +197,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// head zone7 temp - /// </summary> - public Double HeadZone7Temp - { - get; set; - } - - /// <summary> - /// head zone8 temp - /// </summary> - public Double HeadZone8Temp - { - get; set; - } - - /// <summary> - /// head zone9 temp - /// </summary> - public Double HeadZone9Temp - { - get; set; - } - - /// <summary> - /// head zone10 temp - /// </summary> - public Double HeadZone10Temp - { - get; set; - } - - /// <summary> - /// head zone11 temp - /// </summary> - public Double HeadZone11Temp - { - get; set; - } - - /// <summary> - /// head zone12 temp - /// </summary> - public Double HeadZone12Temp - { - get; set; - } - - /// <summary> - /// r blower flow - /// </summary> - public Double RBlowerFlow - { - get; set; - } - - /// <summary> - /// r blower temp - /// </summary> - public Double RBlowerTemp - { - get; set; - } - - /// <summary> - /// l blower flow - /// </summary> - public Double LBlowerFlow - { - get; set; - } - - /// <summary> - /// l blower temp - /// </summary> - public Double LBlowerTemp - { - get; set; - } - - /// <summary> - /// pressure build up - /// </summary> - public Double PressureBuildUp - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs index 2091e5e57..8419055c7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTablesGroupDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class ProcessParametersTablesGroupDTO : ProcessParametersTablesGroupDTOBase { - public List<ProcessParametersTableDTO> ProcessParametersTables { get; set; } - public ProcessParametersTablesGroupDTO() - { - ProcessParametersTables = new List<ProcessParametersTableDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Process Group '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs deleted file mode 100644 index e6253c85c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class PublishedProcedureProjectDTO : PublishedProcedureProjectDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs deleted file mode 100644 index 80cabdd19..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class PublishedProcedureProjectDTOBase : ObservableEntityDTO<PublishedProcedureProjectDTO, PublishedProcedureProject> - { - - /// <summary> - /// name - /// </summary> - public String Name - { - get; set; - } - - /// <summary> - /// description - /// </summary> - public String Description - { - get; set; - } - - /// <summary> - /// publish date - /// </summary> - public DateTime PublishDate - { - get; set; - } - - /// <summary> - /// sorting index - /// </summary> - public Int32 SortingIndex - { - get; set; - } - - /// <summary> - /// is visible - /// </summary> - public Boolean IsVisible - { - get; set; - } - - /// <summary> - /// visibility - /// </summary> - public Int32 Visibility - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs deleted file mode 100644 index 4df16c304..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class PublishedProcedureProjectsVersionDTO : PublishedProcedureProjectsVersionDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs deleted file mode 100644 index 53d833d14..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/PublishedProcedureProjectsVersionDTOBase.cs +++ /dev/null @@ -1,57 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class PublishedProcedureProjectsVersionDTOBase : ObservableEntityDTO<PublishedProcedureProjectsVersionDTO, PublishedProcedureProjectsVersion> - { - - /// <summary> - /// published procedure project guid - /// </summary> - public String PublishedProcedureProjectGuid - { - get; set; - } - - /// <summary> - /// version - /// </summary> - public Int32 Version - { - get; set; - } - - /// <summary> - /// author - /// </summary> - public String Author - { - get; set; - } - - /// <summary> - /// project json string - /// </summary> - public String ProjectJsonString - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs index 928d2142d..ef4950fda 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTO.cs @@ -4,31 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class RmlDTO : RmlDTOBase { - public List<ProcessParametersTablesGroupDTO> ProcessParametersTablesGroups { get; set; } - public List<LiquidTypesRmlDTO> LiquidTypesRmls { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Rml.Cct) + "." + nameof(Rml.Cct.FileName))] - public String CctFileName { get; set; } - - public List<RmlsSpoolDTO> RmlsSpools { get; set; } - - public RmlDTO() - { - ProcessParametersTablesGroups = new List<ProcessParametersTablesGroupDTO>(); - LiquidTypesRmls = new List<LiquidTypesRmlDTO>(); - RmlsSpools = new List<RmlsSpoolDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"RML '{Name}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 6bb8e951d..8ed757b8d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -30,14 +30,6 @@ namespace Tango.BL.DTO } /// <summary> - /// display name - /// </summary> - public String DisplayName - { - get; set; - } - - /// <summary> /// manufacturer /// </summary> public String Manufacturer @@ -214,14 +206,6 @@ namespace Tango.BL.DTO } /// <summary> - /// thumbnail - /// </summary> - public Byte[] Thumbnail - { - get; set; - } - - /// <summary> /// cct guid /// </summary> public String CctGuid @@ -237,141 +221,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// use color lib gradients - /// </summary> - public Boolean UseColorLibGradients - { - get; set; - } - - /// <summary> - /// head type - /// </summary> - public Int32 HeadType - { - get; set; - } - - /// <summary> - /// qualification level - /// </summary> - public Int32 QualificationLevel - { - get; set; - } - - /// <summary> - /// qualification date - /// </summary> - public Nullable<DateTime> QualificationDate - { - get; set; - } - - /// <summary> - /// spools calibrations string - /// </summary> - public String SpoolsCalibrationsString - { - get; set; - } - - /// <summary> - /// feeder p - /// </summary> - public Int32 FeederP - { - get; set; - } - - /// <summary> - /// feeder i - /// </summary> - public Int32 FeederI - { - get; set; - } - - /// <summary> - /// feeder d - /// </summary> - public Int32 FeederD - { - get; set; - } - - /// <summary> - /// puller p - /// </summary> - public Int32 PullerP - { - get; set; - } - - /// <summary> - /// puller i - /// </summary> - public Int32 PullerI - { - get; set; - } - - /// <summary> - /// puller d - /// </summary> - public Int32 PullerD - { - get; set; - } - - /// <summary> - /// winder p - /// </summary> - public Int32 WinderP - { - get; set; - } - - /// <summary> - /// winder i - /// </summary> - public Int32 WinderI - { - get; set; - } - - /// <summary> - /// winder d - /// </summary> - public Int32 WinderD - { - get; set; - } - - /// <summary> - /// bypass rockers - /// </summary> - public Boolean BypassRockers - { - get; set; - } - - /// <summary> - /// cleaner flow - /// </summary> - public Int32 CleanerFlow - { - get; set; - } - - /// <summary> - /// arc head cleaning motor speed - /// </summary> - public Double ArcHeadCleaningMotorSpeed - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs deleted file mode 100644 index 9f2ff491e..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class RmlsSpoolDTO : RmlsSpoolDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(RmlsSpool.SpoolType) + "." + nameof(RmlsSpool.SpoolType.Name))] - public String SpoolTypeName { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{(SpoolTypeName != null ? SpoolTypeName : SpoolTypeGuid)}' Calibration"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs deleted file mode 100644 index 1598a321f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs +++ /dev/null @@ -1,73 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class RmlsSpoolDTOBase : ObservableEntityDTO<RmlsSpoolDTO, RmlsSpool> - { - - /// <summary> - /// spool type guid - /// </summary> - public String SpoolTypeGuid - { - get; set; - } - - /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - /// <summary> - /// rotations per passage - /// </summary> - public Nullable<Double> RotationsPerPassage - { - get; set; - } - - /// <summary> - /// length - /// </summary> - public Nullable<Double> Length - { - get; set; - } - - /// <summary> - /// backing rate - /// </summary> - public Nullable<Int32> BackingRate - { - get; set; - } - - /// <summary> - /// bottom backing rate - /// </summary> - public Nullable<Int32> BottomBackingRate - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs index 08fb0b119..064697f6f 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RoleDTO.cs @@ -9,11 +9,6 @@ namespace Tango.BL.DTO { public class RoleDTO : RoleDTOBase { - public List<RolesPermissionDTO> RolesPermissions { get; set; } - public RoleDTO() - { - RolesPermissions = new List<RolesPermissionDTO>(); - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs index c76e648b2..785808578 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RolesPermissionDTO.cs @@ -9,6 +9,6 @@ namespace Tango.BL.DTO { public class RolesPermissionDTO : RolesPermissionDTOBase { - public PermissionDTO Permission { get; set; } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs index 00d74ec30..1db99be23 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SegmentDTO.cs @@ -9,16 +9,6 @@ namespace Tango.BL.DTO { public class SegmentDTO : SegmentDTOBase { - public List<BrushStopDTO> BrushStops { get; set; } - public SegmentDTO() - { - BrushStops = new List<BrushStopDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Segment '{SegmentIndex}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs deleted file mode 100644 index 4d09bda9c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs +++ /dev/null @@ -1,31 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SiteDTO : SiteDTOBase - { - public List<SitesRmlDTO> SitesRmls { get; set; } - - public List<SitesCatalogDTO> SitesCatalogs { get; set; } - - [ObservableDTOProperty(MapsTo = nameof(Site.Organization) + "." + nameof(Site.Organization.Name))] - public String OrganizationName { get; set; } - - public SiteDTO() - { - SitesRmls = new List<SitesRmlDTO>(); - SitesCatalogs = new List<SitesCatalogDTO>(); - } - - protected override string OnGetActionLogName() - { - return $"Site '{Name}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs deleted file mode 100644 index 47d7acc95..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs +++ /dev/null @@ -1,49 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SiteDTOBase : ObservableEntityDTO<SiteDTO, Site> - { - - /// <summary> - /// organization guid - /// </summary> - public String OrganizationGuid - { - get; set; - } - - /// <summary> - /// name - /// </summary> - public String Name - { - get; set; - } - - /// <summary> - /// description - /// </summary> - public String Description - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs deleted file mode 100644 index 3c22989d8..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SitesCatalogDTO : SitesCatalogDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(SitesCatalog.ColorCatalog) + "." + nameof(SitesCatalog.ColorCatalog.Name))] - public String CatalogName { get; set; } - - protected override string OnGetActionLogName() - { - return $"Catalog '{(CatalogName != null ? CatalogName : ColorCatalogGuid)}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs deleted file mode 100644 index 8cff3d047..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SitesCatalogDTOBase : ObservableEntityDTO<SitesCatalogDTO, SitesCatalog> - { - - /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> - /// color catalog guid - /// </summary> - public String ColorCatalogGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs deleted file mode 100644 index fa67f0b3c..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public class SitesRmlDTO : SitesRmlDTOBase - { - [ObservableDTOProperty(MapsTo = nameof(SitesRml.Rml) + "." + nameof(SitesRml.Rml.Name))] - public String RmlName { get; set; } - - protected override string OnGetActionLogName() - { - return $"RML '{(RmlName != null ? RmlName : RmlGuid)}'"; - } - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs deleted file mode 100644 index 1373fedd6..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs +++ /dev/null @@ -1,41 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class SitesRmlDTOBase : ObservableEntityDTO<SitesRmlDTO, SitesRml> - { - - /// <summary> - /// site guid - /// </summary> - public String SiteGuid - { - get; set; - } - - /// <summary> - /// rml guid - /// </summary> - public String RmlGuid - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs index d6d79b1be..bf25d1e71 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTO.cs @@ -4,18 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class SpoolDTO : SpoolDTOBase { - [ObservableDTOProperty(MapsTo = nameof(Spool.SpoolType) + "." + nameof(Spool.SpoolType.Name))] - public String SpoolTypeName { get; set; } - protected override string OnGetActionLogName() - { - return $"'{(SpoolTypeName != null ? SpoolTypeName : SpoolTypeGuid)}' Calibration"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs index c25b254da..346fc4e6d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolDTOBase.cs @@ -40,7 +40,7 @@ namespace Tango.BL.DTO /// <summary> /// start offset pulses /// </summary> - public Nullable<Int32> StartOffsetPulses + public Int32 StartOffsetPulses { get; set; } @@ -48,7 +48,7 @@ namespace Tango.BL.DTO /// <summary> /// backing rate /// </summary> - public Nullable<Int32> BackingRate + public Int32 BackingRate { get; set; } @@ -56,7 +56,7 @@ namespace Tango.BL.DTO /// <summary> /// segment offset pulses /// </summary> - public Nullable<Int32> SegmentOffsetPulses + public Int32 SegmentOffsetPulses { get; set; } @@ -64,15 +64,7 @@ namespace Tango.BL.DTO /// <summary> /// bottom backing rate /// </summary> - public Nullable<Int32> BottomBackingRate - { - get; set; - } - - /// <summary> - /// limit switch start point offset - /// </summary> - public Nullable<Int32> LimitSwitchStartPointOffset + public Int32 BottomBackingRate { get; set; } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs index 5b02cb536..6edd26e22 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs @@ -69,45 +69,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// start offset pulses - /// </summary> - public Int32 StartOffsetPulses - { - get; set; - } - - /// <summary> - /// backing rate - /// </summary> - public Int32 BackingRate - { - get; set; - } - - /// <summary> - /// segment offset pulses - /// </summary> - public Int32 SegmentOffsetPulses - { - get; set; - } - - /// <summary> - /// bottom backing rate - /// </summary> - public Int32 BottomBackingRate - { - get; set; - } - - /// <summary> - /// limit switch start point offset - /// </summary> - public Int32 LimitSwitchStartPointOffset - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs deleted file mode 100644 index 97b53746f..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTO.cs +++ /dev/null @@ -1,14 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.BL.DTO -{ - public class TangoUpdateDTO : TangoUpdateDTOBase - { - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs deleted file mode 100644 index 8e87df812..000000000 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoUpdateDTOBase.cs +++ /dev/null @@ -1,97 +0,0 @@ - -//------------------------------------------------------------------------------ -// <auto-generated> -// This code was generated by a tool. -// Tango Observables Generator -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. Do not modify! -// </auto-generated> -//------------------------------------------------------------------------------ - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.BL.Entities; - -namespace Tango.BL.DTO -{ - public abstract class TangoUpdateDTOBase : ObservableEntityDTO<TangoUpdateDTO, TangoUpdate> - { - - /// <summary> - /// application version - /// </summary> - public String ApplicationVersion - { - get; set; - } - - /// <summary> - /// firmware version - /// </summary> - public String FirmwareVersion - { - get; set; - } - - /// <summary> - /// machine guid - /// </summary> - public String MachineGuid - { - get; set; - } - - /// <summary> - /// status - /// </summary> - public Int32 Status - { - get; set; - } - - /// <summary> - /// failed reason - /// </summary> - public String FailedReason - { - get; set; - } - - /// <summary> - /// failed log - /// </summary> - public String FailedLog - { - get; set; - } - - /// <summary> - /// start date - /// </summary> - public DateTime StartDate - { - get; set; - } - - /// <summary> - /// end date - /// </summary> - public Nullable<DateTime> EndDate - { - get; set; - } - - /// <summary> - /// is synchronized - /// </summary> - public Boolean IsSynchronized - { - get; set; - } - - } -} diff --git a/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs index eea184e2e..3b77ba537 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TangoVersionDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// disabled - /// </summary> - public Boolean Disabled - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs index a7b07fb0c..2e28dfce7 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs @@ -18,6 +18,11 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { + + /// <summary> + /// + /// </summary> + public abstract class TechValveDTOBase : ObservableEntityDTO<TechValveDTO, TechValve> { diff --git a/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs index 4211297dc..f7e94e2ca 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UserDTO.cs @@ -9,25 +9,6 @@ namespace Tango.BL.DTO { public class UserDTO : UserDTOBase { - public AddressDTO Address { get; set; } - public ContactDTO Contact { get; set; } - - public List<UsersRoleDTO> UsersRoles { get; set; } - - public UserDTO() - { - UsersRoles = new List<UsersRoleDTO>(); - } - - protected override bool OnShouldActionLogIgnore(string propName) - { - return propName == nameof(UserDTO.LastLogin); - } - - protected override string OnGetActionLogName() - { - return $"User '{Email}'"; - } } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs index 33b5991e3..30f4eca26 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UserDTOBase.cs @@ -77,13 +77,5 @@ namespace Tango.BL.DTO get; set; } - /// <summary> - /// password change required - /// </summary> - public Boolean PasswordChangeRequired - { - get; set; - } - } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs index 0fc31a2e2..71540b3c8 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/UsersRoleDTO.cs @@ -4,20 +4,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Tango.BL.Entities; namespace Tango.BL.DTO { public class UsersRoleDTO : UsersRoleDTOBase { - [ObservableDTOProperty(MapsTo = nameof(UsersRole.Role) + "." + nameof(UsersRole.Role.Name))] - public String RoleName { get; set; } - public RoleDTO Role { get; set; } - - protected override string OnGetActionLogName() - { - return $"'{RoleName}' Role"; - } } } |