Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

Models/AppModels.cs

@@ -61,7 +61,7 @@ namespace SunlightAggregationTerminal.Models
                 NotificationDictionary.Add("StartTime", DateTime.Now.AddMinutes(TimerNotifications).ToString("yyyy-MM-dd HH:mm:ss.fff"));
                 NotificationDictionary.Add("EndTime", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"));
                 DataReceived.Transmit(NotificationDictionary.ToJsonString());
-                TimerNotifications = -6;
+                TimerNotifications = -5;
             }
         }
 

Models/DataSource.cs

@@ -76,6 +76,7 @@ namespace SunlightAggregationTerminal.Models
         public string? DispenseStartTime { get; set; }
         public string? DispenseEndTime { get; set; }
         public string? DispenseTime { get; set; }
+        public string? UsageTime { get; set; }
         public double? DispenseGrams { get; set; }
         public string DispenseGramsDisplay => DispenseGrams?.ToString("F2") ?? "";
         public int? DispenseResult { get; set; }