Implements the report functionality, UI is missing

11 files changed, 360 insertions, 72 deletions

diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
index 01508ac..5736c84 100644
--- a/androidApp/build.gradle.kts
+++ b/androidApp/build.gradle.kts
@@ -37,5 +37,6 @@ dependencies {
     implementation("androidx.fragment:fragment-ktx:1.4.0")
     implementation("io.ktor:ktor-client-serialization:1.6.6")
     implementation("com.github.zerobranch:SwipeLayout:1.3.1")
+    implementation("com.github.addisonElliott:SegmentedButton:3.1.9")
     implementation(group = "", name = "WhirlyGlobeMaply", ext = "aar")
 }
\ No newline at end of file
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
index f46a5c9..16cad74 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
@@ -3,11 +3,13 @@ package mx.trackermap.TrackerMap.android
 import android.app.Application
 import mx.trackermap.TrackerMap.android.details.commands.UnitCommandsViewModel
 import mx.trackermap.TrackerMap.android.details.information.UnitInformationViewModel
+import mx.trackermap.TrackerMap.android.details.reports.UnitReportsViewModel
 import mx.trackermap.TrackerMap.android.session.LoginViewModel
 import mx.trackermap.TrackerMap.android.units.UnitsViewModel
 import mx.trackermap.TrackerMap.client.apis.CommandsApi
 import mx.trackermap.TrackerMap.client.apis.DevicesApi
 import mx.trackermap.TrackerMap.client.apis.PositionsApi
+import mx.trackermap.TrackerMap.client.apis.ReportsApi
 import mx.trackermap.TrackerMap.client.apis.SessionApi
 import mx.trackermap.TrackerMap.controllers.UnitsController
 import org.koin.android.ext.koin.androidContext
