From bacef71d48071fd2a80606d098117cff7ed86757 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 1 Apr 2021 21:35:00 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- server/AyaNova/models/WorkOrder.cs | 5 +++-- server/AyaNova/models/WorkOrderItem.cs | 14 ++++++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index c292c7c7..a7b780aa 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [Required] public long Serial { get; set; } - + public string Notes { get; set; }//WAS "SUMMARY" public string Wiki { get; set; } public string CustomFields { get; set; } @@ -65,7 +65,8 @@ namespace AyaNova.Models //UTILITY FIELDS - + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index c77eb508..c7a9b9df 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -11,6 +11,9 @@ namespace AyaNova.Models public class WorkOrderItem : ICoreBizObjectModel { + [NotMapped, JsonIgnore] + public AyaType AyaType { get => AyaType.WorkOrderItem; } + public long Id { get; set; } public uint Concurrency { get; set; } @@ -18,7 +21,7 @@ namespace AyaNova.Models public string Wiki { get; set; } public string CustomFields { get; set; } public List Tags { get; set; } = new List(); - + [Required] public long WorkOrderId { get; set; } public string TechNotes { get; set; } @@ -42,10 +45,13 @@ namespace AyaNova.Models public List Tasks { get; set; } = new List(); public List Travels { get; set; } = new List(); public List Units { get; set; } = new List(); - public List OutsideServices { get; set; } = new List(); + public List OutsideServices { get; set; } = new List(); + + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + - [NotMapped, JsonIgnore] - public AyaType AyaType { get => AyaType.WorkOrderItem; } }//eoc }//eons