Merge branch 'main' of lraspi:/secret/git/repos/etbsa-trackermap-mobile

1 files changed, 47 insertions, 3 deletions

diff --git a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
index e5b3e4b..450bfa7 100644
--- a/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
+++ b/iosApp/iosApp/Details/Reports/UnitReportsViewModel.swift
@@ -29,12 +29,38 @@ class UnitReportsViewModel: ObservableObject {
     }
     
     @Published var deviceId: Int32? = nil
+    
+    // MARK: - Report settings
     @Published var reportType: ReportController.ReportType = .positions {
         didSet {
             fetchReport()
         }
     }
-    @Published var reportPeriod: ReportDates.ReportPeriod = .today {
+    @Published var periodType: ReportDates.PeriodTypes = .today {
+        didSet {
+            switch periodType {
+            case .today:
+                reportPeriod = ReportDates.ReportPeriodToday()
+            case .last24:
+                reportPeriod = ReportDates.ReportPeriodLast24()
+            case .yesterday:
+                reportPeriod = ReportDates.ReportPeriodYesterday()
+            case .thisWeek:
+                reportPeriod = ReportDates.ReportPeriodThisWeek()
+            case .last7:
+                reportPeriod = ReportDates.ReportPeriodLast7()
+            case .thisMonth:
+                reportPeriod = ReportDates.ReportPeriodThisMonth()
+            case .last30:
+                reportPeriod = ReportDates.ReportPeriodLast30()
+            case .custom:
+                reportPeriod = ReportDates.ReportPeriodCustom(from: nil, to: nil)
+            default:
+                reportPeriod = ReportDates.ReportPeriodToday()
+            }
+        }
+    }
+    @Published var reportPeriod: ReportDates.ReportPeriod = ReportDates.ReportPeriodToday() {
         didSet {
             fetchReport()
         }
@@ -67,7 +93,25 @@ class UnitReportsViewModel: ObservableObject {
     @Published var markers = [Marker]()
     @Published var selectedMarker: Marker? = nil
     
-    // Geofences
+    @Published var fromDate: Date = Date() {
+        didSet {
+            if let custom = reportPeriod as? ReportDates.ReportPeriodCustom {
+                reportPeriod = custom.withFrom(
+                    from: DateUtils.companion.iosDateToKotlin(date: fromDate))
+            }
+        }
+    }
+    
+    @Published var toDate: Date = Calendar.current.startOfDay(for: Date()) {
+        didSet {
+            if let custom = reportPeriod as? ReportDates.ReportPeriodCustom {
+                reportPeriod = custom.withTo(
+                    to: DateUtils.companion.iosDateToKotlin(date: toDate))
+            }
+        }
+    }
+    
+    // MARK: - Geofences
     @Published var geofences: [Int: Geofence] = [:] {
         didSet {
             flatGeofences = Array(geofences.values)
@@ -75,7 +119,7 @@ class UnitReportsViewModel: ObservableObject {
     }
     @Published var flatGeofences: [Geofence] = []
     
-    // Save and share
+    // MARK: - Save and share
     var xlsxAction: XlsxAction = .save
     var saveDocument = XlsxFile()
     @Published var showExportDialog: Bool = false