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 @@ + 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(); + if (lastMeterReading != null) + s = s.Replace("~UNIT_METER~", lastMeterReading.Meter.ToString()); } }