fleetmap-reports 1.0.883 → 1.0.885

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/partnerReports/dailyuse-report.js +6 -4
  3. package/src/util/utils.js +3 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "fleetmap-reports",
3
- "version": "1.0.883",
3
+ "version": "1.0.885",
4
4
  "description": "",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/partnerReports/dailyuse-report.js CHANGED
@@ -1,5 +1,6 @@
1
1
  const traccarHelper = require('../util/traccar')
2
2
  const { isInsideTimetable, isPartialInsideTimetable } = require('../util/trips')
3
+ const { convertFromUTCDate } = require('../util/utils')
3
4
 
4
5
  async function createDailyUseReport (from, to, userData, traccar) {
5
6
  const reportData = []
@@ -30,8 +31,8 @@ async function createDailyUseReport (from, to, userData, traccar) {
30
31
  }
31
32
 
32
33
  const morningTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
33
- const morningStart = morningTrips.length && new Date(morningTrips[0].startTime)
34
- const morningEnd = morningTrips.length && new Date(morningTrips[morningTrips.length - 1].endTime)
34
+ const morningStart = morningTrips.length && convertFromUTCDate(new Date(morningTrips[0].startTime), userData.user)
35
+ const morningEnd = morningTrips.length && convertFromUTCDate(new Date(morningTrips[morningTrips.length - 1].endTime), userData.user)
35
36
 
36
37
  userData.dayHours = {
37
38
  startTime: '12:00',
@@ -39,8 +40,9 @@ async function createDailyUseReport (from, to, userData, traccar) {
39
40
  }
40
41
 
41
42
  const afternoonTrips = deviceTrips.filter(t => isInsideTimetable(t, userData) || isPartialInsideTimetable(t, userData, deviceRoute))
42
- const afternoonStart = afternoonTrips.length && new Date(afternoonTrips[0].startTime)
43
- const afternoonEnd = afternoonTrips.length && new Date(afternoonTrips[afternoonTrips.length - 1].endTime)
43
+
44
+ const afternoonStart = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[0].startTime), userData.user)
45
+ const afternoonEnd = afternoonTrips.length && convertFromUTCDate(new Date(afternoonTrips[afternoonTrips.length - 1].endTime), userData.user)
44
46
 
45
47
  reportData.push({
46
48
  device: d.name,
package/src/util/utils.js CHANGED
@@ -254,3 +254,6 @@ exports.calculateDistance = (positions) => {
254
254
 
255
255
  exports.sortPositions = (a, b) => new Date(a.fixTime).getTime() - new Date(b.fixTime).getTime()
256
256
  exports.getLogoUrl = getLogoUrl
257
+ exports.convertFromUTCDate = (value, user) => {
258
+ return convertFromUTC(value, user.attributes.timezone || getUserPartner(user).timezone)
259
+ }