fleetmap-reports 1.0.300 → 1.0.304

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

package/.idea/jsLibraryMappings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptLibraryMappings">
+    <includedPredefinedLibrary name="Node.js Core" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/fleetmap-reports.iml" filepath="$PROJECT_DIR$/.idea/fleetmap-reports.iml" />
+      <module fileurl="file://$PROJECT_DIR$/fleetmap-reports.iml" filepath="$PROJECT_DIR$/fleetmap-reports.iml" />
     </modules>
   </component>
 </project>

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

package/{.idea/fleetmap-reports.iml → fleetmap-reports.iml}

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.300",
+  "version": "1.0.304",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -12,6 +12,8 @@
   "dependencies": {
     "axios": "^0.21.1",
     "axios-cookiejar-support": "^1.0.1",
+    "docx": "^7.3.0",
+    "file-saver": "^2.0.5",
     "fleetmap-partners": "^1.0.42",
     "json-as-xlsx": "^1.2.1",
     "jspdf": "^2.3.1",

package/src/activity-report.js

@@ -10,7 +10,8 @@ const {getUserPartner} = require("fleetmap-partners")
 const traccar = require("./util/traccar")
 const {createKmsReport} = require("./kms-report");
 const {isInsideTimetable} = require("./util/trips");
-
+const { Document, Packer, Paragraph, TextRun } = require("docx")
+import { saveAs } from "file-saver"
 let traccarInstance
 let userData
 
@@ -179,7 +180,6 @@ async function createActivityReportByDriver(from, to){
     return allData
 }
 
-
 function processDevices(devices, data, kmsReport) {
     const devicesResult = []
 
@@ -267,6 +267,34 @@ async function exportActivityReportToPDF(userData, reportData) {
     }
 }
 
+function exportActivityReportToWord(userData, reportData) {
+    const doc = new Document({
+        sections: [{
+            properties: {},
+            children: [
+                new Paragraph({
+                    children: [
+                        new TextRun("Hello World"),
+                        new TextRun({
+                            text: "Foo Bar",
+                            bold: true,
+                        }),
+                        new TextRun({
+                            text: "\tGithub is the best",
+                            bold: true,
+                        }),
+                    ],
+                }),
+            ],
+        }],
+    })
+    Packer.toBlob(doc).then(blob => {
+        console.log(blob);
+        saveAs(blob, "example.docx");
+        console.log("Document created successfully");
+    })
+}
+
 function exportActivityReportToPDF_Driver(doc, translations, reportData) {
     const headers = [translations.report.driver,
         translations.report.distance,

package/src/index.js

@@ -40,6 +40,9 @@ function Reports(config, axios) {
     this.tripReportToExcel = (userData, reportData) => {
         return require('./trip-report').exportTripReportToExcel(userData, reportData)
     }
+    this.tripReportToWord = (userData, reportData) => {
+        return require('./trip-report').exportTripReportToWord(userData, reportData)
+    }
 
     this.zoneReport = (from, to, userData) => {
         return require('./zone-report').createZoneReport(from, to, userData, this.traccar)

package/src/kms-report.js

@@ -1,15 +1,15 @@
 const messages = require('../lang')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
-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");
-const trips = require("./util/trips");
-const drivers = require("./util/driver");
-const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips");
-
+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")
+const trips = require("./util/trips")
+const drivers = require("./util/driver")
+const { isInsideTimetable, isPartialInsideTimetable} = require("./util/trips")
+const word = require("./word");
 
 let traccarInstance
 let userData
@@ -118,7 +118,7 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const route = data.route.filter(t => t.driverUniqueId === d.uniqueId)
+        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
@@ -153,7 +153,6 @@ function processDrivers(from, to, drivers, data) {
     return driversResult
 }
 
-
 function processDevices(from, to, devices, data) {
     const devicesResult = []
 
@@ -428,3 +427,4 @@ function exportKmsReportToExcel(userData, reportData) {
 exports.createKmsReport = createKmsReport
 exports.exportKmsReportToPDF = exportKmsReportToPDF
 exports.exportKmsReportToExcel = exportKmsReportToExcel
+exports.exportKmsReportToWord = word.exportKmsReportToWord

package/src/trip-report.js

@@ -9,7 +9,8 @@ const {headerFromUser, addTable} = require("./util/pdfDocument")
 const {getStyle} = require("./reportStyle")
 const traccar = require("./util/traccar")
 const trips = require("./util/trips");
-const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips");
+const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
+const word = require('./word')
 
 
 let traccarInstance
@@ -179,7 +180,7 @@ function processDrivers(from, to, drivers, data) {
     console.log(data)
     const driversResult = []
     drivers.forEach(d => {
-        const route = data.route.filter(t => t.driverUniqueId === d.uniqueId)
+        const route = data.route.filter(p => p.attributes.driverUniqueId === d.uniqueId)
         const trips = data.trips.filter(t => t.driverUniqueId === d.uniqueId
             && (userData.allWeek || !userData.weekDays || isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, route)))
 
@@ -445,6 +446,7 @@ function getStop(tripEndDate, stops){
     return null
 }
 
-exports.createTripReport = createTripReport;
-exports.exportTripReportToPDF = exportTripReportToPDF;
-exports.exportTripReportToExcel = exportTripReportToExcel;
+exports.createTripReport = createTripReport
+exports.exportTripReportToPDF = exportTripReportToPDF
+exports.exportTripReportToExcel = exportTripReportToExcel
+exports.exportTripReportToWord = word.exportTripReportToWord

package/src/word/index.js

@@ -0,0 +1,27 @@
+const {Document, Paragraph, Packer, TableRow, TableCell, Table} = require("docx")
+const { saveAs } = require('file-saver')
+const kmsReport = require('../kms-report')
+
+exports.exportKmsReportToWord = (userData, reportData) => {
+    const excel = kmsReport.exportKmsReportToExcel(userData, reportData)
+    const table = new Table({
+        rows: excel.data.map(r => new TableRow({
+            children: r.map(c =>
+                new TableCell({
+                    children: [new Paragraph(c)]
+                }))
+        }))
+    })
+
+    const doc = new Document({
+        sections: [{
+            properties: {},
+            children: [
+                table
+            ],
+        }],
+    })
+    Packer.toBlob(doc).then(blob => {
+        saveAs(blob, "trip.docx");
+    })
+}

package/.idea/aws.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="accountSettings">
-    <option name="activeProfile" value="profile:default" />
-    <option name="activeRegion" value="us-east-1" />
-    <option name="recentlyUsedProfiles">
-      <list>
-        <option value="profile:default" />
-      </list>
-    </option>
-    <option name="recentlyUsedRegions">
-      <list>
-        <option value="us-east-1" />
-      </list>
-    </option>
-  </component>
-</project>

package/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>