fleetmap-reports 1.0.415 → 1.0.416

package/lang/esCL.js

@@ -101,7 +101,7 @@ module.exports = {
     alert_edit_cancel: 'Cancelar',
     alert_created: 'Alerta creada con éxito!',
     alert_updated: 'Alerta actualizada con éxito!',
-    alert_add: 'Adicionar Alerta',
+    alert_add: 'Añadir Alerta',
     alert_edit: 'Editar Alerta',
     alert_delete: 'Apagar Alerta',
     alert_overspeed_warning: 'Vehículo sin velocidad máxima establecida',
@@ -268,4 +268,4 @@ module.exports = {
     in: 'en',
     fuelDropInfo: 'Fuel drop greater than '
   }
-};
+}

package/package.json

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

package/src/util/trips.js

@@ -1,4 +1,4 @@
-const { coordsDistance, convertFromUTC, weekDaySelected } = require('./utils')
+const { coordsDistance, convertFromUTC, weekDaySelected, convertFromLocal } = require('./utils')
 
 const minDistance = 0
 const minAvgSpeed = 0
@@ -68,7 +68,7 @@ function isPartialInsideTimetable (t, userData, route) {
         // Trip starts inside time period and ends outside time period
         const routeInside = route.filter(p => new Date(p.fixTime).getTime() < new Date(endDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
         updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString()
+        t.endTime = convertFromLocal(endDate).toISOString()
         t.endTimeIsOut = true
         isPartialInside = true
       }
@@ -78,7 +78,7 @@ function isPartialInsideTimetable (t, userData, route) {
         // Trip starts outside time period and ends inside time period
         const routeInside = route.filter(p => new Date(p.fixTime).getTime() > startDate.getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
         updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString()
+        t.startTime = convertFromLocal(startDate).toISOString()
         t.startTimeIsOut = true
         isPartialInside = true
       }
@@ -88,7 +88,7 @@ function isPartialInsideTimetable (t, userData, route) {
         // Trip starts outside time period and ends inside time period
         const routeInside = route.filter(p => new Date(p.fixTime).getTime() > new Date(startDate.toUTCString()).getTime() && new Date(p.fixTime).getTime() < new Date(t.endTime).getTime() && t.deviceId === p.deviceId)
         updateTrip(t, routeInside)
-        t.startTime = startDate.toISOString()
+        t.startTime = convertFromLocal(startDate).toISOString()
         t.startTimeIsOut = true
         isPartialInside = true
       }
@@ -98,7 +98,7 @@ function isPartialInsideTimetable (t, userData, route) {
         // Trip starts inside time period and ends outside time period
         const routeInside = route.filter(p => new Date(p.fixTime).getTime() < endDate.getTime() && new Date(p.fixTime).getTime() > new Date(t.startTime).getTime() && t.deviceId === p.deviceId)
         updateTrip(t, routeInside)
-        t.endTime = endDate.toISOString()
+        t.endTime = convertFromLocal(endDate).toISOString()
         t.endTimeIsOut = true
         isPartialInside = true
       }

package/src/util/utils.js

@@ -186,6 +186,14 @@ function convertFromUTC (value, timezone) {
   return valueDate
 }
 
+exports.convertFromLocal = (value, timezone) => {
+  const offset = getTimezoneOffset(timezone)
+
+  const valueDate = new Date(value)
+  valueDate.setTime(valueDate.getTime() + (offset * 60 * 1000))
+  return valueDate
+}
+
 function weekDaySelected (date, weekDays) {
   return (date.getDay() === 0 && weekDays.sunday) ||
     (date.getDay() === 1 && weekDays.monday) ||