fleetmap-reports 1.0.262 → 1.0.263

package/.idea/workspace.xml

@@ -1,14 +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="calculate avg speed">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="fix activity report 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/activity-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/activity-report.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/trip-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/trip-report.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/util/traccar.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/traccar.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -222,7 +219,7 @@
       <workItem from="1640866364417" duration="67000" />
       <workItem from="1640866782794" duration="123000" />
       <workItem from="1640866964393" duration="1022000" />
-      <workItem from="1640870147277" duration="2391000" />
+      <workItem from="1640870147277" duration="6811000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -357,7 +354,14 @@
       <option name="project" value="LOCAL" />
       <updated>1640867522438</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="fix activity report by driver">
+      <created>1640872780966</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1640872780968</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -394,6 +398,7 @@
     <MESSAGE value="location report - check if it's running on client side" />
     <MESSAGE value="timezone - check if it's running on client side" />
     <MESSAGE value="calculate avg speed" />
-    <option name="LAST_COMMIT_MESSAGE" value="calculate avg speed" />
+    <MESSAGE value="fix activity report by driver" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix activity report by driver" />
   </component>
 </project>

package/package.json

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

package/src/activity-report.js

@@ -149,7 +149,7 @@ async function createActivityReportByDriver(from, to){
         to: to
     }
 
-    allData.drivers = processDrivers(userData.drivers, tripsData)
+    allData.drivers = processDrivers(from, to, userData.drivers, tripsData)
 
     return allData
 }
@@ -180,7 +180,7 @@ function processDevices(devices, data, kmsReport) {
     return devicesResult
 }
 
-function processDrivers(drivers, data) {
+function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
@@ -188,12 +188,63 @@ function processDrivers(drivers, data) {
         if (trips.length > 0) {
             const driverData = {
                 driver: d,
-                summary: [{
+                summary: [],
+            }
+            if(userData.groupByDay) {
+                const dates = getDates(from, to)
+                for(const date of dates){
+                    if(userData.allWeek){
+                        const fromByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, 0, 0)
+                        const toByDay = new Date(date.getFullYear(), date.getMonth(), date.getDate(), 23, 59, 59)
+
+                        const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+
+                        driverData.summary.push({
+                            date: date,
+                            distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                            engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                            maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                            averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                        })
+                    } else {
+                        if((date.getDay() === 0 && userData.weekDays.sunday) ||
+                            (date.getDay() === 1 && userData.weekDays.monday) ||
+                            (date.getDay() === 2 && userData.weekDays.tuesday) ||
+                            (date.getDay() === 3 && userData.weekDays.wednesday)  ||
+                            (date.getDay() === 4 && userData.weekDays.thursday) ||
+                            (date.getDay() === 5 && userData.weekDays.friday) ||
+                            (date.getDay() === 6 && userData.weekDays.saturday)) {
+
+                            const fromByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.startTime)
+                            const toByDay = new Date(new Date(date).toISOString().split('T')[0] + ' ' + userData.dayHours.endTime)
+
+                            const tripsByDay = trips.filter(t => new Date(t.startTime) > fromByDay && new Date(t.endTime) < toByDay)
+
+                            driverData.summary.push({
+                                date: date,
+                                distance: tripsByDay.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
+                                engineHours: tripsByDay.reduce((a, b) => a + b.duration, 0),
+                                maxSpeed: tripsByDay.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
+                                averageSpeed: tripsByDay.length > 0 ? Math.round(tripsByDay.reduce((a, b) => a + b.averageSpeed, 0) / tripsByDay.length) : 0,
+                            })
+                        }else {
+                            driverData.summary.push({
+                                date: date,
+                                distance: 0,
+                                engineHours: 0,
+                                maxSpeed: 0,
+                                averageSpeed: 0,
+                            })
+                        }
+                    }
+                }
+            } else {
+                driverData.summary.push({
                     distance: trips.filter(t => t.distance > 0).reduce((a, b) => a + b.distance, 0),
                     engineHours: trips.reduce((a, b) => a + b.duration, 0),
                     maxSpeed: trips.reduce((a, b) => Math.max(a, b.maxSpeed), 0),
                     averageSpeed: Math.round(trips.reduce((a, b) => a + b.averageSpeed, 0) / trips.length),
-                }],
+                })
             }
             driversResult.push(driverData)
         }
@@ -211,9 +262,11 @@ async function exportActivityReportToPDF(userData, reportData) {
         const doc = new jsPDF.jsPDF('l')
         await headerFromUser(doc, translations.report.titleActivityReport, userData.user)
 
-        if(userData.groupByDay){
+        if(userData.groupByDay && userData.byDriver) {
+            exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData)
+        } else if(userData.groupByDay) {
             exportActivityReportToPDF_Vehicle_GroupByDay(doc, translations, reportData)
-        } else if(userData.byDriver){
+        } else if(userData.byDriver) {
             exportActivityReportToPDF_Driver(doc, translations, reportData)
         } else {
             exportActivityReportToPDF_Vehicle(doc, translations, reportData)
@@ -430,6 +483,122 @@ function exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations,
     }
 }
 
