From c4c3fbb2b5414d55005d46d184d2622fe7a6acf5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 9 Jul 2021 17:12:40 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 6 +++++- server/AyaNova/biz/WorkOrderBiz.cs | 5 +++++ server/AyaNova/models/WorkOrderItemUnit.cs | 12 +++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index af86989d..c6d4ffed 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -928,7 +928,11 @@ namespace AyaNova.Biz //WORKORDER ITEM UNIT l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" }); - l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" }); + l.Add(new FormField { TKey = "Unit", FieldKey = "WorkOrderItemUnit", TKeySection = "WorkOrderItemUnit" }); + l.Add(new FormField { TKey = "UnitModelModelNumber", FieldKey = "UnitModelModelNumber", TKeySection = "WorkOrderItemUnit" }); + l.Add(new FormField { TKey = "UnitModelVendorID", FieldKey = "UnitModelVendorID", TKeySection = "WorkOrderItemUnit" }); + l.Add(new FormField { TKey = "UnitModelName", FieldKey = "UnitModelName", TKeySection = "WorkOrderItemUnit" }); + l.Add(new FormField { TKey = "UnitDescription", FieldKey = "UnitDescription", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "UnitWarrantyInfo", FieldKey = "UnitWarrantyInfo", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" }); diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 0bcd305f..72cd5770 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -6016,6 +6016,11 @@ namespace AyaNova.Biz private async Task UnitPopulateVizFields(WorkOrderItemUnit o) { o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync(); + + UnitModelModelNumber + UnitModelVendorID + UnitModelName + UnitDescription } //////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/server/AyaNova/models/WorkOrderItemUnit.cs b/server/AyaNova/models/WorkOrderItemUnit.cs index ae780bdc..51b6c6ed 100644 --- a/server/AyaNova/models/WorkOrderItemUnit.cs +++ b/server/AyaNova/models/WorkOrderItemUnit.cs @@ -19,12 +19,22 @@ namespace AyaNova.Models public long UnitId { get; set; } [NotMapped] public string UnitViz { get; set; } - + [Required] public long WorkOrderItemId { get; set; } [JsonIgnore] public WorkOrderItem WorkOrderItem { get; set; } + [NotMapped] + public string UnitModelNameViz { get; set; } + [NotMapped] + public string UnitModelVendorViz { get; set; } + [NotMapped] + public string UnitModelModelNumberViz { get; set; } + [NotMapped] + public string UnitDescriptionViz { get; set; } + + //workaround for notification [NotMapped, JsonIgnore]