diff --git a/server/AyaNova/models/Contract.cs b/server/AyaNova/models/Contract.cs index 90508c74..9420c5c9 100644 --- a/server/AyaNova/models/Contract.cs +++ b/server/AyaNova/models/Contract.cs @@ -28,7 +28,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Contract; } }//eoc diff --git a/server/AyaNova/models/Customer.cs b/server/AyaNova/models/Customer.cs index 0e36f6b3..dad8de97 100644 --- a/server/AyaNova/models/Customer.cs +++ b/server/AyaNova/models/Customer.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Customer; } }//eoc diff --git a/server/AyaNova/models/HeadOffice.cs b/server/AyaNova/models/HeadOffice.cs index 0a9194a5..5ed7ed13 100644 --- a/server/AyaNova/models/HeadOffice.cs +++ b/server/AyaNova/models/HeadOffice.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.HeadOffice; } }//eoc diff --git a/server/AyaNova/models/ICoreBizObjectModel.cs b/server/AyaNova/models/ICoreBizObjectModel.cs index 46601559..5fab95da 100644 --- a/server/AyaNova/models/ICoreBizObjectModel.cs +++ b/server/AyaNova/models/ICoreBizObjectModel.cs @@ -18,7 +18,7 @@ namespace AyaNova.Models public string Wiki { get => throw new System.NotImplementedException(); set => throw new System.NotImplementedException(); } public string CustomFields { get; set; } public List Tags { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaNova.Biz.AyaType AyaType { get;} } diff --git a/server/AyaNova/models/LoanUnit.cs b/server/AyaNova/models/LoanUnit.cs index 21a9b1b9..a1011e04 100644 --- a/server/AyaNova/models/LoanUnit.cs +++ b/server/AyaNova/models/LoanUnit.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.LoanUnit; } }//eoc diff --git a/server/AyaNova/models/PM.cs b/server/AyaNova/models/PM.cs index 16a5920d..e4a04bc0 100644 --- a/server/AyaNova/models/PM.cs +++ b/server/AyaNova/models/PM.cs @@ -33,7 +33,7 @@ namespace AyaNova.Models PMItems = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.PM; } }//eoc diff --git a/server/AyaNova/models/PMItem.cs b/server/AyaNova/models/PMItem.cs index a02d458a..c47fbdd8 100644 --- a/server/AyaNova/models/PMItem.cs +++ b/server/AyaNova/models/PMItem.cs @@ -34,7 +34,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.PMItem; } }//eoc diff --git a/server/AyaNova/models/PMTemplate.cs b/server/AyaNova/models/PMTemplate.cs index f0c733f2..44201242 100644 --- a/server/AyaNova/models/PMTemplate.cs +++ b/server/AyaNova/models/PMTemplate.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.PMTemplate; } }//eoc diff --git a/server/AyaNova/models/PMTemplateItem.cs b/server/AyaNova/models/PMTemplateItem.cs index bbfc4313..37e93523 100644 --- a/server/AyaNova/models/PMTemplateItem.cs +++ b/server/AyaNova/models/PMTemplateItem.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.PMTemplateItem; } }//eoc diff --git a/server/AyaNova/models/Part.cs b/server/AyaNova/models/Part.cs index 89d07ed5..3f3b644e 100644 --- a/server/AyaNova/models/Part.cs +++ b/server/AyaNova/models/Part.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Part; } }//eoc diff --git a/server/AyaNova/models/Project.cs b/server/AyaNova/models/Project.cs index bc2ddbd5..e7b7a023 100644 --- a/server/AyaNova/models/Project.cs +++ b/server/AyaNova/models/Project.cs @@ -28,7 +28,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Project; } }//eoc diff --git a/server/AyaNova/models/PurchaseOrder.cs b/server/AyaNova/models/PurchaseOrder.cs index 85146f66..38642be8 100644 --- a/server/AyaNova/models/PurchaseOrder.cs +++ b/server/AyaNova/models/PurchaseOrder.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.PurchaseOrder; } }//eoc diff --git a/server/AyaNova/models/Quote.cs b/server/AyaNova/models/Quote.cs index 560ff629..7253fb46 100644 --- a/server/AyaNova/models/Quote.cs +++ b/server/AyaNova/models/Quote.cs @@ -33,7 +33,7 @@ namespace AyaNova.Models } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Quote; } }//eoc diff --git a/server/AyaNova/models/QuoteItem.cs b/server/AyaNova/models/QuoteItem.cs index f2e821f0..fcf92b71 100644 --- a/server/AyaNova/models/QuoteItem.cs +++ b/server/AyaNova/models/QuoteItem.cs @@ -34,7 +34,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.QuoteItem; } diff --git a/server/AyaNova/models/QuoteTemplate.cs b/server/AyaNova/models/QuoteTemplate.cs index 52d7830a..39c866b1 100644 --- a/server/AyaNova/models/QuoteTemplate.cs +++ b/server/AyaNova/models/QuoteTemplate.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.QuoteTemplate; } }//eoc diff --git a/server/AyaNova/models/QuoteTemplateItem.cs b/server/AyaNova/models/QuoteTemplateItem.cs index 4ac368b1..ef3ec7a8 100644 --- a/server/AyaNova/models/QuoteTemplateItem.cs +++ b/server/AyaNova/models/QuoteTemplateItem.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.QuoteTemplateItem; } }//eoc diff --git a/server/AyaNova/models/Unit.cs b/server/AyaNova/models/Unit.cs index dcb0fd81..2ec023c2 100644 --- a/server/AyaNova/models/Unit.cs +++ b/server/AyaNova/models/Unit.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Unit; } }//eoc diff --git a/server/AyaNova/models/UnitModel.cs b/server/AyaNova/models/UnitModel.cs index 1d71a1c2..d815ed65 100644 --- a/server/AyaNova/models/UnitModel.cs +++ b/server/AyaNova/models/UnitModel.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.UnitModel; } }//eoc diff --git a/server/AyaNova/models/User.cs b/server/AyaNova/models/User.cs index 59d37963..db44d5e2 100644 --- a/server/AyaNova/models/User.cs +++ b/server/AyaNova/models/User.cs @@ -32,7 +32,7 @@ namespace AyaNova.Models public DateTime? LastLogin { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.User; } }//eoc @@ -97,7 +97,7 @@ namespace AyaNova.Models } } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.User; } }//eoc diff --git a/server/AyaNova/models/Vendor.cs b/server/AyaNova/models/Vendor.cs index bc38047e..f8eb8475 100644 --- a/server/AyaNova/models/Vendor.cs +++ b/server/AyaNova/models/Vendor.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Vendor; } }//eoc diff --git a/server/AyaNova/models/Widget.cs b/server/AyaNova/models/Widget.cs index f3531ce3..5ecf5dfe 100644 --- a/server/AyaNova/models/Widget.cs +++ b/server/AyaNova/models/Widget.cs @@ -40,7 +40,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.Widget; } } diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index fe38ffb6..6c703b52 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -26,7 +26,7 @@ namespace AyaNova.Models public string CustomFields { get; set; } public List Tags { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrder; } }//eoc @@ -56,7 +56,7 @@ namespace AyaNova.Models public List Items { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public string Name { //Used by notification processor @@ -66,7 +66,7 @@ namespace AyaNova.Models } } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrder; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index e975446b..a59bf915 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -24,7 +24,7 @@ namespace AyaNova.Models [Required] public long WorkOrderId { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItem; } }//eoc @@ -68,7 +68,7 @@ namespace AyaNova.Models public List Travels { get; set; } public List Units { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItem; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemExpense.cs b/server/AyaNova/models/WorkOrderItemExpense.cs index ab8bcaab..679889d9 100644 --- a/server/AyaNova/models/WorkOrderItemExpense.cs +++ b/server/AyaNova/models/WorkOrderItemExpense.cs @@ -23,7 +23,7 @@ namespace AyaNova.Models public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemExpense; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs index c30106d7..9fe4c2be 100644 --- a/server/AyaNova/models/WorkOrderItemLabor.cs +++ b/server/AyaNova/models/WorkOrderItemLabor.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemLabor; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemLoan.cs b/server/AyaNova/models/WorkOrderItemLoan.cs index 4e9ed525..b69d556a 100644 --- a/server/AyaNova/models/WorkOrderItemLoan.cs +++ b/server/AyaNova/models/WorkOrderItemLoan.cs @@ -23,7 +23,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemLoan; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs index 13d03d90..e16c7d09 100644 --- a/server/AyaNova/models/WorkOrderItemPart.cs +++ b/server/AyaNova/models/WorkOrderItemPart.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemPart; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs index 62ffa7b4..74a18970 100644 --- a/server/AyaNova/models/WorkOrderItemPartRequest.cs +++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemPartRequest; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemScheduledUser.cs b/server/AyaNova/models/WorkOrderItemScheduledUser.cs index 79ec39f3..e130c7d1 100644 --- a/server/AyaNova/models/WorkOrderItemScheduledUser.cs +++ b/server/AyaNova/models/WorkOrderItemScheduledUser.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] [JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemScheduledUser; } diff --git a/server/AyaNova/models/WorkOrderItemTask.cs b/server/AyaNova/models/WorkOrderItemTask.cs index 91a56795..150d00cb 100644 --- a/server/AyaNova/models/WorkOrderItemTask.cs +++ b/server/AyaNova/models/WorkOrderItemTask.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] [JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemTask; } diff --git a/server/AyaNova/models/WorkOrderItemTravel.cs b/server/AyaNova/models/WorkOrderItemTravel.cs index d8705f10..c90b7f90 100644 --- a/server/AyaNova/models/WorkOrderItemTravel.cs +++ b/server/AyaNova/models/WorkOrderItemTravel.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemTravel; } }//eoc diff --git a/server/AyaNova/models/WorkOrderItemUnit.cs b/server/AyaNova/models/WorkOrderItemUnit.cs index f6b3631c..cb6691a2 100644 --- a/server/AyaNova/models/WorkOrderItemUnit.cs +++ b/server/AyaNova/models/WorkOrderItemUnit.cs @@ -22,7 +22,7 @@ namespace AyaNova.Models [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemUnit; } }//eoc diff --git a/server/AyaNova/models/WorkOrderTemplate.cs b/server/AyaNova/models/WorkOrderTemplate.cs index 9c00972c..df12076c 100644 --- a/server/AyaNova/models/WorkOrderTemplate.cs +++ b/server/AyaNova/models/WorkOrderTemplate.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderTemplate; } }//eoc diff --git a/server/AyaNova/models/WorkOrderTemplateItem.cs b/server/AyaNova/models/WorkOrderTemplateItem.cs index d42bd1dc..cc6ed6de 100644 --- a/server/AyaNova/models/WorkOrderTemplateItem.cs +++ b/server/AyaNova/models/WorkOrderTemplateItem.cs @@ -29,7 +29,7 @@ namespace AyaNova.Models Tags = new List(); } - [NotMapped] + [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderTemplateItem; } }//eoc diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 6a4929cc..71a2f96a 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 12; - internal const long EXPECTED_COLUMN_COUNT = 380; + internal const long EXPECTED_COLUMN_COUNT = 382; internal const long EXPECTED_INDEX_COUNT = 139; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!