fleetmap-reports 1.0.248 → 1.0.249

package/.idea/workspace.xml

@@ -1,7 +1,7 @@
 <?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="refactor speeding and trip report">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Kms report with time period">
       <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/kms-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/kms-report.js" afterDir="false" />
@@ -192,7 +192,10 @@
       <workItem from="1638792860278" duration="2140000" />
       <workItem from="1638839462028" duration="50000" />
       <workItem from="1638840110567" duration="597000" />
-      <workItem from="1638888787940" duration="18005000" />
+      <workItem from="1638888787940" duration="19894000" />
+      <workItem from="1639074912454" duration="257000" />
+      <workItem from="1639090037682" duration="2514000" />
+      <workItem from="1639135460686" duration="2390000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -257,7 +260,14 @@
       <option name="project" value="LOCAL" />
       <updated>1638288337135</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="Kms report with time period">
+      <created>1639057192380</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1639057192382</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -285,6 +295,7 @@
     <MESSAGE value="Kms Report - Calculate distance with traccar trips" />
     <MESSAGE value="fix speeding report" />
     <MESSAGE value="refactor speeding and trip report" />
-    <option name="LAST_COMMIT_MESSAGE" value="refactor speeding and trip report" />
+    <MESSAGE value="Kms report with time period" />
+    <option name="LAST_COMMIT_MESSAGE" value="Kms report with time period" />
   </component>
 </project>

package/package.json

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

package/src/kms-report.js

@@ -6,6 +6,7 @@ const {getStyle} = require("./reportStyle");
 const {headerFromUser,addTable} = require("./util/pdfDocument");
 const {getUserPartner} = require("fleetmap-partners");
 const traccar = require("./util/traccar");
+const {getDates} = require("./util/utils");
 
 
 let traccarInstance
@@ -57,9 +58,20 @@ function processDevices(from, to, devices, route, trips) {
                 new Map()
             )
 
+            const allDates = getDates(from, to)
+
             const days = []
-            const keys = Array.from(groupedTrips.keys())
-            keys.forEach(key => {
+            let keys = Array.from(groupedTrips.keys())
+             allDates.forEach(d => {
+                 const day = d.toISOString().split('T')[0] + ' 12:00 PM'
+                 if(!keys.includes(day)){
+                     groupedTrips.set(day, [])
+                 }
+             })
+
+             keys = Array.from(groupedTrips.keys())
+             keys.sort((a,b)=>new Date(a).getTime()-new Date(b).getTime());
+             keys.forEach(key => {
                 const currentDate = new Date(key)
                 let dayTrips = groupedTrips.get(key)
                 const day = {

package/src/util/utils.js

@@ -29,6 +29,21 @@ function coordsDistance(lon1, lat1, lon2, lat2) {
     return (turf.distance(from, to, 'meters'))
 }
 
+function getDates(startDate, endDate) {
+    const dates = []
+    let currentDate = startDate
+    const addDays = function (days) {
+        const date = new Date(this.valueOf())
+        date.setDate(date.getDate() + days)
+        return date
+    }
+    while (currentDate <= endDate) {
+        dates.push(currentDate)
+        currentDate = addDays.call(currentDate, 1)
+    }
+    return dates
+}
+
 async function getImgFromUrl(hostname) {
     try {
         const img = new Image()
@@ -43,4 +58,5 @@ async function getImgFromUrl(hostname) {
 exports.getImgFromUrl = getImgFromUrl
 exports.convertMS = convertMS
 exports.coordsDistance = coordsDistance
+exports.getDates = getDates