diff --git a/AyaNovaQBI/WorkOrderItemUnit.cs b/AyaNovaQBI/WorkOrderItemUnit.cs index 47c88bf..b8b8b7f 100644 --- a/AyaNovaQBI/WorkOrderItemUnit.cs +++ b/AyaNovaQBI/WorkOrderItemUnit.cs @@ -19,8 +19,7 @@ namespace AyaNovaQBI public string UnitModelVendorViz { get; set; } public string UnitDescriptionViz { get; set; } public bool UnitMeteredViz { get; set; } - public string UnitLastMeterViz { get; set; }//for qbi - + //PHYSICAL ADDRESS public string AddressViz { get; set; } public string CityViz { get; set; } diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs index ccba4f0..ac2f3ff 100644 --- a/AyaNovaQBI/util.cs +++ b/AyaNovaQBI/util.cs @@ -6362,10 +6362,14 @@ namespace AyaNovaQBI if (s.IndexOf("~UNIT_METER~") != -1) { - if (!up[0].Metered) + if (!u.UnitMeteredViz) s = s.Replace("~UNIT_METER~", ""); else + { + //todo: fetch full unit record here to get lastmeter from it + // [HttpGet("unit/meter-reading/{id}")] s = s.Replace("~UNIT_METER~", u.UnitLastMeterViz); + } } if (s.IndexOf("~UNIT_MAKE~") != -1)