From d404ae94ebcd7e95f21839b114e5d5274103b2e3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 11 Jul 2022 22:12:19 +0000
Subject: [PATCH]

---
 AyaNovaQBI/AyaNovaQBI.csproj   |  1 +
 AyaNovaQBI/UnitMeterReading.cs | 29 +++++++++++++++++++++++++++++
 AyaNovaQBI/util.cs             |  5 ++++-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 AyaNovaQBI/UnitMeterReading.cs

diff --git a/AyaNovaQBI/AyaNovaQBI.csproj b/AyaNovaQBI/AyaNovaQBI.csproj
index 1ba06c8..9a53919 100644
--- a/AyaNovaQBI/AyaNovaQBI.csproj
+++ b/AyaNovaQBI/AyaNovaQBI.csproj
@@ -232,6 +232,7 @@
     </Compile>
     <Compile Include="Timestamp.cs" />
     <Compile Include="TravelRate.cs" />
+    <Compile Include="UnitMeterReading.cs" />
     <Compile Include="UserType.cs" />
     <Compile Include="util.cs" />
     <Compile Include="Vendor.cs" />
diff --git a/AyaNovaQBI/UnitMeterReading.cs b/AyaNovaQBI/UnitMeterReading.cs
new file mode 100644
index 0000000..c9df3f3
--- /dev/null
+++ b/AyaNovaQBI/UnitMeterReading.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AyaNovaQBI
+{
+
+    public class UnitMeterReading
+    {
+        public long Id { get; set; }
+        public uint Concurrency { get; set; }
+        public string Notes { get; set; }
+        public long Meter { get; set; }
+        public DateTime MeterDate { get; set; }
+        public long UnitId { get; set; }
+        public long? WorkOrderItemUnitId { get; set; }
+
+        public string UnitViz { get; set; }
+
+        public string WorkOrderViz { get; set; }
+
+
+
+
+    }//eoc
+
+}
diff --git a/AyaNovaQBI/util.cs b/AyaNovaQBI/util.cs
index ac2f3ff..49cdff4 100644
--- a/AyaNovaQBI/util.cs
+++ b/AyaNovaQBI/util.cs
@@ -6368,7 +6368,10 @@ namespace AyaNovaQBI
                                         {
                                             //todo: fetch full unit record here to get lastmeter from it
                                             // [HttpGet("unit/meter-reading/{id}")]
-                                            s = s.Replace("~UNIT_METER~", u.UnitLastMeterViz);
+                                            var lastMeterResponse = await GetAsync($"unit/meter-reading/{u.UnitId}");
+                                            var lastMeterReading = woReponse.ObjectResponse["data"].ToObject<UnitMeterReading>();
+                                            if (lastMeterReading != null)
+                                                s = s.Replace("~UNIT_METER~", lastMeterReading.Meter.ToString());
                                         }
                                     }