From edfa5a0ed9ae9725e77a083ec0fabb5ad17ae2b0 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 14 Jul 2021 19:56:08 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 12 +++++++++--- server/AyaNova/models/WorkOrder.cs | 12 ++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 078f34c2..4bd9cad2 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1114,9 +1114,15 @@ namespace AyaNova.Biz // private async Task WorkOrderPopulateVizFields(WorkOrder o, bool headerOnly) { - o.HasLoanItemCosts = UserCanViewLoanerCosts; - o.HasPartCosts = UserCanViewPartCosts; - o.HasTravelAndLaborRateCosts = UserCanViewLaborOrTravelRateCosts; + + + o.UserIsRestrictedType = UserIsRestrictedType; + o.UserIsTechRestricted = UserIsTechRestricted; + o.UserIsSubContractorFull = UserIsSubContractorFull; + o.UserIsSubContractorRestricted = UserIsSubContractorRestricted; + o.UserCanViewPartCosts = UserCanViewPartCosts; + o.UserCanViewLaborOrTravelRateCosts = UserCanViewLaborOrTravelRateCosts; + o.UserCanViewLoanerCosts = UserCanViewLoanerCosts; if (!headerOnly) { diff --git a/server/AyaNova/models/WorkOrder.cs b/server/AyaNova/models/WorkOrder.cs index eb2852b1..69f15b7b 100644 --- a/server/AyaNova/models/WorkOrder.cs +++ b/server/AyaNova/models/WorkOrder.cs @@ -89,12 +89,12 @@ namespace AyaNova.Models public bool IsLockedAtServer { get; set; } = false;//signal to client that it came from the server in a locked state [NotMapped] public string AlertViz { get; set; } = null; - [NotMapped] - public bool HasPartCosts { get; set; } = false;//signal to client that part costs were not populated (due to user rights / role / type) - [NotMapped] - public bool HasTravelAndLaborRateCosts { get; set; } = false; - [NotMapped] - public bool HasLoanItemCosts { get; set; } = false; + // [NotMapped] + // public bool HasPartCosts { get; set; } = false;//signal to client that part costs were not populated (due to user rights / role / type) + // [NotMapped] + // public bool HasTravelAndLaborRateCosts { get; set; } = false; + // [NotMapped] + // public bool HasLoanItemCosts { get; set; } = false; [NotMapped] public bool IsCompleteRecord { get; set; } = true;//indicates if some items were removed due to user role / type restrictions (i.e. woitems they are not scheduled on)