- Adapter iOS app to changes in UnitsController

- Added getHourmeter() method to UnitInformation
- Added missing license headers

2 files changed, 15 insertions, 9 deletions

diff --git a/iosApp/iosApp/Devices/DeviceRow.swift b/iosApp/iosApp/Devices/DeviceRow.swift
index 9873c8e..e7966d2 100644
--- a/iosApp/iosApp/Devices/DeviceRow.swift
+++ b/iosApp/iosApp/Devices/DeviceRow.swift
@@ -104,15 +104,13 @@ struct DeviceRow: View {
                 }
                 
                 /* Hourmeter */
-                if let hourmeter = unit.position?.attributes["hours"] {
-                    if let hourmeter = Serialization.companion.longOrNull(json: hourmeter) {
-                        HStack {
-                            Label(Formatter.companion.formatHours(
-                                millis: Int64(truncating: hourmeter)),
-                                  systemImage: "timer")
-                                .labelStyle(SmallLabelStyle())
-                            Spacer()
-                        }
+                if let hourmeter = unit.getHourmeter() {
+                    HStack {
+                        Label(Formatter.companion.formatHours(
+                            millis: Int64(truncating: hourmeter)),
+                              systemImage: "timer")
+                            .labelStyle(SmallLabelStyle())
+                        Spacer()
                     }
                 }
                 
diff --git a/iosApp/iosApp/Units/UnitsViewModel.swift b/iosApp/iosApp/Units/UnitsViewModel.swift
index 33f9729..04c0436 100644
--- a/iosApp/iosApp/Units/UnitsViewModel.swift
+++ b/iosApp/iosApp/Units/UnitsViewModel.swift
@@ -23,6 +23,8 @@ class UnitsViewModel: ObservableObject {
     @Inject var unitsController: UnitsController
     @Inject var geofenceController: GeofencesController
     
+    let mainScope = MainScope.companion.createMainScope()
+    
     enum UnitsDisplayMode {
         case map
         case list
@@ -54,9 +56,14 @@ class UnitsViewModel: ObservableObject {
     @Published var camera: Camera = Camera()
     
     init() {
+        unitsController.fetchUnits(scope: mainScope)
         setupObservers()
     }
     
+    deinit {
+        MainScope.companion.cancelScope(scope: mainScope)
+    }
+    
     private func setupObservers() {
         let unitsCollector = Collector<[UnitInformation]>(callback: setUnits)
         unitsController.displayedUnitsFlow.collect(collector: unitsCollector) { unit, error in }
@@ -66,6 +73,7 @@ class UnitsViewModel: ObservableObject {
     }
     
     private func setUnits(units: [UnitInformation]) {
+        print("Positions")
         self.units = units
     }