+function exportActivityReportToPDF_Driver_GroupByDay(doc, translations, reportData) {
+    const headers = [translations.report.date,
+        translations.report.distance,
+        translations.report.avgSpeed + ' (Km/h)',
+        translations.report.maxSpeed + ' (Km/h)',
+        translations.report.engineHours]
+
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
+    reportData.drivers.forEach(function (d, index) {
+        const name = d.driver.name
+        const group = userData.groups.find(g => g.drivers.includes(d.id))
+
+        let space = index === 0 ? 8 : 0
+        if(index){
+            doc.addPage()
+        }
+
+        doc.setFontSize(13)
+        doc.text(name, 20, space + 20)
+        doc.setFontSize(11)
+        doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
+        doc.text(new Date(reportData.from).toLocaleString() + ' - ' + new Date(reportData.to).toLocaleString(), 20, space + 25)
+
+        if (!userData.allWeek) {
+            doc.text((userData.weekDays.monday ? ' ' + translations.report.monday + ',' : '')
+                + (userData.weekDays.tuesday ? ' ' + translations.report.tuesday + ',' : '')
+                + (userData.weekDays.wednesday ? ' ' + translations.report.wednesday + ',' : '')
+                + (userData.weekDays.thursday ? ' ' + translations.report.thursday + ',' : '')
+                + (userData.weekDays.friday ? ' ' + translations.report.friday + ',' : '')
+                + (userData.weekDays.saturday ? ' ' + translations.report.saturday + ',' : '')
+                + (userData.weekDays.sunday ? ' ' + translations.report.sunday + ',' : '')
+                + ' das '
+                + userData.dayHours.startTime + ' - ' + userData.dayHours.endTime, 20, space + 30)
+        }
+
+        const data = []
+        d.summary.forEach(s => {
+            const temp = [
+                new Date(s.date).toLocaleDateString() + ' - ' + weekDays[s.date.getDay()],
+                Number((s.distance / 1000).toFixed(2)),
+                Math.round(s.averageSpeed * 1.85200),
+                Math.round(s.maxSpeed * 1.85200),
+                convertMS(s.engineHours)
+            ]
+
+            data.push(temp)
+        })
+
+        const footValues = ['Total:' + d.summary.length,
+            (d.summary.reduce((a, b) => a + b.distance, 0) / 1000).toFixed(0),
+            getSumAvgSpeed(d.summary),
+            getSumMaxSpeed(d.summary),
+            convertMS(d.summary.reduce((a, b) => a + b.engineHours, 0))]
+
+        const style = getStyle(getUserPartner(userData.user))
+        addTable(doc, headers, data, footValues, style, 40)
+    })
+}
+
+function exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData) {
+    const headers = [{label: translations.report.driver, value: 'name'},
+        {label: translations.report.group, value: 'group'},
+        {label: translations.report.date, value: 'date'},
+        {label: translations.report.weekDay, value: 'weekday'},
+        {label: translations.report.distance, value: 'distance'},
+        {label: translations.report.speed + ' ' + translations.report.avgSpeed + ' (Km/h)', value: 'avgSpeed'},
+        {label: translations.report.speed + ' ' + translations.report.maxSpeed + ' (Km/h)', value: 'maxSpeed'},
+        {label: translations.report.engineHours, value: 'engineHours'}]
+
+    const weekDays = [
+        translations.report.sunday,
+        translations.report.monday,
+        translations.report.tuesday,
+        translations.report.wednesday,
+        translations.report.thursday,
+        translations.report.friday,
+        translations.report.saturday
+    ]
+
+    let data = []
+    if (reportData.drivers) {
+        reportData.drivers.forEach(d => {
+            const group = userData.groups.find(g => g.drivers.includes(d.id))
+
+            data = data.concat([{}])
+            data = data.concat(d.summary.map(s => {
+                return {
+                    name: d.driver.name,
+                    group: group ? group.name : '',
+                    date: new Date(s.date).toLocaleDateString(),
+                    weekday: weekDays[s.date.getDay()],
+                    distance: Number((s.distance / 1000).toFixed(0)),
+                    avgSpeed: Math.round(s.averageSpeed * 1.85200),
+                    maxSpeed: Math.round(s.maxSpeed * 1.85200),
+                    engineHours: convertMS(s.engineHours)
+                }
+            }))
+        })
+        console.log(data)
+        return {
+            headers,
+            data,
+            settings
+        }
+    }
+}
+
 function exportActivityReportToExcel_Driver(settings, translations, reportData) {
     const headers = [{label: translations.report.driver, value: 'driver'},
         {label: translations.report.distance, value: 'distance'},
@@ -505,7 +674,9 @@ function exportActivityReportToExcel(reportUserData, reportData) {
         fileName: fileName // The name of the spreadsheet
     }
 
-    if(userData.groupByDay){
+    if(userData.groupByDay && userData.byDriver){
+        return exportActivityReportToExcel_Driver_GroupByDay(settings, translations, reportData)
+    } else if(userData.groupByDay){
         return exportActivityReportToExcel_Vehicle_GroupByDay(settings, translations, reportData)
     } else if(userData.byDriver){
         return exportActivityReportToExcel_Driver(settings, translations, reportData)