fleetmap-reports 1.0.255 → 1.0.259

package/.idea/workspace.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix trips distance because imported positions generate trips with 0 kms">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix reports by driver">
       <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/trips.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/trips.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/location-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/location-report.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -212,7 +212,10 @@
       <workItem from="1639592539998" duration="27141000" />
       <workItem from="1639766010908" duration="4991000" />
       <workItem from="1639872937953" duration="1438000" />
-      <workItem from="1639954341221" duration="10241000" />
+      <workItem from="1639954341221" duration="11986000" />
+      <workItem from="1640272520380" duration="2253000" />
+      <workItem from="1640789226071" duration="1935000" />
+      <workItem from="1640794844118" duration="226000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -319,7 +322,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640000462825</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="Fix reports by driver">
+      <created>1640274171902</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1640274171902</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -352,6 +362,7 @@
     <MESSAGE value="fix speeding report" />
     <MESSAGE value="Trip and activity report with time period" />
     <MESSAGE value="Fix trips distance because imported positions generate trips with 0 kms" />
-    <option name="LAST_COMMIT_MESSAGE" value="Fix trips distance because imported positions generate trips with 0 kms" />
+    <MESSAGE value="Fix reports by driver" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix reports by driver" />
   </component>
 </project>

package/lang/enGB.js

@@ -162,7 +162,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Select vehicles',
     select_vehicles_placeholder: 'Vehicles',
     select_geofences: 'Select geofences',

package/lang/esCL.js

@@ -157,7 +157,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccione vehículos',
     select_vehicles_placeholder: 'Vehículos',
     select_geofences: 'Seleccione geocercas',

package/lang/ptBR.js

@@ -154,7 +154,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',

package/lang/ptPT.js

@@ -158,7 +158,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.255",
+  "version": "1.0.259",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/index.test.js

@@ -44,6 +44,17 @@ describe('Reports', function() {
 
         console.log(reportData)
 
+        await reports.kmsReportToPDF(userData, reportData[0])
+    })
+    it('test locationReport by day', async () => {
+        const reports = await getReports()
+        const userData = await reports.getUserData()
+        userData.groupByDay = true
+        const reportData = await reports.locations(new Date(2021, 10, 1), new Date(2021, 10, 3),
+            userData)
+
+        console.log(reportData)
+
         await reports.kmsReportToPDF(userData, reportData[0])
     })
 })

package/src/location-report.js

@@ -8,6 +8,8 @@ const {getUserPartner} = require("fleetmap-partners");
 
 const fileName = 'LocationReport'
 
+const clientSide = typeof window !== "undefined"
+
 async function createLocationReport(from, to, userData, traccar) {
     console.log('Create LocationReport')
 
@@ -112,7 +114,7 @@ async function exportLocationReportToPDF(userData, reportData) {
         translations.report.speed,
         translations.report.ignition,
         translations.report.driver,
-        translations.temperature
+        translations.report.temperature
     ]
 
     if (reportData.devices) {
@@ -251,10 +253,14 @@ function deviceName(device){
 }
 
 function getLocationDate(location, user){
-    return new Date(location.fixTime).toLocaleString(user.attributes.lang, {
-        timeZone: user.attributes.timezone,
-        hour12: false
-    })
+    if(clientSide) {
+        return new Date(location.fixTime).toLocaleString()
+    } else {
+        return new Date(location.fixTime).toLocaleString(user.attributes.lang, {
+            timeZone: user.attributes.timezone,
+            hour12: false
+        })
+    }
 }
 
 function getDriverName(location, drivers) {

package/src/util/driver.js

@@ -2,8 +2,7 @@ const traccar = require("./traccar");
 
 //get devices used by each driver between two dates
 async function devicesByDriver(traccarInstance, from, to, drivers, devices){
-    const eventsData = traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
-
+    const eventsData = await traccar.getEvents(traccarInstance, from, to , devices, ['driverChanged'])
     const deviceIds = []
     for(const d of drivers) {
         const events = eventsData.filter(e => {