feat: convert from using dst offsets to use timezone code
feat: select timezones from current selected country
This commit is contained in:
parent
cc8c48ff4c
commit
7d6fb17158
16 changed files with 86 additions and 117 deletions
10
lib/logs.js
10
lib/logs.js
|
|
@ -1,5 +1,6 @@
|
|||
const _ = require('lodash/fp')
|
||||
const moment = require('moment')
|
||||
const { format } = require('date-fns')
|
||||
const { zonedTimeToUtc, utcToZonedTime } = require('date-fns-tz')
|
||||
|
||||
const db = require('./db')
|
||||
const pgp = require('pg-promise')()
|
||||
|
|
@ -112,10 +113,13 @@ function simpleGetMachineLogs (deviceId, from = new Date(0).toISOString(), until
|
|||
}
|
||||
|
||||
function logDateFormat (timezone, logs, fields) {
|
||||
const offset = timezone.split(':')[1]
|
||||
|
||||
return _.map(log => {
|
||||
const values = _.map(field => moment.utc(log[field]).utcOffset(parseInt(offset)).format('YYYY-MM-DDTHH:mm:ss.SSS'), fields)
|
||||
const values = _.map(
|
||||
field =>
|
||||
format(utcToZonedTime(zonedTimeToUtc(log[field], process.env.TZ), timezone), 'yyyy-MM-ddTHH:mm:ss.SSS'),
|
||||
fields
|
||||
)
|
||||
const fieldsToOverride = _.zipObject(fields, values)
|
||||
|
||||
return {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue