diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Observables')
56 files changed, 317 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs index b3f5c7e1f..ee6767699 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ActionType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs index f736572df..1617e325b 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Address.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs index dd3c3ce14..e508c6ce1 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationDisplayPanelVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs index 8d5868e2a..18b263675 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationFirmwareVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs index 844a4ac99..c3c770b6a 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationOsVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs index 23e530e9b..91463284b 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ApplicationVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs index c41547588..8c9a1120f 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/BrushStop.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("SEGMENT_GUID")] [ForeignKey("Segment")] + public String SegmentGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("COLOR_SPACE_GUID")] [ForeignKey("ColorSpace")] + public String ColorSpaceGuid { get @@ -457,6 +461,7 @@ namespace Tango.Integration.Observables /// Gets or sets the brushstop panton guid. /// </summary> [Column("PANTON_GUID")] + public String PantonGuid { get @@ -476,6 +481,8 @@ namespace Tango.Integration.Observables /// Gets or sets the brushstop color spaces. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ColorSpace ColorSpace { get @@ -495,6 +502,8 @@ namespace Tango.Integration.Observables /// Gets or sets the brushstop segment. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Segment Segment { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs index 532f6416d..648993cfe 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/CartridgeType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs index 80d47a247..a9aa55890 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cat.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -38,6 +40,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("LIQUID_TYPE_GUID")] [ForeignKey("LiquidType")] + public String LiquidTypeGuid { get @@ -58,6 +61,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("RML_GUID")] [ForeignKey("Rml")] + public String RmlGuid { get @@ -97,6 +101,8 @@ namespace Tango.Integration.Observables /// Gets or sets the cat liquid types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual LiquidType LiquidType { get @@ -116,6 +122,8 @@ namespace Tango.Integration.Observables /// Gets or sets the cat rml. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Rml Rml { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs index 069e1df1d..9355d7b24 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Cct.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -158,6 +160,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("RML_GUID")] [ForeignKey("Rml")] + public String RmlGuid { get @@ -177,6 +180,8 @@ namespace Tango.Integration.Observables /// Gets or sets the cct rml. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Rml Rml { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs index 79f1b5afd..b473fdecc 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ColorSpace.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs index fb993a36e..78470f2ff 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Configuration.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -58,6 +60,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("APPLICATION_VERSION_GUID")] [ForeignKey("ApplicationVersion")] + public String ApplicationVersionGuid { get @@ -78,6 +81,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("APPLICATION_OS_VERSION_GUID")] [ForeignKey("ApplicationOsVersion")] + public String ApplicationOsVersionGuid { get @@ -98,6 +102,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("APPLICATION_FIRMWARE_VERSION_GUID")] [ForeignKey("ApplicationFirmwareVersion")] + public String ApplicationFirmwareVersionGuid { get @@ -118,6 +123,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("APPLICATION_DISPLAY_PANEL_VERSION_GUID")] [ForeignKey("ApplicationDisplayPanelVersion")] + public String ApplicationDisplayPanelVersionGuid { get @@ -138,6 +144,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("EMBEDDED_FIRMWARE_VERSION_GUID")] [ForeignKey("EmbeddedFirmwareVersion")] + public String EmbeddedFirmwareVersionGuid { get @@ -158,6 +165,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("EMBEDDED_SOFTWARE_VERSION_GUID")] [ForeignKey("EmbeddedSoftwareVersion")] + public String EmbeddedSoftwareVersionGuid { get @@ -178,6 +186,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("HARDWARE_VERSION_GUID")] [ForeignKey("HardwareVersion")] + public String HardwareVersionGuid { get @@ -197,6 +206,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration application display panel versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ApplicationDisplayPanelVersion ApplicationDisplayPanelVersion { get @@ -216,6 +227,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration application firmware versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ApplicationFirmwareVersion ApplicationFirmwareVersion { get @@ -235,6 +248,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration application os versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ApplicationOsVersion ApplicationOsVersion { get @@ -254,6 +269,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration application versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ApplicationVersion ApplicationVersion { get @@ -273,6 +290,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration embedded firmware versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual EmbeddedFirmwareVersion EmbeddedFirmwareVersion { get @@ -292,6 +311,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration embedded software versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual EmbeddedSoftwareVersion EmbeddedSoftwareVersion { get @@ -311,6 +332,8 @@ namespace Tango.Integration.Observables /// Gets or sets the configuration hardware versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual HardwareVersion HardwareVersion { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs index 78c44ba7f..b56ca2044 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Contact.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs index 12be3f9eb..2402c2aba 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/DispenserType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs index bff60e190..13ab466ca 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedFirmwareVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs index 1f39794cf..c433b0656 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EmbeddedSoftwareVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs index 26e6c4ab4..023a33863 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs index 77da6e91b..94555000d 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/EventTypesAction.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("EVENT_TYPE_GUID")] [ForeignKey("EventType")] + public String EventTypeGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ACTION_TYPE_GUID")] [ForeignKey("ActionType")] + public String ActionTypeGuid { get @@ -57,6 +61,8 @@ namespace Tango.Integration.Observables /// Gets or sets the eventtypesaction action types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ActionType ActionType { get @@ -76,6 +82,8 @@ namespace Tango.Integration.Observables /// Gets or sets the eventtypesaction event types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual EventType EventType { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs index 088561b83..c690e65da 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberShape.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs index d5f1eaa0b..42d5b5cdc 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/FiberSynth.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs index 033623160..2b892a1c1 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/HardwareVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs index 6029fbf00..e708a33e7 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPack.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CONFIGURATION_GUID")] [ForeignKey("Configuration")] + public String ConfigurationGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("DISPENSER_TYPE_GUID")] [ForeignKey("DispenserType")] + public String DispenserTypeGuid { get @@ -58,6 +62,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("LIQUID_TYPE_GUID")] [ForeignKey("LiquidType")] + public String LiquidTypeGuid { get @@ -78,6 +83,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CARTRIDGE_TYPE_GUID")] [ForeignKey("CartridgeType")] + public String CartridgeTypeGuid { get @@ -98,6 +104,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MID_TANK_TYPE_GUID")] [ForeignKey("MidTankType")] + public String MidTankTypeGuid { get @@ -158,6 +165,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("IDS_PACK_FORMULA_GUID")] [ForeignKey("IdsPackFormula")] + public String IdsPackFormulaGuid { get @@ -177,6 +185,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack cartridge types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual CartridgeType CartridgeType { get @@ -196,6 +206,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack configuration. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Configuration Configuration { get @@ -215,6 +227,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack dispenser types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual DispenserType DispenserType { get @@ -234,6 +248,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack ids pack formulas. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual IdsPackFormula IdsPackFormula { get @@ -253,6 +269,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack liquid types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual LiquidType LiquidType { get @@ -272,6 +290,8 @@ namespace Tango.Integration.Observables /// Gets or sets the idspack mid tank types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MidTankType MidTankType { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs index 76be59dca..dbde816e9 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/IdsPackFormula.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs index 8b26a62d9..d95d44c4c 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -58,6 +60,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MACHINE_GUID")] [ForeignKey("Machine")] + public String MachineGuid { get @@ -78,6 +81,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("USER_GUID")] [ForeignKey("User")] + public String UserGuid { get @@ -98,6 +102,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("RML_GUID")] [ForeignKey("Rml")] + public String RmlGuid { get @@ -118,6 +123,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("WINDING_METHOD_GUID")] [ForeignKey("WindingMethod")] + public String WindingMethodGuid { get @@ -276,6 +282,8 @@ namespace Tango.Integration.Observables /// Gets or sets the job machine. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Machine Machine { get @@ -295,6 +303,8 @@ namespace Tango.Integration.Observables /// Gets or sets the job rml. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Rml Rml { get @@ -314,6 +324,8 @@ namespace Tango.Integration.Observables /// Gets or sets the job user. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual User User { get @@ -333,6 +345,8 @@ namespace Tango.Integration.Observables /// Gets or sets the job winding methods. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual WindingMethod WindingMethod { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs index 2d795b0b5..40922aa61 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/JobRun.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("JOB_GUID")] [ForeignKey("Job")] + public String JobGuid { get @@ -97,6 +100,8 @@ namespace Tango.Integration.Observables /// Gets or sets the jobrun job. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Job Job { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs index 6fcf7e0f3..73f5f0f68 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LinearMassDensityUnit.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs index 8c885d099..afde6e7e5 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs index 4002afa64..09e9c80a5 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/LiquidTypesRml.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("LIQUID_TYPE_GUID")] [ForeignKey("LiquidType")] + public String LiquidTypeGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("RML_GUID")] [ForeignKey("Rml")] + public String RmlGuid { get @@ -77,6 +81,8 @@ namespace Tango.Integration.Observables /// Gets or sets the liquidtypesrml liquid types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual LiquidType LiquidType { get @@ -96,6 +102,8 @@ namespace Tango.Integration.Observables /// Gets or sets the liquidtypesrml rml. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Rml Rml { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs index fea07023f..412c72a01 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Machine.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -78,6 +80,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ORGANIZATION_GUID")] [ForeignKey("Organization")] + public String OrganizationGuid { get @@ -98,6 +101,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MACHINE_VERSION_GUID")] [ForeignKey("MachineVersion")] + public String MachineVersionGuid { get @@ -118,6 +122,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CONFIGURATION_GUID")] [ForeignKey("Configuration")] + public String ConfigurationGuid { get @@ -137,6 +142,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machine configuration. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Configuration Configuration { get @@ -175,6 +182,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machine machine versions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MachineVersion MachineVersion { get @@ -232,6 +241,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machine organization. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Organization Organization { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs index fc7184be1..dedd1c628 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachineVersion.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -58,6 +60,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("DEFAULT_CONFIGURATION_GUID")] [ForeignKey("DefaultConfiguration")] + public String DefaultConfigurationGuid { get @@ -77,6 +80,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machineversion configuration. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Configuration DefaultConfiguration { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs index de79ac7af..68db1ba8f 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesConfiguration.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MACHINE_GUID")] [ForeignKey("Machine")] + public String MachineGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CONFIGURATION_GUID")] [ForeignKey("Configuration")] + public String ConfigurationGuid { get @@ -57,6 +61,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machinesconfiguration configuration. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Configuration Configuration { get @@ -76,6 +82,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machinesconfiguration machine. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Machine Machine { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs index cc4ad8961..cb4727974 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MachinesEvent.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MACHINE_GUID")] [ForeignKey("Machine")] + public String MachineGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("EVENT_TYPE_GUID")] [ForeignKey("EventType")] + public String EventTypeGuid { get @@ -58,6 +62,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("USER_GUID")] [ForeignKey("User")] + public String UserGuid { get @@ -117,6 +122,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machinesevent event types. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual EventType EventType { get @@ -136,6 +143,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machinesevent machine. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Machine Machine { get @@ -155,6 +164,8 @@ namespace Tango.Integration.Observables /// Gets or sets the machinesevent user. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual User User { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs index 36e4108e5..eb05357ad 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaColor.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs index 936c0170a..558296d4b 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaCondition.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs index beb27e9ea..44571b269 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaMaterial.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs index 43448504a..cfc3166f7 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MediaPurpos.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs index a68d18241..315aa12b1 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/MidTankType.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs index ca43cf4ed..014e8bc12 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Organization.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -38,6 +40,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CONTACT_GUID")] [ForeignKey("Contact")] + public String ContactGuid { get @@ -58,6 +61,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ADDRESS_GUID")] [ForeignKey("Address")] + public String AddressGuid { get @@ -77,6 +81,8 @@ namespace Tango.Integration.Observables /// Gets or sets the organization address. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Address Address { get @@ -96,6 +102,8 @@ namespace Tango.Integration.Observables /// Gets or sets the organization contact. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Contact Contact { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs index c9c21d7ac..71fb57280 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Permission.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs index 0d6fd9480..ef41ad360 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTable.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -338,6 +340,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("PROCESS_PARAMETERS_TABLES_GROUP_GUID")] [ForeignKey("ProcessParametersTablesGroup")] + public String ProcessParametersTablesGroupGuid { get @@ -377,6 +380,8 @@ namespace Tango.Integration.Observables /// Gets or sets the processparameterstable process parameters tables groups. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual ProcessParametersTablesGroup ProcessParametersTablesGroup { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs index d553952fc..b3ccadb77 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/ProcessParametersTablesGroup.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("RML_GUID")] [ForeignKey("Rml")] + public String RmlGuid { get @@ -116,6 +119,8 @@ namespace Tango.Integration.Observables /// Gets or sets the processparameterstablesgroup rml. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Rml Rml { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs index 564738b45..e0115182b 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Rml.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -78,6 +80,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MEDIA_MATERIAL_GUID")] [ForeignKey("MediaMaterial")] + public String MediaMaterialGuid { get @@ -98,6 +101,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MEDIA_COLOR_GUID")] [ForeignKey("MediaColor")] + public String MediaColorGuid { get @@ -118,6 +122,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MEDIA_PURPOSE_GUID")] [ForeignKey("MediaPurpose")] + public String MediaPurposeGuid { get @@ -138,6 +143,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("MEDIA_CONDITION_GUID")] [ForeignKey("MediaCondition")] + public String MediaConditionGuid { get @@ -158,6 +164,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("LINEAR_MASS_DENSITY_UNIT_GUID")] [ForeignKey("LinearMassDensityUnit")] + public String LinearMassDensityUnitGuid { get @@ -178,6 +185,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("FIBER_SHAPE_GUID")] [ForeignKey("FiberShape")] + public String FiberShapeGuid { get @@ -198,6 +206,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("FIBER_SYNTH_GUID")] [ForeignKey("FiberSynth")] + public String FiberSynthGuid { get @@ -455,6 +464,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml fiber shapes. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual FiberShape FiberShape { get @@ -474,6 +485,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml fiber synths. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual FiberSynth FiberSynth { get @@ -512,6 +525,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml linear mass density units. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual LinearMassDensityUnit LinearMassDensityUnit { get @@ -550,6 +565,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml media colors. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MediaColor MediaColor { get @@ -569,6 +586,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml media conditions. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MediaCondition MediaCondition { get @@ -588,6 +607,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml media materials. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MediaMaterial MediaMaterial { get @@ -607,6 +628,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rml media purposes. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual MediaPurpos MediaPurpose { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs index e1aef394e..69e7084ec 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Role.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs index 8d81ace27..51db0b1e1 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/RolesPermission.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -18,6 +20,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ROLE_GUID")] [ForeignKey("Role")] + public String RoleGuid { get @@ -38,6 +41,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("PERMISSION_GUID")] [ForeignKey("Permission")] + public String PermissionGuid { get @@ -57,6 +61,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rolespermission permission. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Permission Permission { get @@ -76,6 +82,8 @@ namespace Tango.Integration.Observables /// Gets or sets the rolespermission role. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Role Role { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs index e5c3c50c6..7344325f8 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/Segment.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -38,6 +40,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("JOB_GUID")] [ForeignKey("Job")] + public String JobGuid { get @@ -116,6 +119,8 @@ namespace Tango.Integration.Observables /// Gets or sets the segment job. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Job Job { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs index de686469b..0f2cc8e64 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/SyncConfiguration.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechDispenser.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechDispenser.cs index ae05a2816..17a4ded28 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechDispenser.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechDispenser.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechIo.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechIo.cs index 90ac0de7c..3356b9c43 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechIo.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechIo.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMonitor.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMonitor.cs index 9ea2ad7ba..bc181defe 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMonitor.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMonitor.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMotor.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMotor.cs index fd872f636..e6ac4167f 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMotor.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechMotor.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechValf.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechValf.cs index 32c86032e..5665d7391 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechValf.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/TechValf.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs index bab42d5ff..3acfb8fb6 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/User.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -78,6 +80,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ORGANIZATION_GUID")] [ForeignKey("Organization")] + public String OrganizationGuid { get @@ -98,6 +101,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("CONTACT_GUID")] [ForeignKey("Contact")] + public String ContactGuid { get @@ -118,6 +122,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ADDRESS_GUID")] [ForeignKey("Address")] + public String AddressGuid { get @@ -137,6 +142,8 @@ namespace Tango.Integration.Observables /// Gets or sets the user address. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Address Address { get @@ -156,6 +163,8 @@ namespace Tango.Integration.Observables /// Gets or sets the user contact. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Contact Contact { get @@ -213,6 +222,8 @@ namespace Tango.Integration.Observables /// Gets or sets the user organization. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Organization Organization { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs index 3b8b2194f..8b274fd33 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/UsersRole.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; @@ -38,6 +40,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("USER_GUID")] [ForeignKey("User")] + public String UserGuid { get @@ -58,6 +61,7 @@ namespace Tango.Integration.Observables /// </summary> [Column("ROLE_GUID")] [ForeignKey("Role")] + public String RoleGuid { get @@ -77,6 +81,8 @@ namespace Tango.Integration.Observables /// Gets or sets the usersrole role. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual Role Role { get @@ -96,6 +102,8 @@ namespace Tango.Integration.Observables /// Gets or sets the usersrole user. /// </summary> + [XmlIgnore] + [JsonIgnore] public virtual User User { get diff --git a/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs b/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs index a77a42fdc..de92f2301 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/Entities/WindingMethod.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; using System.Linq; using Tango.DAL.Remote.DB; diff --git a/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs b/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs index 0439d57b0..eb16d150d 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/IObservableEntity.cs @@ -46,6 +46,12 @@ namespace Tango.Integration.Observables void Save(); /// <summary> + /// Saves the changes on this entity to database using the specified context. + /// </summary> + /// <param name="context">The context.</param> + void Save(DbContext context); + + /// <summary> /// Attaches this observable to the proper DbSet. /// </summary> void Attach(); @@ -62,6 +68,12 @@ namespace Tango.Integration.Observables Task SaveAsync(); /// <summary> + /// Saves the changes on this entity to database asynchronously. + /// </summary> + /// <returns></returns> + Task SaveAsync(DbContext context); + + /// <summary> /// Deletes this entity from the database. /// </summary> void Delete(); diff --git a/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs b/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs index 92dd88f34..d5b218453 100644 --- a/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs +++ b/Software/Visual_Studio/Tango.Integration/Observables/ObservableEntity.cs @@ -18,6 +18,9 @@ using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; using System.Runtime.CompilerServices; using System.Data.Entity.Core.Objects; +using Tango.Serialization; +using System.Xml.Serialization; +using Newtonsoft.Json; namespace Tango.Integration.Observables { @@ -65,6 +68,7 @@ namespace Tango.Integration.Observables /// Gets or sets the entity last updated data and time. /// </summary> [Column("LAST_UPDATED")] + [JsonIgnore] public DateTime LastUpdated { get { return _lastUpdated; } @@ -76,6 +80,8 @@ namespace Tango.Integration.Observables /// Gets a bind-able observable collection of the component properties. /// </summary> [NotMapped] + [XmlIgnore] + [JsonIgnore] public ReadOnlyObservableCollection<ParameterItem> Parameters { get { return _parameters; } @@ -108,7 +114,7 @@ namespace Tango.Integration.Observables /// </summary> public virtual void Save() { - GetDbContextFromEntity(this).SaveChanges(); + ObservablesEntitiesAdapter.Instance.SaveChanges(); OnSaved(); } @@ -213,7 +219,7 @@ namespace Tango.Integration.Observables return null; } - + protected virtual void OnSaved() { Saved?.Invoke(this, new EventArgs()); @@ -243,6 +249,29 @@ namespace Tango.Integration.Observables return context; } + public virtual T Clone() + { + return (this as T).CloneEntity() as T; + } + + public void Save(DbContext context) + { + context.SaveChanges(); + OnSaved(); + } + + public Task SaveAsync(DbContext context) + { + return Task.Factory.StartNew(() => Save(context)); + } + + public bool CompareUsingJson(T entity) + { + String me = JsonConvert.SerializeObject(this); + String other = JsonConvert.SerializeObject(entity); + return me == other; + } + #region Operator Overloading //public static bool operator ==(ObservableEntity<T> observable1, ObservableEntity<T> observable2) |