fleetmap-reports 1.0.572 → 1.0.574

package/lang/enGB.js

@@ -198,6 +198,9 @@ module.exports = {
     date: 'Date',
     start: 'Start',
     end: 'End',
+    stopped: 'Stopped',
+    yes: 'Yes',
+    no: 'No',
     endAddress: 'Destination',
     tripTime: 'Duration',
     idleTime: 'Idle',

package/lang/esCL.js

@@ -188,6 +188,9 @@ module.exports = {
     date: 'Fecha',
     start: 'Início',
     end: 'Fin',
+    stopped: 'Ha Parado',
+    yes: 'Sí',
+    no: 'No',
     endAddress: 'Destino',
     tripTime: 'Duración',
     idleTime: 'Ralenti',

package/lang/frFR.js

@@ -0,0 +1,292 @@
+module.exports = {
+  route: {
+    map: 'Map',
+    dashboard: 'Dashboard',
+    reports: 'Reports',
+    report: 'Report',
+    report_trip_title: 'Trip Report',
+    report_location_title: 'Location Report',
+    report_zone_crossing: 'Zone Report',
+    report_speeding: 'Relatório de Excessos de Velocidade',
+    report_speeding_beta: 'Relatório de Excessos de Velocidade BETA',
+    report_tolls: 'Relatório de Portagens',
+    settings: 'Settings',
+    duration: 'Duration'
+  },
+  map: {
+    geofence_create_title: 'New geofence',
+    geofence_create_name: 'Please enter the name of this geofence...',
+    geofence_created: 'Geofence created sucessfully!',
+    geofence_create_canceled: 'Input canceled',
+    poi_create_title: 'New POI',
+    poi_create_name: 'Please enter the name of this POI...',
+    poi_created: 'POI created sucessfully!',
+    poi_create_canceled: 'Input canceled',
+    create_confirm: 'OK',
+    create_cancel: 'Cancel',
+    loading: 'Loading',
+    totalDistance: 'Distância total'
+  },
+  vehicleList: {
+    title: 'Vehicle',
+    search: 'Search...',
+    column_name: 'Name',
+    column_speed: 'Km/h',
+    column_lastUpdate: 'Last update'
+  },
+  vehicleTable: {
+    immobilize: 'Immobilize',
+    de_immobilize: 'De-Immobilize',
+    send_immobilization: 'Send immobilization command?',
+    send_de_immobilization: 'Send de-immobilization command?',
+    all_vehicles: 'All',
+    moving_vehicles: 'Moving',
+    idle_vehicles: 'Idle',
+    stopped_vehicles: 'Stopped',
+    disconnected_vehicles: 'Disconnected'
+  },
+  vehicleDetail: {
+    show_route: 'Show route'
+  },
+  poiTable: {
+    showPOIs: 'Show POIs',
+    edit_poi: 'Edit',
+    delete_poi: 'Delete'
+  },
+  dashboard: {
+    startdate: 'Start date',
+    enddate: 'End Date',
+    period_lastweek: 'Last week',
+    period_lastmonth: 'Last month',
+    period_last3month: 'Last 3 months'
+  },
+  navbar: {
+    profile: 'Profile',
+    notifications: 'Notifications',
+    settings: 'Settings',
+    logout: 'Log Out'
+  },
+  login: {
+    login_user: 'Email',
+    login_password: 'Password',
+    login_button: 'Login',
+    login_password_warn: 'The password can not be less than 6 digits'
+  },
+  profile: {
+    user_account: 'Account',
+    user_name: 'Name',
+    user_email: 'E-mail',
+    user_password: 'Password',
+    user_phone: 'Phone',
+    user_language: 'Language',
+    user_timezone: 'Timezone',
+    user_update_button: 'Update',
+    user_updated: 'User information has been updated successfully.',
+    user_name_required: 'Name field is required',
+    user_email_required: 'Please input a valid email',
+    user_password_lengh: 'The password can not be less than 6 digits'
+  },
+  settings: {
+    map: 'Map',
+    vehicles: 'Vehicles',
+    title: 'Settings',
+    route_match: 'Route match',
+    alerts: 'Alerts',
+    alerts_type: 'Type',
+    alerts_notificators: 'Notificators',
+    alert_ignitionOff: 'Ignition Off',
+    alert_ignitionOn: 'Ignition On',
+    alert_geofenceEnter: 'Geofence Enter',
+    alert_geofenceExit: 'Geofence Exit',
+    alert_deviceOverspeed: 'Device Overspeed',
+    alert_deleted: 'Alert has been deleted',
+    alert_delete_info: 'Do you want to delete the alert ',
+    alert_delete_title: 'Delete Alert',
+    alert_edit_confirm: 'Confirm',
+    alert_edit_cancel: 'Cancel',
+    alert_created: 'Alert created sucessfully!',
+    alert_updated: 'Alert updated sucessfully!',
+    alert_add: 'Add Alert',
+    alert_edit: 'Edit Alert',
+    alert_delete: 'Delete Alert',
+    alert_overspeed_warning: 'Vehicle without defined top speed',
+    alert_geofences_warning: 'Vehicle without associated geofences',
+    alert_associate_geofences: 'Associate Geofences',
+    alert_form_type: 'Type:',
+    alert_form_type_placeholder: 'Select alert type',
+    alert_form_vehicles: 'Vehicles:',
+    alert_form_geofences: 'Geofences:',
+    alert_form_all_vehicles: 'All vehicles',
+    alert_form_vehicles_placeholder: 'Select vehicles',
+    alert_form_notificator_web: 'Web',
+    alert_form_notificator_email: 'E-mail',
+    alert_form_notificator_sms: 'SMS',
+    alert_form_confirm: 'Save',
+    alert_form_cancel: 'Cancel',
+    alert_form_geofences_placeholder: 'Select geofences',
+    vehicle_edit: 'Edit Vehicle',
+    vehicle_name: 'Name',
+    vehicle_licenseplate: 'License Plate',
+    vehicle_model: 'Model',
+    vehicle_speed_limit: 'Speed Limit',
+    vehicle_form_cancel: 'Cancel',
+    vehicle_form_confirm: 'Save',
+    vehicle_form_name: 'Name',
+    vehicle_form_model: 'Model',
+    vehicle_form_speed_limit: 'Speed Limit (Km/h)',
+    vehicle_updated: 'Vehicle updated sucessfully!'
+  },
+  geofence: {
+    showGeofences: 'Show Geofences',
+    geofence_name: 'Name',
+    geofence_edit: 'Edit',
+    geofence_delete: 'Delete',
+    geofence_deleted: 'Geofence has been deleted',
+    geofence_delete_info: 'Do you want to delete geofence ',
+    geofence_delete_title: 'Delete Geofence',
+    geofence_edit_title: 'Edit Geofence',
+    geofence_edit_name: 'Please enter the name of this geofence...',
+    geofence_edit_confirm: 'Confirm',
+    geofence_edit_cancel: 'Cancel',
+    geofence_edit_canceled: 'Edit canceled',
+    geofence_edited: 'Geofence edited sucessfully!',
+    poi_delete_info: 'Do you want to delete POI ',
+    poi_delete_title: 'Delete POI',
+    poi_edited: 'POI edited sucessfully!',
+    poi_deleted: 'POI has been deleted',
+    poi_edit_title: 'Edit POI',
+    poi_edit_name: 'Please enter the name of this POI...',
+    searchGeofence: 'Search geofence',
+    edit_geofence: 'Edit',
+    delete_geofence: 'Delete'
+  },
+  report: {
+    closed: 'Door Closed',
+    opened: 'Door Opened',
+    sun: 'Sun',
+    rain: 'Rain',
+    temperature: 'Temperatura',
+    select_vehicles: 'Select vehicles',
+    select_vehicles_placeholder: 'Vehicles',
+    select_geofences: 'Select geofences',
+    select_geofences_placeholder: 'Geofences',
+    select_period: 'Select period',
+    period: 'Period',
+    date_start: 'Start date',
+    date_end: 'End date',
+    generate_report: 'Generate report',
+    validate_period: 'Por favor seleccione o período',
+    user: 'User',
+    titleTripReport: 'Trip Report',
+    titleLocationReport: 'Locations Report',
+    titleSpeedingReport: 'Overspeed Report',
+    titleZoneReport: 'Zone Report',
+    titleRefuelReport: 'Refueling Report',
+    titleFuelConsumptionReport: 'Fuel Consumption Report',
+    titleFuelDropReport: 'Fuel Drop Report',
+    titleEventsReport: 'Events Report',
+    titleActivityReport: 'Activity Report',
+    titleKmsReport: 'Kms Report',
+    titleIdleReport: 'Idle Report',
+    titleMachinesReport: 'Machines Report',
+    from: 'From',
+    to: 'to',
+    headerStartAddress: 'Start address',
+    headerDistance: 'Distance',
+    headerDrivingTime: 'Driving Time',
+    headerMaxSpeed: 'Max Speed',
+    date: 'Date',
+    start: 'Start',
+    end: 'End',
+    stopped: 'Stopped',
+    yes: 'Yes',
+    no: 'No',
+    endAddress: 'Destination',
+    tripTime: 'Duration',
+    idleTime: 'Idle',
+    stopTime: 'Stop',
+    distance: 'Distance',
+    speed: 'Speed',
+    roadSpeedLimit: 'Road Speed Limit',
+    overspeed: 'Alert On',
+    avgSpeed: 'Avg Speed',
+    maxSpeed: 'Max Speed',
+    driver: 'Driver',
+    group: 'Group',
+    address: 'Address',
+    ignition: 'Ignition',
+    ignitionOn: 'On',
+    ignitionOff: 'Off',
+    enter: 'Enter',
+    exit: 'Exit',
+    geofence: 'Geofence',
+    duration: 'Duration',
+    vehicles: 'Vehicles',
+    vehicle: 'Vehicle',
+    licensePlate: 'License Plate',
+    consumption: 'Consumption (L)',
+    avg_consumption: 'Avg. Consumption (L/100)',
+    avg_consumption_by_liters: 'Avg. Consumption (Kms/L)',
+    odometer: 'Odometer',
+    startOdometer: 'Start (Km)',
+    endOdometer: 'End (Km)',
+    spentFuel: 'Spent Fuel',
+    engineHours: 'Use (H:m)',
+    totalEngineHours: 'Total Use (H:m)',
+    driverHours: 'Driving Time (H:m)',
+    refueling: 'Refueling',
+    fueldrop: 'Fuel Drop (L)',
+    totalRefueled: 'Total Refueled',
+    totalFuelDrops: 'Total Fuel Drops',
+    totalFuelDropLiters: 'Total Fuel Lost',
+    speedLimit: 'Speed Limit',
+    eventType: 'Event',
+    info: 'Information',
+    event_ignitionOff: 'Ignition Off',
+    event_ignitionOn: 'Ignition On',
+    event_deviceOverspeed: 'Device Overspeed',
+    event_geofenceEnter: 'Geofence Enter',
+    event_geofenceExit: 'Geofence Exit',
+    event_deviceFuelDrop: 'Fuel Drop',
+    event_driverChanged: 'Driver Changed',
+    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.',
+    unsubscribeZoneReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Zone report" in the settings in the "Reports" section.',
+    unsubscribeRefuelingReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Refueling report" in the settings in the "Reports" section.',
+    unsubscribeFuelDropReport: 'If you no longer wish to receive these emails, please go to %url% and remove the option "Fuel drop report" in the settings in the "Reports" section.'
+  },
+  layout: {
+    deviceOnline: 'Device Online',
+    deviceMoving: 'Device Moving',
+    deviceStopped: 'Device Stopped',
+    ignitionOff: 'Ignition Off',
+    ignitionOn: 'Ignition On',
+    deviceOverspeed: 'Device Overspeed',
+    geofenceEnter: 'Geofence Enter',
+    geofenceExit: 'Geofence Exit',
+    deviceFuelDrop: 'Fuel Drop',
+    driverChanged: 'Driver Changed',
+    test: 'Test Notification',
+    sos: 'Panic',
+    powerOn: 'Power Take-Off',
+    device: 'Device',
+    time: 'Time',
+    address: 'Address',
+    driver: 'Driver',
+    group: 'Group',
+    in: 'in',
+    fuelDropInfo: 'Fuel drop greater than '
+  }
+}

package/lang/ptBR.js

@@ -190,6 +190,9 @@ module.exports = {
     date: 'Data',
     start: 'Início',
     end: 'Fim',
+    stopped: 'Parou',
+    yes: 'Sim',
+    no: 'Não',
     endAddress: 'Destino',
     tripTime: 'Duração',
     idleTime: 'Ralenti',

package/lang/ptPT.js

@@ -196,6 +196,9 @@ module.exports = {
     date: 'Data',
     start: 'Início',
     end: 'Fim',
+    stopped: 'Parou',
+    yes: 'Sim',
+    no: 'Não',
     endAddress: 'Destino',
     tripTime: 'Duração',
     idleTime: 'Ralenti',

package/package.json

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

package/src/zone-report.js

@@ -46,7 +46,7 @@ async function createZoneReport (from, to, userData, traccar) {
         devices.sort((a, b) => (a.name > b.name) ? 1 : -1)
 
         if (data.length > 0) {
-          groupData.devices = await processDevices(from, to, devices, userData.drivers, userData.geofences, data)
+          groupData.devices = await processDevices(from, to, devices, userData, { alerts: data })
           reportData.push(groupData)
         }
       }
@@ -72,7 +72,7 @@ async function createZoneReport (from, to, userData, traccar) {
     console.log('Geofence Enter/Exit Alerts:' + alerts.length)
 
     if (alerts.length) {
-      allData.devices.push(...await processDevices(from, to, devices, userData.drivers, userData.geofences, { alerts, route: data.route }, traccar))
+      allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route: data.route }))
     }
     deviceCount = deviceCount + slice.length
   }
@@ -82,31 +82,28 @@ async function createZoneReport (from, to, userData, traccar) {
   return reportData
 }
 
-async function processDevices (from, to, devices, drivers, geofences, data) {
+async function processDevices (from, to, devices, userData, data) {
   const devicesResult = []
 
   for (const d of devices) {
     const alerts = data.alerts.filter(t => t.deviceId === d.id)
     if (alerts.length > 0) {
-      // const response = await traccar.reports.reportsRouteGet(from, to, [d.id])
-
       const zoneInOutData = []
       const zoneInData = {}
-      // const positions = response.data
 
       alerts.forEach(a => {
-        // a.position = positions.find(p => p.id === a.positionId)
         if (a.position) {
           if (a.type === 'geofenceEnter') {
-            const driver = drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
+            const driver = userData.drivers.find(d => a.position.attributes && d.uniqueId === a.position.attributes.driverUniqueId)
             a.position.driverName = driver ? driver.name : ''
             zoneInData[a.geofenceId] = a
           } else if (a.type === 'geofenceExit') {
-            const geofence = geofences.find(g => g.id === a.geofenceId)
+            const geofence = userData.geofences.find(g => g.id === a.geofenceId)
             if (zoneInData[a.geofenceId]) {
               const totalInTime = moment(a.position.fixTime).diff(moment(zoneInData[a.geofenceId].position.fixTime), 'seconds')
-              const route = data.route.filter(p => p.fixTime >= zoneInData[a.geofenceId].position.fixTime &&
-                  p.fixTime <= a.position.fixTime)
+              const route = data.route.filter(p => new Date(p.fixTime).getTime() >= new Date(zoneInData[a.geofenceId].position.fixTime).getTime() &&
+                  new Date(p.fixTime).getTime() <= new Date(a.position.fixTime).getTime())
+              console.log(route)
               if (geofence) {
                 zoneInOutData.push({
                   inTime: zoneInData[a.geofenceId].position,
@@ -133,7 +130,7 @@ async function processDevices (from, to, devices, drivers, geofences, data) {
 
       for (const i in zoneInData) {
         if (zoneInData[i]) {
-          const geofence = geofences.find(g => g.id === zoneInData[i].geofenceId)
+          const geofence = userData.geofences.find(g => g.id === zoneInData[i].geofenceId)
           if (geofence) {
             zoneInOutData.push({
               inTime: zoneInData[i].position,
@@ -144,12 +141,14 @@ async function processDevices (from, to, devices, drivers, geofences, data) {
         }
       }
 
-      if (zoneInOutData.length > 0) {
+      const result = userData.onlyWithStop ? zoneInOutData.filter(d => d.stopped) : zoneInOutData
+
+      if (result.length > 0) {
         devicesResult.push({
           device: d,
           from,
           to,
-          geofences: zoneInOutData
+          geofences: result
         })
       }
     }
@@ -237,6 +236,7 @@ async function exportZoneReportToPDF (userData, reportData) {
   const headers = [
     translations.report.enter,
     translations.report.exit,
+    translations.report.stopped,
     translations.report.duration,
     translations.report.geofence,
     translations.report.driver
@@ -268,6 +268,7 @@ async function exportZoneReportToPDF (userData, reportData) {
         const temp = [
           geofenceEnter(userData.user, a),
           geofenceExit(userData.user, a),
+          a.stopped ? translations.report.yes : translations.report.no,
           a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
           a.geofenceName,
           a.driverName
@@ -321,6 +322,7 @@ function exportZoneReportToExcel (userData, reportData) {
     { label: translations.report.vehicle, value: 'name' },
     { label: translations.report.enter, value: 'enter' },
     { label: translations.report.exit, value: 'exit' },
+    { label: translations.report.stopped, value: 'stopped' },
     { label: translations.report.duration, value: 'duration' },
     { label: translations.report.geofence, value: 'zone' },
     { label: translations.report.driver, value: 'driver' }
@@ -334,6 +336,7 @@ function exportZoneReportToExcel (userData, reportData) {
           name: d.device.name,
           enter: geofenceEnter(userData.user, a),
           exit: geofenceExit(userData.user, a),
+          stopped: a.stopped ? translations.report.yes : translations.report.no,
           duration: a.totalTime ? convertMS(a.totalTime * 1000, true) : '',
           zone: a.geofenceName,
           driver: a.driverName