From f608a514fca250329eddd45d99aec04160338c70 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 1 Apr 2021 23:39:50 +0000 Subject: [PATCH] --- server/AyaNova/models/WorkOrderItem.cs | 12 +++++------- server/AyaNova/models/WorkOrderItemExpense.cs | 5 +++++ server/AyaNova/models/WorkOrderItemLabor.cs | 6 ++++++ server/AyaNova/models/WorkOrderItemLoan.cs | 6 ++++++ server/AyaNova/models/WorkOrderItemOutsideService.cs | 5 +++++ server/AyaNova/models/WorkOrderItemPart.cs | 10 ++++++++-- server/AyaNova/models/WorkOrderItemPartRequest.cs | 6 ++++++ server/AyaNova/models/WorkOrderItemScheduledUser.cs | 10 ++++++---- server/AyaNova/models/WorkOrderItemTask.cs | 3 +++ server/AyaNova/models/WorkOrderItemTravel.cs | 8 ++++++-- server/AyaNova/models/WorkOrderItemUnit.cs | 8 ++++++-- 11 files changed, 62 insertions(+), 17 deletions(-) diff --git a/server/AyaNova/models/WorkOrderItem.cs b/server/AyaNova/models/WorkOrderItem.cs index c7a9b9df..6d20b140 100644 --- a/server/AyaNova/models/WorkOrderItem.cs +++ b/server/AyaNova/models/WorkOrderItem.cs @@ -30,11 +30,14 @@ namespace AyaNova.Models public DateTime RequestDate { get; set; } public bool WarrantyService { get; set; } = false; - //Principle + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + //Principle [JsonIgnore] public WorkOrder WorkOrder { get; set; } - //dependents public List Expenses { get; set; } = new List(); public List Labors { get; set; } = new List(); @@ -47,11 +50,6 @@ namespace AyaNova.Models public List Units { 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 - - }//eoc }//eons diff --git a/server/AyaNova/models/WorkOrderItemExpense.cs b/server/AyaNova/models/WorkOrderItemExpense.cs index f4927d0a..bfeda9af 100644 --- a/server/AyaNova/models/WorkOrderItemExpense.cs +++ b/server/AyaNova/models/WorkOrderItemExpense.cs @@ -25,6 +25,11 @@ namespace AyaNova.Models public bool ChargeToCustomer { get; set; } = false; + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemLabor.cs b/server/AyaNova/models/WorkOrderItemLabor.cs index 3bd693bf..323d37eb 100644 --- a/server/AyaNova/models/WorkOrderItemLabor.cs +++ b/server/AyaNova/models/WorkOrderItemLabor.cs @@ -26,6 +26,12 @@ namespace AyaNova.Models public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemLoan.cs b/server/AyaNova/models/WorkOrderItemLoan.cs index b41a54ff..9925c1fa 100644 --- a/server/AyaNova/models/WorkOrderItemLoan.cs +++ b/server/AyaNova/models/WorkOrderItemLoan.cs @@ -25,6 +25,12 @@ namespace AyaNova.Models [Required] public LoanUnitRateUnit Rate { get; set; } + + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemOutsideService.cs b/server/AyaNova/models/WorkOrderItemOutsideService.cs index b9b9a552..07c9d387 100644 --- a/server/AyaNova/models/WorkOrderItemOutsideService.cs +++ b/server/AyaNova/models/WorkOrderItemOutsideService.cs @@ -26,6 +26,11 @@ namespace AyaNova.Models public DateTime? ReturnDate { get; set; } + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemPart.cs b/server/AyaNova/models/WorkOrderItemPart.cs index 7eaa7cb9..be9e056d 100644 --- a/server/AyaNova/models/WorkOrderItemPart.cs +++ b/server/AyaNova/models/WorkOrderItemPart.cs @@ -20,11 +20,17 @@ namespace AyaNova.Models [Required] public decimal Quantity { get; set; } public decimal Cost { get; set; }//cost at time of entry from part table - public decimal BasePrice {get;set;}//part retail price at time of entry (V7 "Price") - public decimal Price {get;set;}//contract adjusted price or a copy of BasePrice if no contract + public decimal BasePrice { get; set; }//part retail price at time of entry (V7 "Price") + public decimal Price { get; set; }//contract adjusted price or a copy of BasePrice if no contract public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually public long? TaxPartSaleId { get; set; } + + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs index a6000cc0..e2dc1ab7 100644 --- a/server/AyaNova/models/WorkOrderItemPartRequest.cs +++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs @@ -24,6 +24,12 @@ namespace AyaNova.Models [Required] public decimal Received { get; set; } + + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] diff --git a/server/AyaNova/models/WorkOrderItemScheduledUser.cs b/server/AyaNova/models/WorkOrderItemScheduledUser.cs index df3c782a..9efa58a4 100644 --- a/server/AyaNova/models/WorkOrderItemScheduledUser.cs +++ b/server/AyaNova/models/WorkOrderItemScheduledUser.cs @@ -8,24 +8,26 @@ namespace AyaNova.Models { public class WorkOrderItemScheduledUser : ICoreBizObjectModel { - public long Id { get; set; } public uint Concurrency { get; set; } - public long? UserId { get; set; } public decimal EstimatedQuantity { get; set; } public DateTime? StartDate { get; set; } public DateTime? StopDate { get; set; } public long? ServiceRateId { get; set; } + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } - [NotMapped, JsonIgnore] public AyaType AyaType { get => AyaType.WorkOrderItemScheduledUser; } - }//eoc }//eons /* diff --git a/server/AyaNova/models/WorkOrderItemTask.cs b/server/AyaNova/models/WorkOrderItemTask.cs index 7c18ca5c..e02d2c2f 100644 --- a/server/AyaNova/models/WorkOrderItemTask.cs +++ b/server/AyaNova/models/WorkOrderItemTask.cs @@ -20,6 +20,9 @@ namespace AyaNova.Models public long? CompletedByUserId { get; set; } public DateTime? CompletedDate { get; set; } + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server [Required] diff --git a/server/AyaNova/models/WorkOrderItemTravel.cs b/server/AyaNova/models/WorkOrderItemTravel.cs index 09f4a7a6..57a726b5 100644 --- a/server/AyaNova/models/WorkOrderItemTravel.cs +++ b/server/AyaNova/models/WorkOrderItemTravel.cs @@ -8,7 +8,6 @@ namespace AyaNova.Models { public class WorkOrderItemTravel : ICoreBizObjectModel { - public long Id { get; set; } public uint Concurrency { get; set; } @@ -26,13 +25,18 @@ namespace AyaNova.Models public decimal Price { get; set; }//contract adjusted price or a copy of BasePrice if no contract public decimal ManualDiscountPct { get; set; }// (V7 "Discount") ad-hoc / % off of the contractprice (which is always set regardless if contract or not) entered manually + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } [NotMapped, JsonIgnore] - public AyaType AyaType { get => AyaType.WorkOrderItemTravel; } + public AyaType AyaType { get => AyaType.WorkOrderItemTravel; } }//eoc }//eons diff --git a/server/AyaNova/models/WorkOrderItemUnit.cs b/server/AyaNova/models/WorkOrderItemUnit.cs index 27d3c762..30a02933 100644 --- a/server/AyaNova/models/WorkOrderItemUnit.cs +++ b/server/AyaNova/models/WorkOrderItemUnit.cs @@ -15,11 +15,15 @@ namespace AyaNova.Models public string Wiki { get; set; } public string CustomFields { get; set; } public List Tags { get; set; } = new List(); - - [Required] public long UnitId { get; set; } + + //UTILITY FIELDS + [NotMapped] + public bool IsDirty { get; set; } = false;//never dirty coming from the server + + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore]