fleetmap-reports 1.0.237 → 1.0.238

package/.idea/workspace.xml

@@ -1,21 +1,24 @@
 <?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="Kms report grouped by day">
-      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptBR.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptBR.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptPT.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptPT.js" afterDir="false" />
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix pdf logo">
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.js" 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/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/pdfDocument.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/pdfDocument.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="JavaScript File" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -164,7 +167,7 @@
       <workItem from="1637670815688" duration="2973000" />
       <workItem from="1637674107929" duration="13419000" />
       <workItem from="1637756665591" duration="4742000" />
-      <workItem from="1637841765985" duration="4644000" />
+      <workItem from="1637841765985" duration="8842000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -194,7 +197,14 @@
       <option name="project" value="LOCAL" />
       <updated>1637715473149</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="Fix pdf logo">
+      <created>1637849206762</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1637849206762</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -217,6 +227,7 @@
     <MESSAGE value="Fix getStyle in all reports" />
     <MESSAGE value="try catch on pdf addImage" />
     <MESSAGE value="Kms report grouped by day" />
-    <option name="LAST_COMMIT_MESSAGE" value="Kms report grouped by day" />
+    <MESSAGE value="Fix pdf logo" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix pdf logo" />
   </component>
 </project>

package/package.json

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

package/src/kms-report.js

@@ -6,7 +6,7 @@ const {getStyle} = require("./reportStyle");
 const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const automaticReports = require("./automaticReports");
-const {jsPDFOptions} = require("jspdf");
+const traccar = require("./util/traccar");
 
 
 let traccarInstance
@@ -24,16 +24,7 @@ async function createKmsReportByDevice(from, to, userData) {
     }
 
     devicesToProcess.sort((a, b) => (a.name > b.name) ? 1 : -1)
-    const devicesToSlice = devicesToProcess.slice()
-
-    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
-    let data = []
-    for (const a of arrayOfArrays) {
-        console.log('getting',from,to,a.map(a => a.id))
-        const response = await traccarInstance.reports.reportsRouteGet(from, to, a.map(d => d.id))
-        console.log('concat', response.data.length)
-        data = data.concat(response.data)
-    }
+    const data = await traccar.getRoute(traccarInstance, from, to, devicesToProcess)
 
     console.log('locations:' + data.length)
 
@@ -159,7 +150,7 @@ async function exportKmsReportToPDF(userData, reportData) {
                 const data = []
                 d.days.forEach(day => {
                     const temp = [
-                        day.date,
+                        new Date(day.date).toLocaleDateString(),
                         (day.kms/1000).toFixed(0)
                     ]
 
@@ -255,7 +246,7 @@ function exportKmsReportToExcel(userData, reportData) {
     } else {
         headers.push(
             {label: translations.report.vehicle, value: 'name'},
-            {label: translations.report.licensePlate, value: 'licenseplate'},
+            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     }

package/src/util/traccar.js

@@ -0,0 +1,17 @@
+const automaticReports = require("../automaticReports");
+
+async function getRoute(traccar, from, to, devices){
+    const devicesToSlice = devices.slice()
+
+    const arrayOfArrays = automaticReports.sliceArray(devicesToSlice)
+    let requests = []
+    for (const a of arrayOfArrays) {
+        const promise = traccar.reports.reportsRouteGet(from, to, a.map(d => d.id))
+        requests = requests.concat(promise)
+    }
+
+    const result = await Promise.all(requests)
+    return result.map(r => r.data).flat()
+}
+
+exports.getRoute = getRoute