Refactored reports code into ReportController.kt and added extra report periods

3 files changed, 40 insertions, 12 deletions

diff --git a/androidApp/src/main/res/menu/report_period_options.xml b/androidApp/src/main/res/menu/report_period_options.xml
index cf54ec3..60fb58c 100644
--- a/androidApp/src/main/res/menu/report_period_options.xml
+++ b/androidApp/src/main/res/menu/report_period_options.xml
@@ -3,15 +3,31 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/dayOption"
-        android:title="@string/day_period" />
+        android:id="@+id/optionToday"
+        android:title="@string/period_today" />
 
     <item
-        android:id="@+id/weekOption"
-        android:title="@string/week_period" />
+        android:id="@+id/optionLast24"
+        android:title="@string/period_last_24" />
 
     <item
-        android:id="@+id/monthOption"
-        android:title="@string/month_period" />
+        android:id="@+id/optionYesterday"
+        android:title="@string/period_yesterday" />
+
+    <item
+        android:id="@+id/optionWeek"
+        android:title="@string/period_this_week" />
+
+    <item
+        android:id="@+id/optionLast7"
+        android:title="@string/period_last_7" />
+
+    <item
+        android:id="@+id/optionMonth"
+        android:title="@string/period_this_month" />
+
+    <item
+        android:id="@+id/optionLast30"
+        android:title="@string/period_last_30" />
 
 </menu>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values-es-rMX/strings.xml b/androidApp/src/main/res/values-es-rMX/strings.xml
index 1916f26..7ebf7d2 100644
--- a/androidApp/src/main/res/values-es-rMX/strings.xml
+++ b/androidApp/src/main/res/values-es-rMX/strings.xml
@@ -81,13 +81,19 @@
     <string name="positions">Posiciones</string>
     <string name="events">Eventos</string>
     <string name="stops">Paradas</string>
-    <string name="day_period">Día</string>
-    <string name="week_period">Semana</string>
-    <string name="month_period">Mes</string>
     <string name="period">Periodo</string>
     <string name="select_period">Seleccionar</string>
     <string name="export_report">Exportar</string>
 
+    <!-- Report periods -->
+    <string name="period_today">Hoy</string>
+    <string name="period_last_24">Últimas 24H</string>
+    <string name="period_yesterday">Ayer</string>
+    <string name="period_this_week">Semana</string>
+    <string name="period_last_7">Últimos 7d</string>
+    <string name="period_this_month">Mes</string>
+    <string name="period_last_30">Últimos 30d</string>
+
     <string name="table_event">Evento</string>
     <string name="table_datetime">Fecha y hora</string>
     <string name="table_geofence">Geocerca</string>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index e3a31e0..5f9714e 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -104,13 +104,19 @@
     <string name="positions">Positions</string>
     <string name="events">Events</string>
     <string name="stops">Stops</string>
-    <string name="day_period">Day</string>
-    <string name="week_period">Week</string>
-    <string name="month_period">Month</string>
     <string name="period">Period</string>
     <string name="select_period">Select</string>
     <string name="export_report">Export</string>
 
+    <!-- Report periods -->
+    <string name="period_today">Today</string>
+    <string name="period_last_24">Last 24H</string>
+    <string name="period_yesterday">Yesterday</string>
+    <string name="period_this_week">Week</string>
+    <string name="period_last_7">Last 7d</string>
+    <string name="period_this_month">Month</string>
+    <string name="period_last_30">Last 30d</string>
+
     <string name="table_event">Event</string>
     <string name="table_datetime">Datetime</string>
     <string name="table_geofence">Geofence</string>