diff --git a/assets/helper.js b/assets/helper.js index 3f46c3cb..01b9c1bc 100644 --- a/assets/helper.js +++ b/assets/helper.js @@ -9,15 +9,24 @@ export function attributesFromEvents (_events, _tags) { attributes.push({ key: 'today', dates: new Date(), bar: { color: 'green', fillMode: 'outline' } }) const now = dayjs().unix() - function getColor (event) { - const color = { class: 'vc-rounded-full', color: 'blue' } + function getColor (event, where) { + const color = { class: 'vc-rounded-full', color: 'blue', fillMode: where === 'base' ? 'light' : 'solid' } const tag = get(event, 'tags[0]') - if (event.start_datetime < now) { color.class += ' vc-past' } + if (event.start_datetime < now) { + if (event.multidate) { + color.fillMode = where === 'base' ? 'light' : 'outline' + if (where === 'base') { + color.class += ' vc-past' + } + } else { + color.class += ' vc-past' + } + } if (!tag) { return color } const idx = tags.indexOf(tag) if (idx < 0) { return color } color.color = colors[idx] - if (event.start_datetime < now) { color.class += ' vc-past' } + // if (event.start_datetime < now) { color.class += ' vc-past' } return color } @@ -35,7 +44,11 @@ export function attributesFromEvents (_events, _tags) { .filter(e => e.multidate) .map(e => ({ key: e.id, - highlight: { start: { ...getColor(e), fillMode: 'solid' }, end: { ...getColor(e), fillMode: 'solid' } }, + highlight: { + start: getColor(e), + base: getColor(e, 'base'), + end: getColor(e) + }, dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) } })))