encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lot of fixes & cleaning

Browse Source
This commit is contained in:
lesion
2019-03-03 01:09:56 +01:00
parent 2ce37bb54b
commit c1286a3283
15 changed files with 92 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/src/components/Calendar.vue
View File

@@ -43,7 +43,8 @@ export default {
}
}
const color = event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(200,200,200,0.5)'
let color = event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(200,200,200,0.5)'
if (event.past) color = 'rgba(200,200,200,0.5)'
if (event.multidate) {
e.dates = {
start: event.start_datetime, end: event.end_datetime
@@ -60,18 +61,19 @@ export default {
},
computed: {
filteredEvents () {
if (!this.filters.tags.length && !this.filters.places.length) return this.events
return this.events.filter(e => {
if (this.filters.tags.length) {
const m = intersection(e.tags.map(t => t.tag), this.filters.tags)
if (m.length>0) return true
}
if (this.filters.places.length) {
if (this.filters.places.find(p => p === e.place.name))
return true
}
return 0
})
return this.$store.getters.filteredEvents
// if (!this.filters.tags.length && !this.filters.places.length) return this.events
// return this.events.filter(e => {
// if (this.filters.tags.length) {
// const m = intersection(e.tags.map(t => t.tag), this.filters.tags)
// if (m.length>0) return true
// }
// if (this.filters.places.length) {
// if (this.filters.places.find(p => p === e.place.name))
// return true
// }
// return 0
// })
},
...mapState(['events', 'tags', 'filters']),
attributes () {