fleetmap-reports 1.0.973 → 1.0.975
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.
- package/package.json +1 -1
- package/src/speeding-report.js +1 -1
- package/src/util/trips.js +1 -1
- package/src/util/utils.js +3 -1
package/package.json
CHANGED
package/src/speeding-report.js
CHANGED
|
@@ -533,7 +533,7 @@ async function exportSpeedingReportToPDF (userData, reportData) {
|
|
|
533
533
|
doc.text(name, 20, space + 20)
|
|
534
534
|
doc.setFontSize(11)
|
|
535
535
|
doc.text(group ? translations.report.group + ': ' + group.name : '', 150, space + 20)
|
|
536
|
-
doc.text(convertToLocaleString(d.from, lang, timezone) + ' - ' + convertToLocaleString(d.to, lang, timezone), 20, space + 25)
|
|
536
|
+
doc.text(convertToLocaleString(d.from, lang, timezone, userData.user) + ' - ' + convertToLocaleString(d.to, lang, timezone, userData.user), 20, space + 25)
|
|
537
537
|
if (d.alerts[0] && !userData.byDriver) {
|
|
538
538
|
doc.text(translations.report.speedLimit + ': ' + ((userData.useVehicleSpeedLimit || !userData.customSpeed) ? Math.round(d.alerts[0].attributes.speedLimit * 1.85200) + ' Km/h' : (userData.roadSpeedLimits ? translations.report.roadSpeedLimit : userData.customSpeed + ' Km/h')), 20, space + 30)
|
|
539
539
|
}
|
package/src/util/trips.js
CHANGED
|
@@ -148,7 +148,7 @@ function isInsideTimetable (t, userData) {
|
|
|
148
148
|
}
|
|
149
149
|
|
|
150
150
|
function updateTrip (device, t, route) {
|
|
151
|
-
route = route.filter(p => p.attributes.ignition)
|
|
151
|
+
route = route.filter(p => p && p.attributes.ignition)
|
|
152
152
|
if (!route.length) { return }
|
|
153
153
|
const distance = calculateDistance(route, false) * 1000
|
|
154
154
|
t.distance = distance
|
package/src/util/utils.js
CHANGED
|
@@ -157,12 +157,14 @@ function isClientSide () { return (typeof window !== 'undefined') }
|
|
|
157
157
|
function convertToLocaleString (value, lang, timezone, user) {
|
|
158
158
|
if (isClientSide()) {
|
|
159
159
|
return new Date(value).toLocaleString()
|
|
160
|
-
}
|
|
160
|
+
}
|
|
161
|
+
if ((lang && timezone) || user) {
|
|
161
162
|
return new Date(value).toLocaleString(lang || getUserPartner(user).lang, {
|
|
162
163
|
timeZone: timezone || getUserPartner(user).timezone,
|
|
163
164
|
hour12: false
|
|
164
165
|
})
|
|
165
166
|
}
|
|
167
|
+
return new Date(value).toISOString()
|
|
166
168
|
}
|
|
167
169
|
|
|
168
170
|
function convertToLocaleDateString (value, lang, timezone, user) {
|