2020-07-17 13:40:31 +00:00
parent c547913d12
commit 0658632459
35 changed files with 39 additions and 39 deletions
--- a/server/AyaNova/models/Contract.cs
+++ b/server/AyaNova/models/Contract.cs
@@ -28,7 +28,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Contract; }

    }//eoc
--- a/server/AyaNova/models/Customer.cs
+++ b/server/AyaNova/models/Customer.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Customer; }

    }//eoc
--- a/server/AyaNova/models/HeadOffice.cs
+++ b/server/AyaNova/models/HeadOffice.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.HeadOffice; }

    }//eoc
--- 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<string> Tags { get; set; }
-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaNova.Biz.AyaType AyaType { get;}

    }
--- a/server/AyaNova/models/LoanUnit.cs
+++ b/server/AyaNova/models/LoanUnit.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.LoanUnit; }

    }//eoc
--- a/server/AyaNova/models/PM.cs
+++ b/server/AyaNova/models/PM.cs
@@ -33,7 +33,7 @@ namespace AyaNova.Models
            PMItems = new List<PMItem>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.PM; }

    }//eoc
--- a/server/AyaNova/models/PMItem.cs
+++ b/server/AyaNova/models/PMItem.cs
@@ -34,7 +34,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.PMItem; }

    }//eoc
--- a/server/AyaNova/models/PMTemplate.cs
+++ b/server/AyaNova/models/PMTemplate.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.PMTemplate; }

    }//eoc
--- a/server/AyaNova/models/PMTemplateItem.cs
+++ b/server/AyaNova/models/PMTemplateItem.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.PMTemplateItem; }

    }//eoc
--- a/server/AyaNova/models/Part.cs
+++ b/server/AyaNova/models/Part.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Part; }

    }//eoc
--- a/server/AyaNova/models/Project.cs
+++ b/server/AyaNova/models/Project.cs
@@ -28,7 +28,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Project; }

    }//eoc
--- a/server/AyaNova/models/PurchaseOrder.cs
+++ b/server/AyaNova/models/PurchaseOrder.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.PurchaseOrder; }

    }//eoc
--- 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
--- a/server/AyaNova/models/QuoteItem.cs
+++ b/server/AyaNova/models/QuoteItem.cs
@@ -34,7 +34,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-      [NotMapped]
+      [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.QuoteItem; }


--- a/server/AyaNova/models/QuoteTemplate.cs
+++ b/server/AyaNova/models/QuoteTemplate.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.QuoteTemplate; }

    }//eoc
--- a/server/AyaNova/models/QuoteTemplateItem.cs
+++ b/server/AyaNova/models/QuoteTemplateItem.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.QuoteTemplateItem; }

    }//eoc
--- a/server/AyaNova/models/Unit.cs
+++ b/server/AyaNova/models/Unit.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Unit; }

    }//eoc
--- a/server/AyaNova/models/UnitModel.cs
+++ b/server/AyaNova/models/UnitModel.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.UnitModel; }

    }//eoc
--- 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
--- a/server/AyaNova/models/Vendor.cs
+++ b/server/AyaNova/models/Vendor.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Vendor; }

    }//eoc
--- a/server/AyaNova/models/Widget.cs
+++ b/server/AyaNova/models/Widget.cs
@@ -40,7 +40,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.Widget; }

    }
--- 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<string> Tags { get; set; }

-          [NotMapped]
+          [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.WorkOrder; }

    }//eoc
@@ -56,7 +56,7 @@ namespace AyaNova.Models
        public List<WorkOrderItem> 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

--- 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<WorkOrderItemTravel> Travels { get; set; }
        public List<WorkOrderItemUnit> Units { get; set; }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.WorkOrderItem; }
    }//eoc

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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; }

--- 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; }

--- 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
--- 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
--- a/server/AyaNova/models/WorkOrderTemplate.cs
+++ b/server/AyaNova/models/WorkOrderTemplate.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.WorkOrderTemplate; }

    }//eoc
--- a/server/AyaNova/models/WorkOrderTemplateItem.cs
+++ b/server/AyaNova/models/WorkOrderTemplateItem.cs
@@ -29,7 +29,7 @@ namespace AyaNova.Models
            Tags = new List<string>();
        }

-        [NotMapped]
+        [NotMapped, JsonIgnore]
        public AyaType AyaType { get => AyaType.WorkOrderTemplateItem; }

    }//eoc
--- 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!!!!