admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-07-09 17:12:40 +00:00
parent 7650045ee3
commit c4c3fbb2b5
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -928,7 +928,11 @@ namespace AyaNova.Biz
//WORKORDER ITEM UNIT //WORKORDER ITEM UNIT
l.Add(new FormField { TKey = "WorkOrderItemUnitNotes", FieldKey = "WorkOrderItemUnitNotes", TKeySection = "WorkOrderItemUnit" }); 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 = "Tags", FieldKey = "WorkOrderItemUnitTags", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "UnitWarrantyInfo", FieldKey = "UnitWarrantyInfo", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "UnitWarrantyInfo", FieldKey = "UnitWarrantyInfo", TKeySection = "WorkOrderItemUnit" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemUnitWiki", TKeySection = "WorkOrderItemUnit" });

5
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -6016,6 +6016,11 @@ namespace AyaNova.Biz
private async Task UnitPopulateVizFields(WorkOrderItemUnit o) private async Task UnitPopulateVizFields(WorkOrderItemUnit o)
{ {
o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync(); o.UnitViz = await ct.Unit.AsNoTracking().Where(x => x.Id == o.UnitId).Select(x => x.Serial).FirstOrDefaultAsync();
UnitModelModelNumber
UnitModelVendorID
UnitModelName
UnitDescription
} }
//////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////

12
server/AyaNova/models/WorkOrderItemUnit.cs
View File

@@ -19,12 +19,22 @@ namespace AyaNova.Models
public long UnitId { get; set; } public long UnitId { get; set; }
[NotMapped] [NotMapped]
public string UnitViz { get; set; } public string UnitViz { get; set; }
[Required] [Required]
public long WorkOrderItemId { get; set; } public long WorkOrderItemId { get; set; }
[JsonIgnore] [JsonIgnore]
public WorkOrderItem WorkOrderItem { get; set; } 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 //workaround for notification
[NotMapped, JsonIgnore] [NotMapped, JsonIgnore]