fleetmap-reports 1.0.232 → 1.0.233

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>

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">
+    <file url="file://$PROJECT_DIR$" libraries="{Node.js Core}" />
+  </component>
+</project>

package/lang/enGB.js

@@ -214,7 +214,6 @@ module.exports = {
     duration: 'Duration',
     vehicles: 'Vehicles',
     vehicle: 'Vehicle',
-    licensePlate: 'License Plate',
     odometer: 'Odometer',
     startOdometer: 'Start (Km)',
     endOdometer: 'End (Km)',

package/lang/ptBR.js

@@ -203,7 +203,6 @@ module.exports = {
     duration: 'Duração',
     vehicles: 'Veículos',
     vehicle: 'Veículo',
-    licensePlate: 'Placa',
     odometer: 'Conta-Quilómetros',
     startOdometer: 'Início (Km)',
     endOdometer: 'Fim (Km)',

package/lang/ptPT.js

@@ -210,7 +210,6 @@ module.exports = {
     duration: 'Duração',
     vehicles: 'Veículos',
     vehicle: 'Veículo',
-    licensePlate: 'Matrícula',
     odometer: 'Conta-Quilómetros',
     startOdometer: 'Início (Km)',
     endOdometer: 'Fim (Km)',

package/package.json

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

package/src/index.js

@@ -23,7 +23,7 @@ function Reports(config, axios) {
         return require('./speeding-report').createSpeedingReport(from, to, userData, this.traccar, roadSpeedLimits)
     }
 
-    this.speedingReportToPDF = async (userData, reportData) => {
+    this.speedingReportToPDF = (userData, reportData) => {
         return require('./speeding-report').exportSpeedingReportToPDF(userData, reportData)
     }
 

package/src/index.test.js

@@ -3,42 +3,25 @@ const {SessionApi} = require("traccar-api");
 const axios = require('axios')
 const axiosCookieJarSupport = require('axios-cookiejar-support').default;
 const tough = require('tough-cookie');
-const style = require("./reportStyle");
 const cookieJar = new tough.CookieJar();
 
 axiosCookieJarSupport(axios)
 
-
-describe('test reports', function() {
-    this.timeout(9000000)
-    it('test queue', async () => {
-        const traccarConfig = {
-            basePath: 'https://api.fleetmap.io/api',
-            baseOptions: {
-                withCredentials: true,
-                jar: cookieJar
-            }
+test('speedingReport', async () => {
+    const traccarConfig = {
+        basePath: 'https://api.pinme.io/api',
+        baseOptions: {
+            withCredentials: true,
+            jar: cookieJar
         }
+    }
 
-        await new SessionApi(traccarConfig, null, axios).sessionPost('jppenas@gmail.com', 'penas46881')
-        const report = new Index(traccarConfig, axios)
-        const userData = await report.getUserData()
-        userData.groupByDay = true
-        const reportData = await report.kmsReport(new Date(2021, 10, 19, 0, 0, 0, 0),
-            new Date(2021, 10, 21, 23, 59, 59, 0),
-            userData)
-
-        const reportResult = reportData[0]
-        reportResult.devices.forEach(d => {
-            console.log(d.device.name)
-            d.days.forEach(day => {
-                console.log(day.date + ' - ' + day.kms)
-            })
-        })
-
+    await new SessionApi(traccarConfig, null, axios).sessionPost('-','-')
+    const report = new Index(traccarConfig,  axios)
+    const userData = await report.getUserData()
 
-        const pdf = report.kmsReportToPDF(userData, reportResult)
+    await report.speedingReport(new Date(2021, 2, 30, 0, 0, 0, 0),
+        new Date(2021, 2, 30, 23, 59, 59, 0),
+        userData)
 
-        console.log(pdf)
-    })
-})
+}, 10000)

package/src/kms-report.js

@@ -156,7 +156,7 @@ async function exportKmsReportToPDF(userData, reportData) {
                 const data = []
                 d.days.forEach(day => {
                     const temp = [
-                        day.date,
+                        new Date(day.date).toLocaleDateString(),
                         (day.kms/1000).toFixed(0)
                     ]
 
@@ -240,7 +240,6 @@ function exportKmsReportToExcel(userData, reportData) {
     if(userData.groupByDay) {
         headers.push(
             {label: translations.report.vehicle, value: 'name'},
-            {label: translations.report.licensePlate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.date, value: 'date'},
             {label: translations.report.distance, value: 'distance'})
@@ -251,8 +250,8 @@ function exportKmsReportToExcel(userData, reportData) {
             {label: translations.report.distance, value: 'distance'})
     } else {
         headers.push(
-            {label: translations.report.vehicle, value: 'name'},
-            {label: translations.report.licensePlate, value: 'licenseplate'},
+            {label: translations.report.driver, value: 'name'},
+            {label: translations.settings.vehicle_licenseplate, value: 'licenseplate'},
             {label: translations.report.group, value: 'group'},
             {label: translations.report.distance, value: 'distance'})
     }
@@ -263,25 +262,25 @@ function exportKmsReportToExcel(userData, reportData) {
         const group = userData.byDriver ? userData.groups.find(g => g.drivers.includes(d.driver.id)) :
             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,
+            if (userData.groupByDay) {
+                data = data.concat([{}])
+                data = data.concat(d.days.map(a => {
+                    return {
+                        name: userData.byDriver ? d.driver.name : d.device.name,
+                        group: group ? group.name : '',
+                        licenseplate: d.device.attributes.license_plate,
+                        date: a.date,
+                        distance: Number((a.kms / 1000).toFixed(0))
+                    }
+                }))
+            } else {
+                data = data.concat([{
+                    name: userData.byDriver ? d.driver.name : d.summary.deviceName,
                     group: group ? group.name : '',
                     licenseplate: d.device.attributes.license_plate,
-                    date: a.date,
-                    distance: Number((a.kms / 1000).toFixed(0))
-                }
-            }))
-        } else {
-            data = data.concat([{
-                name: userData.byDriver ? d.driver.name : d.summary.deviceName,
-                group: group ? group.name : '',
-                licenseplate: userData.byDriver ? '' : d.device.attributes.license_plate,
-                distance: Number((d.summary.distance / 1000).toFixed(0))
-            }])
-        }
+                    distance: Number((d.summary.distance / 1000).toFixed(0))
+                }])
+            }
     })
 
     return {

package/src/location-report.js

@@ -139,7 +139,7 @@ async function exportLocationReportToPDF(userData, reportData) {
             doc.text(new Date(d.from).toLocaleString() + ' - ' + new Date(d.to).toLocaleString(), 20, space + 25)
             d.positions.map(a => {
                 const temp = [
-                    getLocationDate(a, userData.user),
+                    a.fixTime,
                     a.address,
                     Math.round(a.speed * 1.85200),
                     a.attributes.ignition ? translations.report.ignitionOn : translations.report.ignitionOff,

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>

package/.idea/workspace.xml

@@ -1,204 +0,0 @@
-<?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="Kms report grouped by day">
-      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptBR.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptBR.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lang/ptPT.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/ptPT.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.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" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="20NIxbej0qfi8RaO3jr1XOU0xol" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs.mocha.mocha_node_package_dir" value="$PROJECT_DIR$/node_modules/mocha" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RunManager" selected="Mocha.test reports">
-    <configuration name="here" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
-      <test-names>
-        <name value="here" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="report" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
-      <test-names>
-        <name value="report" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="speedingReport" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
-      <test-names>
-        <name value="speedingReport" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="test reports" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>SUITE</test-kind>
-      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
-      <test-names>
-        <name value="test reports" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <configuration name="test reports.test queue" type="mocha-javascript-test-runner" temporary="true" nameIsGenerated="true">
-      <node-interpreter>project</node-interpreter>
-      <node-options />
-      <mocha-package>$PROJECT_DIR$/node_modules/mocha</mocha-package>
-      <working-directory>$PROJECT_DIR$</working-directory>
-      <pass-parent-env>true</pass-parent-env>
-      <ui>bdd</ui>
-      <extra-mocha-options />
-      <test-kind>TEST</test-kind>
-      <test-file>$PROJECT_DIR$/src/index.test.js</test-file>
-      <test-names>
-        <name value="test reports" />
-        <name value="test queue" />
-      </test-names>
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Mocha.test reports" />
-        <item itemvalue="Mocha.test reports.test queue" />
-        <item itemvalue="Mocha.speedingReport" />
-        <item itemvalue="Mocha.report" />
-        <item itemvalue="Mocha.here" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="" />
-      <created>1635878866368</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1635878866368</updated>
-      <workItem from="1635878870054" duration="105000" />
-      <workItem from="1635943211865" duration="371000" />
-      <workItem from="1636030918716" duration="808000" />
-      <workItem from="1636366400735" duration="3018000" />
-      <workItem from="1636371409243" duration="45000" />
-      <workItem from="1636371621773" duration="4750000" />
-      <workItem from="1636623371114" duration="675000" />
-      <workItem from="1636624396937" duration="1987000" />
-      <workItem from="1636627666406" duration="1616000" />
-      <workItem from="1636647112207" duration="1748000" />
-      <workItem from="1636981640447" duration="4315000" />
-      <workItem from="1637009407292" duration="1470000" />
-      <workItem from="1637012863006" duration="5376000" />
-      <workItem from="1637087797229" duration="5701000" />
-      <workItem from="1637227826845" duration="1275000" />
-      <workItem from="1637441942952" duration="4543000" />
-      <workItem from="1637670815688" duration="2973000" />
-      <workItem from="1637674107929" duration="13419000" />
-      <workItem from="1637756665591" duration="3093000" />
-    </task>
-    <task id="LOCAL-00001" summary="Fix getStyle">
-      <created>1636983717385</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1636983717385</updated>
-    </task>
-    <task id="LOCAL-00002" summary="Fix getStyle in all reports">
-      <created>1637020728356</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1637020728356</updated>
-    </task>
-    <task id="LOCAL-00003" summary="try catch on pdf addImage">
-      <created>1637247013210</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1637247013211</updated>
-    </task>
-    <task id="LOCAL-00004" summary="Kms report grouped by day">
-      <created>1637715473148</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1637715473149</updated>
-    </task>
-    <option name="localTasksCounter" value="5" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="Fix getStyle" />
-    <MESSAGE value="Fix getStyle in all reports" />
-    <MESSAGE value="try catch on pdf addImage" />
-    <MESSAGE value="Kms report grouped by day" />
-    <option name="LAST_COMMIT_MESSAGE" value="Kms report grouped by day" />
-  </component>
-</project>