diff options
author | Iván Ávalos <avalos@disroot.org> | 2022-04-18 23:10:29 -0500 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2022-04-18 23:10:29 -0500 |
commit | 65bf515eb2cb95a0e13cf71788e60bf6b16f5fcd (patch) | |
tree | dcc65a1f090f5afa93e6bc7c6e6c178dc10eaae2 /shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers | |
parent | 591eb35abf77aa23e5b897c92eb9ff588a968f16 (diff) | |
parent | fc3e2a6e316cb8acd6aac0553c92f9dbc6b669b4 (diff) | |
download | etbsa-trackermap-mobile-65bf515eb2cb95a0e13cf71788e60bf6b16f5fcd.tar.gz etbsa-trackermap-mobile-65bf515eb2cb95a0e13cf71788e60bf6b16f5fcd.tar.bz2 etbsa-trackermap-mobile-65bf515eb2cb95a0e13cf71788e60bf6b16f5fcd.zip |
Merge branch 'main' of lraspi:/secret/git/repos/etbsa-trackermap-mobile
Diffstat (limited to 'shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers')
-rw-r--r-- | shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt index 29c4229..bc0a48f 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/ReportController.kt @@ -60,18 +60,17 @@ class ReportController( return } - val (currentDate, previousDate) = ReportDates.getDates(reportPeriod) + val (from, to) = reportPeriod.getStringDates() if (!xlsx) { reportFlow.value = Report.LoadingReport } - // GlobalScope.launch { - when (reportType) { - ReportType.POSITIONS -> fetchPositions(deviceId, previousDate, currentDate, xlsx) - ReportType.EVENTS -> fetchEvents(deviceId, previousDate, currentDate, eventTypes, xlsx) - ReportType.STOPS -> fetchStops(deviceId, previousDate, currentDate, xlsx) - } - // } + + when (reportType) { + ReportType.POSITIONS -> fetchPositions(deviceId, from, to, xlsx) + ReportType.EVENTS -> fetchEvents(deviceId, from, to, eventTypes, xlsx) + ReportType.STOPS -> fetchStops(deviceId, from, to, xlsx) + } } private suspend fun fetchPositions( |