NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

show recurrent events while creating a new one

Browse source
This commit is contained in:
les 2019-09-11 11:56:22 +02:00
parent ce3fd08c22
commit 80d9b7fc4d
3 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pages/add/_edit.vue
View file

@ -273,39 +273,14 @@ export default {
attributes.push ({ key: 'today', dates: new Date(), highlight: { color: 'yellow' }}) attributes.push ({ key: 'today', dates: new Date(), highlight: { color: 'yellow' }})
attributes = attributes.concat(this.filteredEvents attributes = attributes.concat(this.filteredEvents
.filter(e => !e.multidate && !e.recurrent) .filter(e => !e.multidate && (!e.recurrent || this.event.type === 'recurrent'))
.map(e => ({ key: e.id, dot: {}, dates: moment.unix(e.start_datetime).toDate()}))) .map(e => ({ key: e.id, dot: { color: this.event.type === 'recurrent' ? 'orange' : 'green' }, dates: moment.unix(e.start_datetime).toDate()})))
attributes = attributes.concat(this.filteredEvents attributes = attributes.concat(this.filteredEvents
.filter(e => e.multidate && !e.recurrent) .filter(e => e.multidate && !e.recurrent)
.map( e => ({ key: e.id, highlight: {}, dates: { .map( e => ({ key: e.id, highlight: {}, dates: {
start: moment.unix(e.start_datetime).toDate(), end: moment.unix(e.end_datetime).toDate() }}))) start: moment.unix(e.start_datetime).toDate(), end: moment.unix(e.end_datetime).toDate() }})))
if (this.event.type === 'recurrent' && this.event.recurrent.frequency) {
const recurrent = {}
const frequency = this.event.recurrent.frequency
if (Array.isArray(this.date) && (frequency === '1w' || frequency === '2w')) {
recurrent.weekdays = uniq(map(this.date, d => moment(d).day()+1 ))
recurrent.weeklyInterval = frequency[0]*1
recurrent.start = new Date(this.date[0])
} else if (Array.isArray(this.date) && (frequency === '1m' || frequency === '2m')) {
if (!this.date || !this.date.length) return attributes
if (this.event.recurrent.type === 'weekday') {
const days = uniq(map(this.date, d => moment(d).date()))
const n = Math.floor((days[0]-1)/7)+1
recurrent.ordinalWeekdays = { [n]: this.date.map(d => moment(d).day()+1) }
} else if (this.event.recurrent.type === 'ordinal') {
recurrent.days = uniq(map(this.date, d => moment(d).date()))
}
recurrent.monthlyInterval = frequency[0]*1
recurrent.start = new Date(this.date[0])
} else if (this.event.recurrent.frequency === '1d') {
recurrent.dailyInterval = 1
} else {
return attributes
}
attributes.push({name: 'recurrent', dates: recurrent, dot: { color: 'red'}})
}
return attributes return attributes
}, },
disableAddress () { disableAddress () {

2
plugins/filters.js
View file

@ -14,7 +14,7 @@ export default ({ app, store }) => {
// Vue.filter('hour', value => moment(value).locale(store.state.locale).format('HH:mm')) // Vue.filter('hour', value => moment(value).locale(store.state.locale).format('HH:mm'))
// shown in mobile homepage // shown in mobile homepage
Vue.filter('day', value => moment.unix(value).locale(store.state.locale).format('dddd, D MMMM')) Vue.filter('day', value => moment.unix(value).locale(store.state.locale).format('dddd, D MMM'))
// Vue.filter('month', value => moment(value).locale(store.state.locale).format('MMM')) // Vue.filter('month', value => moment(value).locale(store.state.locale).format('MMM'))
// format event start/end datetime based on page // format event start/end datetime based on page

2
server/api/controller/user.js
View file

@ -91,7 +91,7 @@ const userController = {
let event = await Event.create(eventDetails) let event = await Event.create(eventDetails)
// create place if needs to // create place if needed
let place let place
try { try {
place = await Place.findOrCreate({ where: { name: body.place_name }, place = await Place.findOrCreate({ where: { name: body.place_name },