@@ -28,6 +30,7 @@ class TrackerApp : Application() {
             single { DevicesApi(get()) }
             single { PositionsApi(get()) }
             single { CommandsApi(get()) }
+            single { ReportsApi(get()) }
 
             single { UnitsController(get(), get()) }
 
@@ -35,6 +38,7 @@ class TrackerApp : Application() {
             viewModel { UnitInformationViewModel(get()) }
             viewModel { UnitCommandsViewModel(get()) }
             single { UnitsViewModel(get()) }
+            viewModel { UnitReportsViewModel(get(), get()) }
         }
 
         startKoin {
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
index a2faec8..dfc0493 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsFragment.kt
@@ -1,17 +1,22 @@
 package mx.trackermap.TrackerMap.android.details.reports
 
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import mx.trackermap.TrackerMap.android.databinding.UnitDetailsReportsBinding
 import mx.trackermap.TrackerMap.android.details.UnitDetailsAdapter
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class UnitReportsFragment : Fragment() {
 
-class UnitReportsFragment: Fragment() {
     private var _binding: UnitDetailsReportsBinding? = null
     private val binding get() = _binding!!
 
+    private val unitReportsViewModel: UnitReportsViewModel by viewModel()
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -23,12 +28,33 @@ class UnitReportsFragment: Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val id = arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG)
-        binding.unitReportsText.text = "COMMANDS for ID - $id"
+
+        unitReportsViewModel.deviceId.value =
+            arguments?.getInt(UnitDetailsAdapter.DEVICE_ID_ARG) ?: 0
+        setupEvents()
+        setupObservers()
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         _binding = null
     }
+
+    private fun setupEvents() {
+        binding.reportType.setOnPositionChangedListener { position ->
+            unitReportsViewModel.reportType.value = when (position) {
+                0 -> UnitReportsViewModel.ReportType.POSITIONS
+                1 -> UnitReportsViewModel.ReportType.EVENTS
+                else -> UnitReportsViewModel.ReportType.STOPS
+            }
+        }
+        unitReportsViewModel.reportPeriod.value = UnitReportsViewModel.ReportPeriod.DAY
+        unitReportsViewModel.reportType.value = UnitReportsViewModel.ReportType.POSITIONS
+    }
+
+    private fun setupObservers() {
+        unitReportsViewModel.report.observe(this) { report ->
+            Log.d("UnitReportsFragment", "Report available: $report")
+        }
+    }
 }
\ No newline at end of file
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt
new file mode 100644
index 0000000..808bdda
--- /dev/null
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/details/reports/UnitReportsViewModel.kt
@@ -0,0 +1,142 @@
+package mx.trackermap.TrackerMap.android.details.reports
+
+import android.util.Log
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.asFlow
+import androidx.lifecycle.viewModelScope
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import mx.trackermap.TrackerMap.client.apis.ReportsApi
+import mx.trackermap.TrackerMap.client.models.Event
+import mx.trackermap.TrackerMap.client.models.Position
+import mx.trackermap.TrackerMap.client.models.Stop
+import org.koin.core.component.KoinComponent
+
+class UnitReportsViewModel(
+    private val reportsApi: ReportsApi,
+    savedStateHandle: SavedStateHandle
+) : ViewModel(), KoinComponent {
+
+    sealed class Report {
+        class PositionsReport(positions: Array<Position>) : Report()
+        class EventsReport(events: Array<Event>) : Report()
+        class StopsReport(stops: Array<Stop>) : Report()
+    }
+
+    enum class ReportType {
+        POSITIONS, EVENTS, STOPS
+    }
+
+    enum class ReportPeriod {
+        DAY, WEEK, MONTH
+    }
+
+    var deviceId = savedStateHandle.getLiveData("deviceId", 0)
+    val reportType: MutableLiveData<ReportType> = savedStateHandle.getLiveData("reportType", null)
+    val reportPeriod: MutableLiveData<ReportPeriod> =
+        savedStateHandle.getLiveData("reportPeriod", null)
+    val report: MutableLiveData<Report> = MutableLiveData()
+
+    val dateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'")
+
+    init {
+        viewModelScope.launch {
+            setupTypeObserver()
+        }
+        viewModelScope.launch {
+            setupPeriodObserver()
+        }
+    }
+
+    private suspend fun setupTypeObserver() {
+        reportType.asFlow().collect {
+            fetchReport()
+        }
+    }
+
+    private suspend fun setupPeriodObserver() {
+        reportPeriod.asFlow().collect {
+            fetchReport()
+        }
+    }
+
+    private fun fetchReport() {
+        if (reportType.value == null || reportPeriod.value == null) {
+            return
+        }
+
+        val (currentDate, previousDate) = getDates()
+        Log.d("UnitReportsVM", "Current report type: ${reportType.value.toString()}")
+        Log.d("UnitReportsVM", "Current report period: ${reportPeriod.value.toString()}")
+        Log.d("UnitReportsVM", "Current date:${dateFormat.format(currentDate)}")
+        Log.d("UnitReportsVM", "Previous date:${dateFormat.format(previousDate)}")
+
+        viewModelScope.launch {
+            when (reportType.value!!) {
+                ReportType.POSITIONS -> fetchPositions(previousDate, currentDate)
+                ReportType.EVENTS -> fetchEvents(previousDate, currentDate)
+                ReportType.STOPS -> fetchStops(previousDate, currentDate)
+            }
+        }
+    }
+
+    private fun getDates(): Pair<Date, Date> {
+        val calendar = Calendar.getInstance()
+        val currentDate = calendar.time
+
+        calendar.add(
+            Calendar.DATE, when (reportPeriod.value!!) {
+                ReportPeriod.DAY -> -1
+                ReportPeriod.WEEK -> -7
+                ReportPeriod.MONTH -> -30
+            }
+        )
+        val previousDate = calendar.time
+
+        return Pair(currentDate, previousDate)
+    }
+
+    private suspend fun fetchPositions(from: Date, to: Date) {
+        Log.d("UnitReportsVM", "Fetching positions")
+
+        val result = reportsApi.reportsRouteGet(
+            dateFormat.format(from),
+            dateFormat.format(to),
+            deviceId.value!!
+        )
+
+        Log.d("UnitReportsVM", "Positions report: $result")
+        report.postValue(Report.PositionsReport(result))
+    }
+
+    private suspend fun fetchEvents(from: Date, to: Date) {
+        Log.d("UnitReportsVM", "Fetching events")
+
+        val result = reportsApi.reportsEventsGet(
+            dateFormat.format(from),
+            dateFormat.format(to),
+            deviceId.value!!
+        )
+
+        Log.d("UnitReportsVM", "Events report: $result")
+        report.postValue(Report.EventsReport(result))
+    }
+
+    private suspend fun fetchStops(from: Date, to: Date) {
+        Log.d("UnitReportsVM", "Fetching stops")
+
+        val result = reportsApi.reportsStopsGet(
+            dateFormat.format(from),
+            dateFormat.format(to),
+            deviceId.value!!
+        )
+
+        Log.d("UnitReportsVM", "Stops report: $result")
+        report.postValue(Report.StopsReport(result))
+    }
+}
\ No newline at end of file
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
index 4852757..6a01e33 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/devices/DevicesAdapter.kt
@@ -73,7 +73,7 @@ class DevicesAdapter(
             driverName.text = unit.device.contact
             unitSpeed.text = context.getString(R.string.unit_speed_format, unit.position?.speed?.toInt() ?: 0)
             lastAddress.text = unit.position?.address
-            lastDate.text = "yyyy/mm/dd, hh:mm"
+            lastDate.text = unit.position?.deviceTime
             actionCallback?.let { callback ->
                 detailsButton.setOnClickListener { callback(unit, Action.DETAILS) }
                 reportsButton.setOnClickListener { callback(unit, Action.REPORTS) }
diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml
index f1b52e3..f064a3f 100644
--- a/androidApp/src/main/res/layout/unit_details_reports.xml
+++ b/androidApp/src/main/res/layout/unit_details_reports.xml
@@ -1,19 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/unitReportsText"
-        android:layout_width="wrap_content"
+    <com.addisonelliott.segmentedbutton.SegmentedButtonGroup
+        android:id="@+id/reportType"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_margin="@dimen/margin"
+        app:borderWidth="1dp"
+        app:dividerPadding="10dp"
+        app:dividerWidth="1dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        tools:text="REPORTS"/>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:position="0"
+        app:radius="30dp"
+        app:ripple="true"
+        app:selectedBackground="@color/colorPrimary">
+
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawableGravity="top"
+            app:selectedTextColor="@color/darkBackground"
+            app:text="@string/positions"
+            app:textColor="@color/colorPrimaryDark" />
+
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawableGravity="top"
+            app:selectedTextColor="@color/darkBackground"
+            app:text="@string/events"
+            app:textColor="@color/colorPrimaryDark" />
+
+        <com.addisonelliott.segmentedbutton.SegmentedButton
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dp"
+            app:drawableGravity="top"
+            app:selectedTextColor="@color/darkBackground"
+            app:text="@string/stops"
+            app:textColor="@color/colorPrimaryDark" />
+
+    </com.addisonelliott.segmentedbutton.SegmentedButtonGroup>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 7478ddb..ca9ff5e 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -23,7 +23,12 @@
     <string name="unit_reports">Reports</string>
     <string name="unit_commands">Commands</string>
     <string name="units_search">Type to search</string>
+    
     <string name="key">Key</string>
     <string name="value">Value</string>
     <string name="send_command">Send Command</string>
+    
+    <string name="positions">Positions</string>
+    <string name="events">Events</string>
+    <string name="stops">Stops</string>
 </resources>
\ No newline at end of file
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/ReportsApi.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/ReportsApi.kt
index 0caa945..43feaa6 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/ReportsApi.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/apis/ReportsApi.kt
@@ -13,7 +13,7 @@ package mx.trackermap.TrackerMap.client.apis
 
 import mx.trackermap.TrackerMap.client.models.Event
 import mx.trackermap.TrackerMap.client.models.Position
-import mx.trackermap.TrackerMap.client.models.ReportStops
+import mx.trackermap.TrackerMap.client.models.Stop
 import mx.trackermap.TrackerMap.client.models.ReportSummary
 import mx.trackermap.TrackerMap.client.models.ReportTrips
 
@@ -24,142 +24,210 @@ class ReportsApi(basePath: kotlin.String = "https://demo.traccar.org/api") : Api
     /**
      * Fetch a list of Events within the time period for the Devices or Groups
      * At least one _deviceId_ or one _groupId_ must be passed
-     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
-     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
+     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
+     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
      * @param deviceId  (optional)
      * @param groupId  (optional)
      * @param type % can be used to return events of all types (optional)
      * @return kotlin.Array<Event>
      */
     @Suppress("UNCHECKED_CAST")
-    suspend fun reportsEventsGet(from: java.time.LocalDateTime, to: java.time.LocalDateTime, deviceId: kotlin.Array<kotlin.Int>? = null, groupId: kotlin.Array<kotlin.Int>? = null, type: kotlin.Array<kotlin.String>? = null): kotlin.Array<Event> {
-        val localVariableQuery: MultiValueMap = mapOf("deviceId" to toMultiValue(deviceId!!.toList(), "multi"), "groupId" to toMultiValue(groupId!!.toList(), "multi"), "type" to toMultiValue(type!!.toList(), "csv"), "from" to listOf("$from"), "to" to listOf("$to"))
+    suspend fun reportsEventsGet(
+        from: String,
+        to: String,
+        deviceId: Int
+    ): kotlin.Array<Event> {
+        val localVariableQuery: MultiValueMap = mapOf(
+            "deviceId" to toMultiValue(listOf(deviceId), "multi"),
+            "from" to listOf(from),
+            "to" to listOf(to)
+        )
         val localVariableConfig = RequestConfig(
-                RequestMethod.GET,
-                "/reports/events", query = localVariableQuery
+            RequestMethod.GET,
+            "/reports/events", query = localVariableQuery
         )
         val response = request<kotlin.Array<Event>>(
-                localVariableConfig
+            localVariableConfig
         )
 
         return when (response.responseType) {
             ResponseType.Success -> (response as Success<*>).data as kotlin.Array<Event>
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
-            ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
-            ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
+            ResponseType.ClientError -> throw ClientException(
+                (response as ClientError<*>).body as? String ?: "Client error"
+            )
+            ResponseType.ServerError -> throw ServerException(
+                (response as ServerError<*>).message ?: "Server error"
+            )
         }
     }
+
     /**
      * Fetch a list of Positions within the time period for the Devices or Groups
      * At least one _deviceId_ or one _groupId_ must be passed
-     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
-     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
+     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
+     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
      * @param deviceId  (optional)
      * @param groupId  (optional)
      * @return kotlin.Array<Position>
      */
     @Suppress("UNCHECKED_CAST")
-    suspend fun reportsRouteGet(from: java.time.LocalDateTime, to: java.time.LocalDateTime, deviceId: kotlin.Array<kotlin.Int>? = null, groupId: kotlin.Array<kotlin.Int>? = null): kotlin.Array<Position> {
-        val localVariableQuery: MultiValueMap = mapOf("deviceId" to toMultiValue(deviceId!!.toList(), "multi"), "groupId" to toMultiValue(groupId!!.toList(), "multi"), "from" to listOf("$from"), "to" to listOf("$to"))
+    suspend fun reportsRouteGet(
+        from: String,
+        to: String,
+        deviceId: Int
+    ): kotlin.Array<Position> {
+        val localVariableQuery: MultiValueMap = mapOf(
+            "deviceId" to toMultiValue(listOf(deviceId), "multi"),
+            "from" to listOf(from),
+            "to" to listOf(to)
+        )
         val localVariableConfig = RequestConfig(
-                RequestMethod.GET,
-                "/reports/route", query = localVariableQuery
+            RequestMethod.GET,
+            "/reports/route", query = localVariableQuery
         )
         val response = request<kotlin.Array<Position>>(
-                localVariableConfig
+            localVariableConfig
         )
 
         return when (response.responseType) {
             ResponseType.Success -> (response as Success<*>).data as kotlin.Array<Position>
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
-            ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
-            ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
+            ResponseType.ClientError -> throw ClientException(
+                (response as ClientError<*>).body as? String ?: "Client error"
+            )
+            ResponseType.ServerError -> throw ServerException(
+                (response as ServerError<*>).message ?: "Server error"
+            )
         }
     }
+
     /**
      * Fetch a list of ReportStops within the time period for the Devices or Groups
      * At least one _deviceId_ or one _groupId_ must be passed
-     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
-     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
+     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
+     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
      * @param deviceId  (optional)
      * @param groupId  (optional)
      * @return kotlin.Array<ReportStops>
      */
     @Suppress("UNCHECKED_CAST")
-    suspend fun reportsStopsGet(from: java.time.LocalDateTime, to: java.time.LocalDateTime, deviceId: kotlin.Array<kotlin.Int>? = null, groupId: kotlin.Array<kotlin.Int>? = null): kotlin.Array<ReportStops> {
-        val localVariableQuery: MultiValueMap = mapOf("deviceId" to toMultiValue(deviceId!!.toList(), "multi"), "groupId" to toMultiValue(groupId!!.toList(), "multi"), "from" to listOf("$from"), "to" to listOf("$to"))
+    suspend fun reportsStopsGet(
+        from: String,
+        to: String,
+        deviceId: Int
+    ): kotlin.Array<Stop> {
+        val localVariableQuery: MultiValueMap = mapOf(
+            "deviceId" to toMultiValue(listOf(deviceId), "multi"),
+            "from" to listOf(from),
+            "to" to listOf(to)
+        )
         val localVariableConfig = RequestConfig(
-                RequestMethod.GET,
-                "/reports/stops", query = localVariableQuery
+            RequestMethod.GET,
+            "/reports/stops", query = localVariableQuery
         )
-        val response = request<kotlin.Array<ReportStops>>(
-                localVariableConfig
+        val response = request<kotlin.Array<Stop>>(
+            localVariableConfig
         )
 
         return when (response.responseType) {
-            ResponseType.Success -> (response as Success<*>).data as kotlin.Array<ReportStops>
+            ResponseType.Success -> (response as Success<*>).data as kotlin.Array<Stop>
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
-            ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
-            ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
+            ResponseType.ClientError -> throw ClientException(
+                (response as ClientError<*>).body as? String ?: "Client error"
+            )
+            ResponseType.ServerError -> throw ServerException(
+                (response as ServerError<*>).message ?: "Server error"
+            )
         }
     }
+
     /**
      * Fetch a list of ReportSummary within the time period for the Devices or Groups
      * At least one _deviceId_ or one _groupId_ must be passed
-     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
-     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
+     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
+     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
      * @param deviceId  (optional)
      * @param groupId  (optional)
      * @return kotlin.Array<ReportSummary>
      */
     @Suppress("UNCHECKED_CAST")
-    suspend fun reportsSummaryGet(from: java.time.LocalDateTime, to: java.time.LocalDateTime, deviceId: kotlin.Array<kotlin.Int>? = null, groupId: kotlin.Array<kotlin.Int>? = null): kotlin.Array<ReportSummary> {
-        val localVariableQuery: MultiValueMap = mapOf("deviceId" to toMultiValue(deviceId!!.toList(), "multi"), "groupId" to toMultiValue(groupId!!.toList(), "multi"), "from" to listOf("$from"), "to" to listOf("$to"))
+    suspend fun reportsSummaryGet(
+        from: java.time.LocalDateTime,
+        to: java.time.LocalDateTime,
+        deviceId: kotlin.Array<kotlin.Int>? = null,
+        groupId: kotlin.Array<kotlin.Int>? = null
+    ): kotlin.Array<ReportSummary> {
+        val localVariableQuery: MultiValueMap = mapOf(
+            "deviceId" to toMultiValue(deviceId!!.toList(), "multi"),
+            "groupId" to toMultiValue(groupId!!.toList(), "multi"),
+            "from" to listOf("$from"),
+            "to" to listOf("$to")
+        )
         val localVariableConfig = RequestConfig(
-                RequestMethod.GET,
-                "/reports/summary", query = localVariableQuery
+            RequestMethod.GET,
+            "/reports/summary", query = localVariableQuery
         )
         val response = request<kotlin.Array<ReportSummary>>(
-                localVariableConfig
+            localVariableConfig
         )
 
         return when (response.responseType) {
             ResponseType.Success -> (response as Success<*>).data as kotlin.Array<ReportSummary>
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
-            ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
-            ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
+            ResponseType.ClientError -> throw ClientException(
+                (response as ClientError<*>).body as? String ?: "Client error"
+            )
+            ResponseType.ServerError -> throw ServerException(
+                (response as ServerError<*>).message ?: "Server error"
+            )
         }
     }
+
     /**
      * Fetch a list of ReportTrips within the time period for the Devices or Groups
      * At least one _deviceId_ or one _groupId_ must be passed
-     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
-     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60; 
+     * @param from in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
+     * @param to in IS0 8601 format. eg. &#x60;1963-11-22T18:30:00Z&#x60;
      * @param deviceId  (optional)
      * @param groupId  (optional)
      * @return kotlin.Array<ReportTrips>
      */
     @Suppress("UNCHECKED_CAST")
-    suspend fun reportsTripsGet(from: java.time.LocalDateTime, to: java.time.LocalDateTime, deviceId: kotlin.Array<kotlin.Int>? = null, groupId: kotlin.Array<kotlin.Int>? = null): kotlin.Array<ReportTrips> {
-        val localVariableQuery: MultiValueMap = mapOf("deviceId" to toMultiValue(deviceId!!.toList(), "multi"), "groupId" to toMultiValue(groupId!!.toList(), "multi"), "from" to listOf("$from"), "to" to listOf("$to"))
+    suspend fun reportsTripsGet(
+        from: java.time.LocalDateTime,
+        to: java.time.LocalDateTime,
+        deviceId: kotlin.Array<kotlin.Int>? = null,
+        groupId: kotlin.Array<kotlin.Int>? = null
+    ): kotlin.Array<ReportTrips> {
+        val localVariableQuery: MultiValueMap = mapOf(
+            "deviceId" to toMultiValue(deviceId!!.toList(), "multi"),
+            "groupId" to toMultiValue(groupId!!.toList(), "multi"),
+            "from" to listOf("$from"),
+            "to" to listOf("$to")
+        )
         val localVariableConfig = RequestConfig(
-                RequestMethod.GET,
-                "/reports/trips", query = localVariableQuery
+            RequestMethod.GET,
+            "/reports/trips", query = localVariableQuery
         )
         val response = request<kotlin.Array<ReportTrips>>(
-                localVariableConfig
+            localVariableConfig
         )
 
         return when (response.responseType) {
             ResponseType.Success -> (response as Success<*>).data as kotlin.Array<ReportTrips>
             ResponseType.Informational -> TODO()
             ResponseType.Redirection -> TODO()
-            ResponseType.ClientError -> throw ClientException((response as ClientError<*>).body as? String ?: "Client error")
-            ResponseType.ServerError -> throw ServerException((response as ServerError<*>).message ?: "Server error")
+            ResponseType.ClientError -> throw ClientException(
+                (response as ClientError<*>).body as? String ?: "Client error"
+            )
+            ResponseType.ServerError -> throw ServerException(
+                (response as ServerError<*>).message ?: "Server error"
+            )
         }
     }
 }
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
index e504600..741ae57 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Event.kt
@@ -11,6 +11,7 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonPrimitive
 
 
@@ -25,12 +26,13 @@ import kotlinx.serialization.json.JsonPrimitive
  * @param maintenanceId 
  * @param attributes 
  */
+@Serializable
 data class Event (
 
     val id: Int? = null,
     val type: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-    val eventTime: java.time.LocalDateTime? = null,
+    val eventTime: String? = null,
     val deviceId: Int? = null,
     val positionId: Int? = null,
     val geofenceId: Int? = null,
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
index 9a16615..5286b46 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Position.kt
@@ -46,11 +46,11 @@ data class Position (
     val deviceId: Int? = null,
     val protocol: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-//    val deviceTime: LocalDateTime? = null,
+    val deviceTime: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-//    val fixTime: LocalDateTime? = null,
+    val fixTime: String? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-//    val serverTime: LocalDateTime? = null,
+    val serverTime: String? = null,
     val outdated: Boolean? = null,
     val valid: Boolean? = null,
     val latitude: Double? = null,
diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/ReportStops.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Stop.kt
index bdd4cbe..c06b864 100644
--- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/ReportStops.kt
+++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/client/models/Stop.kt
@@ -11,6 +11,8 @@
  */
 package mx.trackermap.TrackerMap.client.models
 
+import kotlinx.serialization.Serializable
+
 
 /**
  * 
@@ -25,20 +27,21 @@ package mx.trackermap.TrackerMap.client.models
  * @param spentFuel in liters
  * @param engineHours 
  */
-data class ReportStops (
+@Serializable
+data class Stop (
 
     val deviceId: kotlin.Int? = null,
     val deviceName: kotlin.String? = null,
     val duration: kotlin.Int? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-    val startTime: java.time.LocalDateTime? = null,
+    val startTime: String? = null,
     val address: kotlin.String? = null,
-    val lat: java.math.BigDecimal? = null,
-    val lon: java.math.BigDecimal? = null,
+    val lat: Double? = null,
+    val lon: Double? = null,
     /* in IS0 8601 format. eg. `1963-11-22T18:30:00Z` */
-    val endTime: java.time.LocalDateTime? = null,
+    val endTime: String? = null,
     /* in liters */
-    val spentFuel: java.math.BigDecimal? = null,
+    val spentFuel: Double? = null,
     val engineHours: kotlin.Int? = null
 ) {
 }
\ No newline at end of file