From 322721e838842de4b345cf4001c19b438eb5f686 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 11 Jul 2022 21:32:12 +0000 Subject: [PATCH] --- server/AyaNova/biz/WorkOrderBiz.cs | 4 +--- server/AyaNova/models/WorkOrderItemUnit.cs | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index a7b1e7f3..7ac3152b 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -6646,7 +6646,7 @@ namespace AyaNova.Biz //cache it var unitInfo = await ct.Unit.AsNoTracking() .Where(x => x.Id == o.UnitId) - .Select(x => new { x.Serial, x.Description, x.UnitModelId, x.Address, x.City, x.Region, x.Country, x.Latitude, x.Longitude, x.Metered, x.LastMeterViz }) + .Select(x => new { x.Serial, x.Description, x.UnitModelId, x.Address, x.City, x.Region, x.Country, x.Latitude, x.Longitude, x.Metered}) .FirstOrDefaultAsync(); vc.Add(unitInfo.Serial, "unitserial", o.UnitId); vc.Add(unitInfo.Description, "unitdesc", o.UnitId); @@ -6657,7 +6657,6 @@ namespace AyaNova.Biz vc.Add(unitInfo.Latitude.ToString(), "unitlat", o.UnitId); vc.Add(unitInfo.Longitude.ToString(), "unitlong", o.UnitId); vc.Add(unitInfo.Metered.ToString(), "unitmetered", o.UnitId); - vc.Add(unitInfo.LastMeterViz.ToString(), "unitlastmeter", o.UnitId); if (unitInfo.UnitModelId != null) { @@ -6705,7 +6704,6 @@ namespace AyaNova.Biz o.UnitViz = vc.Get("unitserial", o.UnitId); o.UnitDescriptionViz = vc.Get("unitdesc", o.UnitId); o.UnitMeteredViz = vc.GetAsBool("unitmetered", o.UnitId); - o.UnitLastMeterViz=vc.Get("unitlastmeter",o.UnitId); if (populateForReporting) { o.AddressViz = vc.Get("unitaddr", o.UnitId); diff --git a/server/AyaNova/models/WorkOrderItemUnit.cs b/server/AyaNova/models/WorkOrderItemUnit.cs index ff064505..65f49701 100644 --- a/server/AyaNova/models/WorkOrderItemUnit.cs +++ b/server/AyaNova/models/WorkOrderItemUnit.cs @@ -34,10 +34,7 @@ namespace AyaNova.Models public string UnitDescriptionViz { get; set; } [NotMapped] public bool UnitMeteredViz { get; set; } - - [NotMapped] - public string UnitLastMeterViz { get; set; }//for qbi - + //PHYSICAL ADDRESS [NotMapped] public string AddressViz { get; set; }