Finished events report, implemented GeofenceController, fixed geofencesGet() and many fixes

3 files changed, 82 insertions, 17 deletions

diff --git a/androidApp/src/main/res/layout/unit_details_reports.xml b/androidApp/src/main/res/layout/unit_details_reports.xml
index 52a3926..1eaf68c 100644
--- a/androidApp/src/main/res/layout/unit_details_reports.xml
+++ b/androidApp/src/main/res/layout/unit_details_reports.xml
@@ -28,29 +28,50 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <TableLayout
-            android:id="@+id/eventsTable"
+        <HorizontalScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:isScrollContainer="true"
-            android:scrollbars="vertical"
-            android:stretchColumns="*">
+            android:layout_height="wrap_content">
+
+            <TableLayout
+                android:id="@+id/eventsTable"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:isScrollContainer="true"
+                android:scrollbars="vertical"
+                android:stretchColumns="*">
+
+                <TableRow android:background="@color/colorPrimary">
+
+                    <TextView
+                        android:paddingHorizontal="@dimen/padding"
+                        android:text="@string/table_datetime"
+                        android:textColor="@color/background"
+                        android:padding="@dimen/padding" />
+
+                    <TextView
+                        android:paddingHorizontal="@dimen/padding"
+                        android:text="@string/table_event"
+                        android:textColor="@color/background"
+                        android:padding="@dimen/padding" />
+
+                    <TextView
+                        android:paddingHorizontal="@dimen/padding"
+                        android:text="@string/table_geofence"
+                        android:textColor="@color/background"
+                        android:padding="@dimen/padding" />
 
-            <TableRow android:background="@color/colorPrimary">
+                    <TextView
+                        android:paddingHorizontal="@dimen/padding"
+                        android:text="@string/table_address"
+                        android:textColor="@color/background"
+                        android:padding="@dimen/padding" />
 
-                <TextView
-                    android:paddingHorizontal="@dimen/padding"
-                    android:text="@string/table_event"
-                    android:textColor="@color/background" />
+                </TableRow>
 
-                <TextView
-                    android:paddingHorizontal="@dimen/padding"
-                    android:text="@string/table_datetime"
-                    android:textColor="@color/background" />
+            </TableLayout>
 
-            </TableRow>
+        </HorizontalScrollView>
 
-        </TableLayout>
     </ScrollView>
 
     <LinearLayout
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index 7397599..9429494 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -50,6 +50,28 @@
     <string name="month_period">Mes</string>
     <string name="period">Periodo</string>
     <string name="select_period">Seleccionar</string>
+
     <string name="table_event">Evento</string>
     <string name="table_datetime">Fecha y hora</string>
+    <string name="table_geofence">Geocerca</string>
+    <string name="table_address">Dirección</string>
+
+    <string name="event_device_online">Unidad en línea</string>
+    <string name="event_device_unknown">Unidad en estado desconocido</string>
+    <string name="event_device_offline">Unidad fuera de línea</string>
+    <string name="event_device_inactive">Unidad inactiva</string>
+    <string name="event_device_moving">Unidad en movimiento</string>
+    <string name="event_device_stopped">Unidad detenida</string>
+    <string name="event_device_overspeed">Excedido el límite de velocidad</string>
+    <string name="event_device_fuel_drop">Pérdida de combustible</string>
+    <string name="event_command_result">Resultado del comando</string>
+    <string name="event_geofence_enter">Entrada en la geocerca</string>
+    <string name="event_geofence_exit">Salida de la geocerca</string>
+    <string name="event_alarm">Alarma</string>
+    <string name="event_ignition_on">Ignición encendida</string>
+    <string name="event_ignition_off">Ignición apagada</string>
+    <string name="event_maintenance">Se requiere mantenimiento</string>
+    <string name="event_text_message">Mensaje de texto recibido</string>
+    <string name="event_driver_changed">El conductor ha cambiado</string>
+    <string name="event_unknown">Evento desconocido</string>
 </resources>
\ 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 93f088a..0c6a29e 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -58,6 +58,28 @@
     <string name="month_period">Month</string>
     <string name="period">Period</string>
     <string name="select_period">Select</string>
+
     <string name="table_event">Event</string>
     <string name="table_datetime">Datetime</string>
+    <string name="table_geofence">Geofence</string>
+    <string name="table_address">Address</string>
+
+    <string name="event_device_online">Status online</string>
+    <string name="event_device_unknown">Status unknown</string>
+    <string name="event_device_offline">Status offline</string>
+    <string name="event_device_inactive">Device inactive</string>
+    <string name="event_device_moving">Device moving</string>
+    <string name="event_device_stopped">Device stopped</string>
+    <string name="event_device_overspeed">Speed limit exceeded</string>
+    <string name="event_device_fuel_drop">Fuel drop</string>
+    <string name="event_command_result">Command result</string>
+    <string name="event_geofence_enter">Geofence entered</string>
+    <string name="event_geofence_exit">Geofence exited</string>
+    <string name="event_alarm">Alarm</string>
+    <string name="event_ignition_on">Ignition on</string>
+    <string name="event_ignition_off">Ignition off</string>
+    <string name="event_maintenance">Maintenance required</string>
+    <string name="event_text_message">Text message received</string>
+    <string name="event_driver_changed">Driver changed</string>
+    <string name="event_unknown">Unknown event</string>
 </resources>