aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs')
-rw-r--r--Software/Visual_Studio/Tango.Integration/Observables/Entities/Job.cs14
1 files changed, 14 insertions, 0 deletions
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