fleetmap-reports 1.0.302 → 1.0.306

package/package.json

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

package/src/index.js

@@ -40,9 +40,6 @@ 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)
@@ -112,6 +109,10 @@ function Reports(config, axios) {
         return require('./kms-report').exportKmsReportToPDF(userData, reportData)
     }
 
+    this.kmsReportToWord = (userData, reportData) => {
+        return require('./kms-report').exportKmsReportToWord(userData, reportData)
+    }
+
     this.kmsReportToExcel = (userData, reportData) => {
         return require('./kms-report').exportKmsReportToExcel(userData, reportData)
     }

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
@@ -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,8 +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 {Document, Paragraph, TextRun, Packer} = require("docx");
+const {isInsideTimetable, addNearestPOIs, isPartialInsideTimetable} = require("./util/trips")
+const word = require('./word')
 
 
 let traccarInstance
@@ -206,34 +206,6 @@ function processDrivers(from, to, drivers, data) {
     return driversResult
 }
 
-function exportTripReportToWord(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");
-    })
-}
-
 async function exportTripReportToPDF(userData, reportData) {
     console.log('Export to PDF')
 
@@ -477,4 +449,3 @@ function getStop(tripEndDate, stops){
 exports.createTripReport = createTripReport
 exports.exportTripReportToPDF = exportTripReportToPDF
 exports.exportTripReportToExcel = exportTripReportToExcel
-exports.exportTripReportToWord = exportTripReportToWord

package/src/util/utils.js

@@ -56,6 +56,7 @@ async function getImgFromUrl(hostname) {
 }
 
 function isClientSide() { return (typeof window !== "undefined") }
+exports.isClientSide = isClientSide
 
 function convertToLocaleString(value, lang, timezone){
     if(isClientSide()){

package/src/word/index.js

@@ -0,0 +1,33 @@
+const {Document, Paragraph, Packer, TableRow, TableCell, Table} = require("docx")
+const { saveAs } = require('file-saver')
+const kmsReport = require('../kms-report')
+const utils = require('../util/utils')
+
+exports.exportKmsReportToWord = (userData, reportData) => {
+    const excel = kmsReport.exportKmsReportToExcel(userData, reportData)
+    console.log('excel', excel)
+    if (!excel.data.length && utils.isClientSide()) {
+        alert('Não há dados')
+        return
+    }
+    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");
+    })
+}