From 981aa1aa04eebd3aba8380e686875024f2a5aaf6 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 10 Nov 2019 15:45:17 +0200 Subject: Added Color Conversion v3. Machine Studio v4.0.32 PPC v1.0.50 --- .../MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index 50f6a6297..e34854046 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -191,7 +191,7 @@ - + -- cgit v1.3.1 From bf432bf7b7faa7c51e74462e19eb3e50c28b4aa8 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 22 Jan 2020 18:00:55 +0200 Subject: Implemented StringFormat control for db properties. Added StringFormat 0.000 for FeederTension on ProcessParameters. --- .../Views/JobView.xaml | 2 +- .../Views/ProcessParametersView.xaml | 2 +- .../Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs | 5 --- .../Tango.BL/DTO/HardwareBlowerDTOBase.cs | 5 --- .../Tango.BL/DTO/HardwareMotorDTOBase.cs | 5 --- Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs | 5 --- .../Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs | 5 --- .../Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs | 5 --- .../Tango.BL/Entities/ActionLogBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/AddressBase.cs | 1 + .../Entities/ApplicationDisplayPanelVersionBase.cs | 1 + .../Entities/ApplicationFirmwareVersionBase.cs | 1 + .../Tango.BL/Entities/ApplicationOsVersionBase.cs | 1 + .../Tango.BL/Entities/BrushStopBase.cs | 1 + .../Tango.BL/Entities/CartridgeTypeBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/CatBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/CctBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogsGroupBase.cs | 1 + .../Tango.BL/Entities/ColorCatalogsItemBase.cs | 1 + .../Entities/ColorCatalogsItemsRecipeBase.cs | 1 + .../Tango.BL/Entities/ColorSpaceBase.cs | 1 + .../Tango.BL/Entities/ConfigurationBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/ContactBase.cs | 1 + .../Tango.BL/Entities/CustomerBase.cs | 1 + .../Tango.BL/Entities/DispenserBase.cs | 1 + .../Tango.BL/Entities/DispenserTypeBase.cs | 1 + .../Entities/EmbeddedFirmwareVersionBase.cs | 1 + .../Tango.BL/Entities/EventTypeBase.cs | 6 +--- .../Tango.BL/Entities/FiberShapeBase.cs | 1 + .../Tango.BL/Entities/FiberSynthBase.cs | 1 + .../Tango.BL/Entities/HardwareBlowerBase.cs | 9 +++--- .../Tango.BL/Entities/HardwareBlowerTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareBreakSensorBase.cs | 1 + .../Entities/HardwareBreakSensorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareDancerBase.cs | 1 + .../Tango.BL/Entities/HardwareDancerTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareMotorBase.cs | 6 +--- .../Tango.BL/Entities/HardwareMotorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwarePidControlBase.cs | 1 + .../Entities/HardwarePidControlTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareSpeedSensorBase.cs | 1 + .../Entities/HardwareSpeedSensorTypeBase.cs | 1 + .../Tango.BL/Entities/HardwareVersionBase.cs | 1 + .../Tango.BL/Entities/HardwareWinderBase.cs | 1 + .../Tango.BL/Entities/HardwareWinderTypeBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/IdsPackBase.cs | 1 + .../Tango.BL/Entities/IdsPackFormulaBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/JobBase.cs | 6 +--- .../Visual_Studio/Tango.BL/Entities/JobRunBase.cs | 6 +--- .../Tango.BL/Entities/LinearMassDensityUnitBase.cs | 1 + .../Tango.BL/Entities/LiquidTypeBase.cs | 1 + .../Tango.BL/Entities/LiquidTypesRmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/MachineBase.cs | 1 + .../Tango.BL/Entities/MachineStudioVersionBase.cs | 1 + .../Tango.BL/Entities/MachineVersionBase.cs | 1 + .../Tango.BL/Entities/MachinesEventBase.cs | 1 + .../Tango.BL/Entities/MediaConditionBase.cs | 1 + .../Tango.BL/Entities/MediaMaterialBase.cs | 1 + .../Tango.BL/Entities/MediaPurposBase.cs | 1 + .../Tango.BL/Entities/MidTankTypeBase.cs | 1 + .../Tango.BL/Entities/OrganizationBase.cs | 1 + .../Tango.BL/Entities/PermissionBase.cs | 1 + .../Entities/ProcessParametersTableBase.cs | 3 ++ .../Entities/ProcessParametersTablesGroupBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/RmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/RoleBase.cs | 1 + .../Tango.BL/Entities/RolesPermissionBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SegmentBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SiteBase.cs | 1 + .../Tango.BL/Entities/SitesCatalogBase.cs | 1 + .../Tango.BL/Entities/SitesRmlBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/SpoolBase.cs | 1 + .../Tango.BL/Entities/SpoolTypeBase.cs | 1 + .../Tango.BL/Entities/SyncConfigurationBase.cs | 1 + .../Tango.BL/Entities/SysdiagramBase.cs | 1 + .../Tango.BL/Entities/TangoUpdateBase.cs | 1 + .../Tango.BL/Entities/TangoVersionBase.cs | 1 + .../Tango.BL/Entities/TechControllerBase.cs | 1 + .../Tango.BL/Entities/TechDispenserBase.cs | 1 + .../Tango.BL/Entities/TechHeaterBase.cs | 1 + .../Visual_Studio/Tango.BL/Entities/TechIoBase.cs | 1 + .../Tango.BL/Entities/TechMonitorBase.cs | 1 + .../Tango.BL/Entities/TechValveBase.cs | 6 +--- .../Visual_Studio/Tango.BL/Entities/UserBase.cs | 1 + .../Tango.BL/Entities/UsersRoleBase.cs | 1 + .../Tango.BL/Entities/WindingMethodBase.cs | 1 + .../DbPropertyExtensionModel.cs | 36 ++++++++++++++++++++++ .../Tango.CodeGeneration/EntityCodeFile.cs | 2 +- .../Tango.CodeGeneration/RangeDescriptionModel.cs | 15 --------- .../Tango.CodeGeneration.csproj | 4 +-- .../Templates/EntityCodeFile.cshtml | 25 ++++++++++++--- .../CustomAttributes/StringFormatAttribute.cs | 24 +++++++++++++++ .../ExtensionMethods/IParameterizedExtensions.cs | 7 +++++ Software/Visual_Studio/Tango.Core/ParameterItem.cs | 13 ++++++++ .../Visual_Studio/Tango.Core/Tango.Core.csproj | 3 +- .../ObservablesGenerator.cs | 21 ++++++++----- .../Utilities/Tango.PMRGenerator.CLI/Program.cs | 4 +-- 98 files changed, 207 insertions(+), 95 deletions(-) create mode 100644 Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs delete mode 100644 Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs create mode 100644 Software/Visual_Studio/Tango.Core/CustomAttributes/StringFormatAttribute.cs (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 3e6ffd396..b49f1407c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -1553,7 +1553,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml index b85fd2c12..cae614aeb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ProcessParametersView.xaml @@ -70,7 +70,7 @@ - + diff --git a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs index 7b8e30dff..a708cccaf 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/EventTypeDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class EventTypeDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs index 9fb6b0bdd..4420c2d2c 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareBlowerDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class HardwareBlowerDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs index 4c3125bf7..fcd36bb5d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/HardwareMotorDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class HardwareMotorDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs index 073d833f2..ddf76bff0 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class JobDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs index 40d0a14c4..61d36d1e5 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class JobRunDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs index 2e28dfce7..a7b07fb0c 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/TechValveDTOBase.cs @@ -18,11 +18,6 @@ using Tango.BL.Entities; namespace Tango.BL.DTO { - - /// - /// - /// - public abstract class TechValveDTOBase : ObservableEntityDTO { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs index 077c834d2..060d81f8b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ActionLogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs index f88efdb71..7e1229b98 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/AddressBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs index 1671069b3..82a5ea94b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationDisplayPanelVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs index c54fe23d6..a816c7ad3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationFirmwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs index 0e06e48db..20b58dbf2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ApplicationOsVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 0f742cc0b..89114f2c3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs index 6281c7606..e0684e304 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CartridgeTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs index 17bfd3f87..0c73be9ab 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CatBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs index 92f4f17b9..158615777 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CctBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs index f19eda455..df1056469 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs index 3e0491ec5..bc20a0c2e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsGroupBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs index fe026fc32..30d77a051 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs index a0a324b9f..19b3aed14 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemsRecipeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs index 9098a2eab..b35ca0431 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorSpaceBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs index 6b19ebb7f..d7a90bcfd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ConfigurationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs index 610fcc27b..6fd8c9f4c 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ContactBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs index 1d3dd576c..68e6b2df1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/CustomerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs index a908da29c..8343fdb65 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs index 04f4dc261..829ea0cba 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/DispenserTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs index 148d53c6c..25c7df99f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EmbeddedFirmwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs index f0100fe06..49675a89b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventTypeBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("EVENT_TYPES")] public abstract class EventTypeBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs index cdc9bb76c..cfb335f62 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberShapeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs index d04050c4a..dfb34224b 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/FiberSynthBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs index bbc55d245..5cc6c4931 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("HARDWARE_BLOWERS")] public abstract class HardwareBlowerBase : ObservableEntity { @@ -131,8 +127,11 @@ namespace Tango.BL.Entities [Column("VOLTAGE")] [Description("Voltage Description")] + [Range(-10000,1000000)] + [StringFormat("0.0")] + public Double Voltage { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs index dc614bd0c..99dadd1f5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs index 9cbaac688..1ca65ab51 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs index 5d69f19b5..77a53c9a0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBreakSensorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs index a3fa5c1aa..65d60714a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs index 3cd885790..7bff7c035 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareDancerTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs index e08a2b5b0..a0fb6f66e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("HARDWARE_MOTORS")] public abstract class HardwareMotorBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs index a63a148da..59ceeada9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareMotorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs index e12e40f32..ccd56bca3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs index dbb8d2a1d..d148ea177 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwarePidControlTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs index 3b7bb1e72..5661225cb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs index 74ff9761d..384462516 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareSpeedSensorTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs index c3bc80696..3d7d555dc 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs index 4c2808581..8bcc5bb14 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs index 8c8055c1e..340748f97 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareWinderTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs index b3e62f1fe..650d93098 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs index 0108dc3f5..62d88bc77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/IdsPackFormulaBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs index 45e0e3437..a535a78bd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("JOBS")] public abstract class JobBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs index 5e8a3b62c..7d56f3fa8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("JOB_RUNS")] public abstract class JobRunBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs index ccd78a60b..8f3ca38e8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LinearMassDensityUnitBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs index 7683eadbc..723b8aaa7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs index 5aad28034..ef9e80cb9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidTypesRmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs index c02b103dd..b1fd12a53 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs index 83bf72451..65630a630 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineStudioVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs index 30602025e..440eaf723 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs index 0a3377dce..161e25d77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachinesEventBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs index 12405642a..ec7501ba4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaConditionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs index 2d0529506..860337fae 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaMaterialBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs index 91fd93bd4..7a099ebeb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MediaPurposBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs index 2467bcd8c..34c40f2a0 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MidTankTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs index c83d1a7c9..7fb8699af 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/OrganizationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs index 7f6ba7499..d86097af1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/PermissionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 2757b0625..1cc189e70 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { @@ -186,6 +187,8 @@ namespace Tango.BL.Entities [Column("FEEDER_TENSION")] + [StringFormat("0.000")] + public Double FeederTension { get diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs index 79e252b44..005dd5b40 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTablesGroupBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 86545b913..6901fb973 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs index cca6b7600..ed8d67233 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RoleBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs index bdaaaac3c..6fa2adf77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RolesPermissionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs index 40f86a34c..f98239bf3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SegmentBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs index f4881ae79..071dd7ea9 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs index 15f7ef6df..4f4665203 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs index 6893099e4..d9111def7 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs index 5794da91b..303f2ecbb 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs index 55edff2e0..778369948 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs index 91b1ca9ac..ea816c4f3 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SyncConfigurationBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs index 2e99df9b0..6be908bb4 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SysdiagramBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs index 57475977b..677886b47 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoUpdateBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs index ddf7561af..f39df936a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TangoVersionBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs index 72fe76f3c..b060ded50 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechControllerBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs index ccb3e7c03..ba6309950 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechDispenserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs index 2fc68c69c..5dc7d2a5a 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechHeaterBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs index 0b140690f..e027e81b1 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechIoBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs index d7ff856b6..f9f9c7140 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechMonitorBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs index 5275c924b..e22bd450e 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/TechValveBase.cs @@ -19,14 +19,10 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { - - /// - /// - /// - [Table("TECH_VALVES")] public abstract class TechValveBase : ObservableEntity { diff --git a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs index cb7692b2d..5e3fa1a8f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UserBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs index 2927d05f1..877f66c72 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/UsersRoleBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs index ce4c22313..e64f989aa 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/WindingMethodBase.cs @@ -19,6 +19,7 @@ using System.Linq; using Tango.DAL.Remote.DB; using Tango.Core; using System.ComponentModel; +using Tango.Core.CustomAttributes; namespace Tango.BL.Entities { diff --git a/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs new file mode 100644 index 000000000..873aabe1e --- /dev/null +++ b/Software/Visual_Studio/Tango.CodeGeneration/DbPropertyExtensionModel.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.CodeGeneration +{ + public class DbPropertyExtensionModel + { + public String Description { get; set; } + public double Min { get; set; } + public double Max { get; set; } + public String StringFormat { get; set; } + + public bool HasDescription + { + get { return Description != null; } + } + + public bool HasRange + { + get { return Min != Max; } + } + + public bool HasStringFormat + { + get { return StringFormat != null; } + } + + public DbPropertyExtensionModel() + { + StringFormat = "0.0"; + } + } +} diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs index 24d61bb0a..8126c8bc4 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs +++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFile.cs @@ -66,7 +66,7 @@ namespace Tango.CodeGeneration public String DbDescription { get; set; } - public RangeDescriptionModel RangeDescription { get; set; } + public DbPropertyExtensionModel PropertyExtension { get; set; } public bool IsForeignKey { get; set; } diff --git a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs b/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs deleted file mode 100644 index 4600460b7..000000000 --- a/Software/Visual_Studio/Tango.CodeGeneration/RangeDescriptionModel.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Tango.CodeGeneration -{ - public class RangeDescriptionModel - { - public String Description { get; set; } - public double Min { get; set; } - public double Max { get; set; } - } -} diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj index 6bff5b42e..4c2793367 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj +++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj @@ -77,7 +77,7 @@ - + @@ -129,7 +129,7 @@ - +