parseWarning: parseDateTime -> profile.parseDateTime 🐛

This commit is contained in:
Jannis R 2019-09-03 15:33:05 +02:00
parent 8b2a5a82f2
commit 9a6bc2df0d
No known key found for this signature in database
GPG key ID: 0FE83946296A88A5

View file

@ -3,8 +3,6 @@
const brToNewline = require('@derhuerst/br2nl') const brToNewline = require('@derhuerst/br2nl')
const omit = require('lodash/omit') const omit = require('lodash/omit')
const parseDateTime = require('./date-time')
const typesByIcon = Object.assign(Object.create(null), { const typesByIcon = Object.assign(Object.create(null), {
HimWarn: 'status' HimWarn: 'status'
}) })
@ -26,8 +24,8 @@ const parseMsgEvent = (profile) => (e) => {
// todo: rename `Loc` -> `Location` [breaking] // todo: rename `Loc` -> `Location` [breaking]
fromLoc: e.fromLocation || null, fromLoc: e.fromLocation || null,
toLoc: e.toLocation || null, toLoc: e.toLocation || null,
start: parseDateTime(profile, e.fDate, e.fTime, null), start: profile.parseDateTime(profile, e.fDate, e.fTime, null),
end: parseDateTime(profile, e.tDate, e.tTime, null), end: profile.parseDateTime(profile, e.tDate, e.tTime, null),
sections: e.sectionNums || [] // todo: parse sections: e.sectionNums || [] // todo: parse
} }
} }
@ -60,7 +58,7 @@ const parseWarning = (profile, w, data) => {
type, type,
summary: w.head ? brToNewline(w.head) : null, // todo: decode HTML entities? summary: w.head ? brToNewline(w.head) : null, // todo: decode HTML entities?
text: w.text ? brToNewline(w.text) : null, // todo: decode HTML entities? text: w.text ? brToNewline(w.text) : null, // todo: decode HTML entities?
icon, icon, // todo: parse icon
priority: w.prio, priority: w.prio,
category: w.cat || null // todo: parse to sth meaningful category: w.cat || null // todo: parse to sth meaningful
} }
@ -79,9 +77,9 @@ const parseWarning = (profile, w, data) => {
.map(parseMsgEvent(profile)) .map(parseMsgEvent(profile))
} }
if (w.sDate && w.sTime) res.validFrom = parseDateTime(profile, w.sDate, w.sTime, null) if (w.sDate && w.sTime) res.validFrom = profile.parseDateTime(profile, w.sDate, w.sTime, null)
if (w.eDate && w.eTime) res.validUntil = parseDateTime(profile, w.eDate, w.eTime, null) if (w.eDate && w.eTime) res.validUntil = profile.parseDateTime(profile, w.eDate, w.eTime, null)
if (w.lModDate && w.lModTime) res.modified = parseDateTime(profile, w.lModDate, w.lModTime, null) if (w.lModDate && w.lModTime) res.modified = profile.parseDateTime(profile, w.lModDate, w.lModTime, null)
return res return res
} }