fleetmap-reports 1.0.251 → 1.0.256

package/.idea/workspace.xml

@@ -1,10 +1,16 @@
 <?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="speeding report with customSpeed">
+    <list default="true" id="eb665c86-c893-4333-bd2a-721dc27980b9" name="Changes" comment="Fix trips distance because imported positions generate trips with 0 kms">
+      <change beforePath="$PROJECT_DIR$/lang/enGB.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/enGB.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lang/esCL.js" beforeDir="false" afterPath="$PROJECT_DIR$/lang/esCL.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-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/index.test.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/index.test.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/speeding-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/speeding-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/location-report.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/location-report.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/util/trips.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/util/trips.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -21,6 +27,14 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
   <component name="ProjectId" id="20NIxbej0qfi8RaO3jr1XOU0xol" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -197,6 +211,13 @@
       <workItem from="1639135460686" duration="3092000" />
       <workItem from="1639151097761" duration="13703000" />
       <workItem from="1639246310204" duration="628000" />
+      <workItem from="1639247624979" duration="13040000" />
+      <workItem from="1639489940902" duration="18224000" />
+      <workItem from="1639591829775" duration="681000" />
+      <workItem from="1639592539998" duration="27141000" />
+      <workItem from="1639766010908" duration="4991000" />
+      <workItem from="1639872937953" duration="1438000" />
+      <workItem from="1639954341221" duration="10938000" />
     </task>
     <task id="LOCAL-00001" summary="Fix getStyle">
       <created>1636983717385</created>
@@ -282,7 +303,28 @@
       <option name="project" value="LOCAL" />
       <updated>1639238286382</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="fix speeding report">
+      <created>1639248407781</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1639248407782</updated>
+    </task>
+    <task id="LOCAL-00014" summary="Trip and activity report with time period">
+      <created>1639873766070</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1639873766072</updated>
+    </task>
+    <task id="LOCAL-00015" summary="Fix trips distance because imported positions generate trips with 0 kms">
+      <created>1640000462824</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1640000462825</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -308,11 +350,13 @@
     <MESSAGE value="Fix pdf logo" />
     <MESSAGE value="kms report with parallel requests" />
     <MESSAGE value="Kms Report - Calculate distance with traccar trips" />
-    <MESSAGE value="fix speeding report" />
     <MESSAGE value="refactor speeding and trip report" />
     <MESSAGE value="Kms report with time period" />
     <MESSAGE value="kms report - show every selected day" />
     <MESSAGE value="speeding report with customSpeed" />
-    <option name="LAST_COMMIT_MESSAGE" value="speeding report with customSpeed" />
+    <MESSAGE value="fix speeding report" />
+    <MESSAGE value="Trip and activity report with time period" />
+    <MESSAGE value="Fix trips distance because imported positions generate trips with 0 kms" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix trips distance because imported positions generate trips with 0 kms" />
   </component>
 </project>

package/lang/enGB.js

@@ -162,7 +162,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Select vehicles',
     select_vehicles_placeholder: 'Vehicles',
     select_geofences: 'Select geofences',
@@ -238,6 +237,14 @@ module.exports = {
     event_sos: 'SOS',
     event_powerOn: 'Power TakeOff',
     event_powerCute: 'Power Cut',
+    monday: 'Monday',
+    tuesday: 'Tuesday',
+    wednesday: 'Wednesday',
+    thursday: 'Thursday',
+    friday: 'Friday',
+    saturday: 'Saturday',
+    sunday: 'Sunday',
+    weekDay: 'Week Day',
     unsubscribeTripReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Trip report" in the settings in the "Reports" section.',
     unsubscribeLocationsReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Locations report" in the settings in the "Reports" section.',
     unsubscribeSpeedingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Overspeed report" in the settings in the "Reports" section.',

package/lang/esCL.js

@@ -157,7 +157,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccione vehículos',
     select_vehicles_placeholder: 'Vehículos',
     select_geofences: 'Seleccione geocercas',
@@ -231,6 +230,14 @@ module.exports = {
     event_sos: 'SOS',
     event_powerOn: 'Tomada de Força',
     event_powerCut: 'Corte de Corrente',
+    monday: 'Lunes',
+    tuesday: 'Martes',
+    wednesday: 'Miércoles',
+    thursday: 'Jueves',
+    friday: 'Viernes',
+    saturday: 'Sábado',
+    sunday: 'Domingo',
+    weekDay: 'Dia da Semana',
     unsubscribeTripReport: 'Si no desea recibir estos emails por favor ingrese a %url% y elimine la opción en los Ajustes / Reportes ',
     unsubscribeLocationsReport: this.unsubscribeTripReport,
     unsubscribeSpeedingReport: this.unsubscribeTripReport,

package/lang/ptBR.js

@@ -154,7 +154,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',
@@ -227,6 +226,14 @@ module.exports = {
     event_sos: 'SOS',
     event_powerOn: 'Tomada de Força',
     event_powerCut: 'Corte de Corrente',
+    monday: 'Segunda',
+    tuesday: 'Terça',
+    wednesday: 'Quarta',
+    thursday: 'Quinta',
+    friday: 'Sexta',
+    saturday: 'Sábado',
+    sunday: 'Domingo',
+    weekDay: 'Dia da Semana',
     unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de viagens" nas definições na secção "Relatórios".',
     unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de posições" nas definições na secção "Relatórios".',
     unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de excesso de velocidade" nas definições na secção "Relatórios".',

package/lang/ptPT.js

@@ -158,7 +158,6 @@ module.exports = {
   },
   report: {
     temperature: 'Temperatura',
-    temperature2: 'Temperatura2',
     select_vehicles: 'Seleccionar veículos',
     select_vehicles_placeholder: 'Veículos',
     select_geofences: 'Seleccionar balizas',
@@ -237,6 +236,14 @@ module.exports = {
     event_sos: 'SOS',
     event_powerOn: 'Tomada de Força',
     event_powerCut: 'Corte de Corrente',
+    monday: 'Segunda',
+    tuesday: 'Terça',
+    wednesday: 'Quarta',
+    thursday: 'Quinta',
+    friday: 'Sexta',
+    saturday: 'Sábado',
+    sunday: 'Domingo',
+    weekDay: 'Dia da Semana',
     unsubscribeTripReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de viagens" nas definições na secção "Relatórios".',
     unsubscribeLocationsReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de posições" nas definições na secção "Relatórios".',
     unsubscribeSpeedingReport: 'Se não deseja receber estes emails por favor aceda a %url% e remova a opção "Relatório de excesso de velocidade" nas definições na secção "Relatórios".',

package/package.json

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