fleetmap-reports 1.0.667 → 1.0.669

package/package.json

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

package/src/kms-report.js

@@ -167,44 +167,48 @@ function processDevices (from, to, devices, data, userData) {
 
     const trips = deviceTrips.filter(t => userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
 
-    if (trips.length > 0 && userData.groupByDay) {
-      trips.forEach(t => {
-        t.tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone).toISOString().split('T')[0] + ' 12:00 PM'
-      })
-      const groupedTrips = trips.reduce(
-        (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
-        new Map()
-      )
-
-      const allDates = getDates(from, to)
-
-      const days = []
-      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, [])
-        }
-      })
+    if (userData.groupByDay) {
+      if (trips.length > 0) {
+        trips.forEach(t => {
+          const tripDay = convertFromUTC(t.startTime, userData.user.attributes.timezone)
+          tripDay.setHours(12, 0, 0)
+          t.tripDay = tripDay.toISOString()
+        })
+        const groupedTrips = trips.reduce(
+          (entryMap, e) => entryMap.set(e.tripDay, [...entryMap.get(e.tripDay) || [], e]),
+          new Map()
+        )
 
-      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)
-        const dayTrips = groupedTrips.get(key)
-        const day = {
-          date: currentDate,
-          kms: 0
-        }
+        const allDates = getDates(from, to)
 
-        day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
+        const days = []
+        let keys = Array.from(groupedTrips.keys())
+        allDates.forEach(d => {
+          d.setHours(12, 0, 0)
+          const day = d.toISOString()
+          if (!keys.includes(day)) {
+            groupedTrips.set(day, [])
+          }
+        })
 
-        days.push(day)
-      })
-      devicesResult.push({
-        device: d,
-        days
-      })
+        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)
+          const dayTrips = groupedTrips.get(key)
+          const day = {
+            date: currentDate,
+            kms: 0
+          }
+          day.kms = dayTrips.reduce((a, b) => a + b.distance, 0)
+
+          days.push(day)
+        })
+        devicesResult.push({
+          device: d,
+          days
+        })
+      }
     } else {
       devicesResult.push({
         device: d,
@@ -382,17 +386,19 @@ function exportKmsReportToExcel (userData, reportData) {
       : userData.groups.find(g => d.device.groupId === g.id)
 
     if (userData.groupByDay) {
-      data = data.concat([{}])
-      data = data.concat(d.days.map(a => {
-        return {
-          name: d.device.name,
-          group: group ? group.name : '',
-          licenseplate: d.device.attributes.license_plate,
-          date: a.date,
-          weekday: weekDays[a.date.getDay()],
-          distance: Number((a.kms / 1000).toFixed(0))
-        }
-      }))
+      if (d.days) {
+        data = data.concat([{}])
+        data = data.concat(d.days.map(a => {
+          return {
+            name: d.device.name,
+            group: group ? group.name : '',
+            licenseplate: d.device.attributes.license_plate,
+            date: a.date,
+            weekday: weekDays[a.date.getDay()],
+            distance: Number((a.kms / 1000).toFixed(0))
+          }
+        }))
+      }
     } else {
       data = data.concat([{
         name: userData.byDriver ? d.driver.name : d.device.name,