dedup events2attrs

This commit is contained in:
les
2021-03-10 16:09:35 +01:00
parent 27e4f2e18f
commit 11e6c93b74
3 changed files with 58 additions and 42 deletions

View File

@@ -16,7 +16,7 @@
<script>
import { mapState, mapActions } from 'vuex'
import dayjs from 'dayjs'
import { take, get } from 'lodash'
import { attributesFromEvents } from '../assets/helper'
export default {
name: 'Calendar',
@@ -33,40 +33,7 @@ export default {
computed: {
...mapState(['tags', 'filters', 'in_past', 'settings']),
attributes () {
const colors = ['blue', 'orange', 'yellow', 'teal', 'indigo', 'green', 'red', 'purple', 'pink', 'gray']
const tags = take(this.tags, 10).map(t => t.tag)
let attributes = []
attributes.push({ key: 'today', dates: new Date(), highlight: { color: 'green', fillMode: 'outline' } })
function getColor (event) {
const color = { class: 'vc-rounded-full', color: 'blue', fillMode: 'normal' }
const tag = get(event, 'tags[0]')
if (!tag) { return color }
const idx = tags.indexOf(tag)
if (idx < 0) { return color }
color.color = colors[idx]
return color
}
attributes = attributes.concat(this.events
.filter(e => !e.multidate)
.map(e => {
return {
key: e.id,
dot: getColor(e),
dates: new Date(e.start_datetime * 1000)
}
}))
attributes = attributes.concat(this.events
.filter(e => e.multidate)
.map(e => ({
key: e.id,
highlight: getColor(e),
dates: { start: new Date(e.start_datetime * 1000), end: new Date(e.end_datetime * 1000) }
})))
return attributes
return attributesFromEvents(this.events, this.tags)
}
},
methods: {