From 48489f116b996ceebd7e3a8d08b2223d4f8021cf Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Tue, 13 Apr 2021 17:48:27 +0530
Subject: Event Type Localization and geofence store creation

---
 modern/src/reports/EventReportPage.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'modern/src/reports/EventReportPage.js')

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index cbe2ced..2478cad 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -5,6 +5,8 @@ import t from '../common/localization';
 import { formatDate } from '../common/formatter';
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
+import { prefixString } from '../common/stringUtils';
+import { useSelector } from 'react-redux';
 
 const Filter = ({ setItems }) => {
 
@@ -57,8 +59,17 @@ const Filter = ({ setItems }) => {
 
 const EventReportPage = () => {
 
+  const geofences = useSelector(state => state.geofences.items);
   const [items, setItems] = useState([]);
 
+  const formatGeofence = value => {
+    if (value !== 0) {
+        const geofence = geofences[value];
+        return geofence ? geofence.name : '';
+    }
+    return null;
+  }
+
   const columns = [{
     headerName: t('positionFixTime'),
     field: 'serverTime',
@@ -70,11 +81,12 @@ const EventReportPage = () => {
     field: 'type',
     type: 'string',
     flex:1,
+    valueFormatter: ({ value }) => t(prefixString('event', value)),
   }, {
     headerName: t('sharedGeofence'),
     field: 'geofenceId',
-    type: 'number',
     flex: 1,
+    valueFormatter: ({ value }) => formatGeofence(value),
   }, {
     headerName: t('sharedMaintenance'),
     field: 'maintenanceId',
-- 
cgit v1.2.3


From 2691e78cd4d5486581656a490b9fb5386e68a5d9 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Mon, 19 Apr 2021 13:12:57 +0530
Subject: More code formatting

---
 modern/src/App.js                     | 1 -
 modern/src/CachingController.js       | 2 +-
 modern/src/reports/EventReportPage.js | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'modern/src/reports/EventReportPage.js')

diff --git a/modern/src/App.js b/modern/src/App.js
index 7f8a582..5fd10de 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -29,7 +29,6 @@ import ComputedAttributePage from './settings/ComputedAttributePage';
 import MaintenancesPage from './settings/MaintenancesPage';
 import MaintenancePage from './settings/MaintenancePage';
 import StatisticsPage from './admin/StatisticsPage';
-
 import CachingController from './CachingController';
 
 const App = () => {
diff --git a/modern/src/CachingController.js b/modern/src/CachingController.js
index 7adb39b..fa3b9f6 100644
--- a/modern/src/CachingController.js
+++ b/modern/src/CachingController.js
@@ -3,7 +3,6 @@ import { connect } from 'react-redux';
 import { geofencesActions } from './store';
 import { useEffectAsync } from './reactHelper';
 
-
 const CachingController = () => {
   const authenticated = useSelector(state => !!state.session.user);
   const dispatch = useDispatch();
@@ -16,6 +15,7 @@ const CachingController = () => {
       }
     }
   }, [authenticated]);
+  
   return null;
 }
 
diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 2478cad..a14fc93 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -63,7 +63,7 @@ const EventReportPage = () => {
   const [items, setItems] = useState([]);
 
   const formatGeofence = value => {
-    if (value !== 0) {
+    if (value > 0) {
         const geofence = geofences[value];
         return geofence ? geofence.name : '';
     }
-- 
cgit v1.2.3