diff --git a/docs/setup/classic.md b/docs/setup/classic.md index ff07913a..2ba79d69 100644 --- a/docs/setup/classic.md +++ b/docs/setup/classic.md @@ -17,18 +17,28 @@ apt-get install -y nodejs ```bash npm install --global gancio ``` - -3. Setup -```bash -gancio setup +3. Create database (optional) +```sql +apt install postgresql +sudo -u postgres psql +postgres=# create database gancio; +postgres=# create user gancio with encrypted password 'gancio'; +postgres=# grant all privileges on database gancio to gancio; ``` -4. Start +4. Create a new user ```bash +adduser gancio +su gancio +``` + +5. Setup & test +```bash +gancio --help +gancio setup gancio start ``` -5. Enjoy :tada: + +6. Enjoy :tada: Point your web browser to [http://localhost:3000](http://localhost:3000) - - diff --git a/locales/it.js b/locales/it.js index b7fc1bce..a7995c49 100644 --- a/locales/it.js +++ b/locales/it.js @@ -145,7 +145,8 @@ const it = { allow_registration_description : 'Vuoi abilitare la registrazione?', allow_anon_event: 'Si possono inserire eventi anonimi (previa conferma)?', allow_comments: 'Abilita commenti', - allow_recurrent_event: 'Abilita eventi ricorrenti' + allow_recurrent_event: 'Abilita eventi fissi', + recurrent_event_visible: 'Appuntamenti fissi visibili di default' }, auth: { diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue index 883fc900..f5e77a84 100644 --- a/pages/add/_edit.vue +++ b/pages/add/_edit.vue @@ -59,11 +59,7 @@ el-radio-button(label="recurrent") {{$t('event.recurrent')}} br span {{$t(`event.${event.type}_description`)}} -<<<<<<< HEAD el-select.ml-2(v-if='event.type==="recurrent"' v-model='event.recurrent.frequency' placeholder='Frequenza') -======= - el-select.ml-2(v-if='event.type==="recurrent"' v-model='event.rec_frequency' placeholder='Frequenza') ->>>>>>> doc el-option(label='Tutti i giorni' value='1d' key='1d') el-option(label='Ogni settimana' value='1w' key='1w') el-option(label='Ogni due settimane' value='2w' key='2w') @@ -82,16 +78,9 @@ ) div.text-center.mb-2(v-if='event.type === "recurrent"') -<<<<<<< HEAD - span {{event.recurrent.type}} span(v-if='event.recurrent.frequency !== "1m" && event.recurrent.frequency !== "2m"') {{whenPatterns}} el-radio-group(v-else v-model='event.recurrent.type') el-radio-button(v-for='whenPattern in whenPatterns' :label='whenPattern.key' :key='whenPatterns.key') -======= - span(v-if='event.rec_frequency !== "1m" && event.rec_frequency !== "2m"') {{whenPatterns}} - el-radio-group(v-else v-model='event.rec_detail') - el-radio-button(v-for='whenPattern in whenPatterns' :label='whenPattern.label' :key='whenPatterns.key') ->>>>>>> doc span {{whenPattern.label}} el-form.text-center(inline) @@ -144,17 +133,8 @@ export default { type: 'normal', place: { name: '', address: '' }, title: '', description: '', tags: [], -<<<<<<< HEAD image: false, recurrent: { frequency: '1w', days: [], type: 'weekday' }, -======= - multidate: false, - image: false, - recurrent: false, - rec_frequency: '1w', - rec_when: null, - rec_ordinal: false, ->>>>>>> doc }, page: { month, year}, fileList: [], @@ -239,7 +219,6 @@ export default { const dates = this.date if (!dates || !dates.length) return -<<<<<<< HEAD const freq = this.event.recurrent.frequency const weekDays = uniq(map(dates, date => moment(date).format('dddd'))) if (freq === '1w' || freq === '2w') { @@ -254,22 +233,6 @@ export default { } else if (freq === '1d') { return this.$t('event.recurrent_each_day') } -======= - const freq = this.event.rec_frequency - const weekDays = uniq(map(dates, date => moment(date).format('dddd'))) - if (freq === '1w' || freq === '2w') { - return this.$t(`event.recurrent_${freq}_days`, {days: weekDays.join(', ')}) - } - if (freq === '1m' || freq === '2m') { - const days = uniq(map(dates, date => moment(date).date())) - const n = Math.floor((days[0]-1)/7)+1 - return [ - { label: this.$tc(`event.recurrent_${freq}_days`, days.length, {days}) }, - { label: this.$tc(`event.recurrent_${freq}_ordinal`, days.length, {n: this.$t(`ordinal.${n}`), days: weekDays.join(', ')}) } - ] - } - ->>>>>>> doc }, todayEvents () { if (this.event.type === 'multidate') { @@ -304,18 +267,16 @@ export default { attributes = attributes.concat(this.filteredEvents .filter(e => e.multidate) .map( e => ({ key: e.id, highlight: {}, dates: { -<<<<<<< HEAD start: new Date(e.start_datetime), end: new Date(e.end_datetime) }}))) - if (this.event.type === 'recurrent' && this.event.recurrent.frequency && Array.isArray(this.date)) { + if (this.event.type === 'recurrent' && this.event.recurrent.frequency) { const recurrent = {} const frequency = this.event.recurrent.frequency - if (frequency === '1w' || frequency === '2w') { + 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]) - } - if (frequency === '1m' || frequency === '2m') { + } 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())) @@ -326,32 +287,10 @@ export default { } recurrent.monthlyInterval = frequency[0]*1 recurrent.start = new Date(this.date[0]) - } - if (this.event.recurrent.frequency === '1d') { + } else if (this.event.recurrent.frequency === '1d') { recurrent.dailyInterval = 1 -======= - start: new Date(e.start_datetime*1000), end: new Date(e.end_datetime*1000) }}))) - - if (this.event.type==='recurrent' && this.event.rec_frequency && Array.isArray(this.date)) { - const recurrent = {} - if (this.event.rec_frequency === '1w') { - recurrent.weekdays = this.date.map(d => moment(d).day()+1) - recurrent.weeklyInterval = 1 - } - if (this.event.rec_frequency === '2w') { - recurrent.weekdays = this.date.map(d => moment(d).day()+1) - recurrent.weeklyInterval = 2 - recurrent.start = new Date(this.date[0]) - } - if (this.event.rec_frequency === '1m') { - // recurrent.weeks = 1 - // recurrent.ordinalWeekdays = { 1: this.date.map(d => moment(d).day()+1) } - recurrent.days = this.date.map(d => moment(d).date()) - recurrent.monthlyInterval = 1 - recurrent.start = new Date(this.date[0]) - } - if (this.event.rec_frequency === '2m') { ->>>>>>> doc + } else { + return attributes } attributes.push({name: 'recurrent', dates: recurrent, dot: { color: 'red'}}) } @@ -419,6 +358,9 @@ export default { this.time.end = (Number(start_hour)+2) + ':' + start_minute } const [ end_hour, end_minute ] = this.time.end.split(':') + + const formData = new FormData() + if (this.event.type === 'multidate') { start_datetime = moment(this.date.start) .set('hour', start_hour).set('minute', start_minute) @@ -438,10 +380,12 @@ export default { days: this.event.recurrent.type === 'ordinal' ? map(this.date, d => moment(d).date() ) : map(this.date, d => moment(d).day()+1 ), type: this.event.recurrent.type, } + if (end_hour>>>>>> doc if (this.edit) { formData.append('id', this.event.id) } diff --git a/server/api/controller/event.js b/server/api/controller/event.js index e6e8b39b..9a1ca839 100644 --- a/server/api/controller/event.js +++ b/server/api/controller/event.js @@ -220,48 +220,54 @@ const eventController = { }) // build singular events from a recurrent pattern - function createEventsFromRecurrent(e, dueTo=null, maxEvents=8) { + function createEventsFromRecurrent(e, dueTo=null) { const events = [] const recurrent = JSON.parse(e.recurrent) if (!recurrent.frequency) return false const cursor = moment(start) const start_date = moment(e.start_datetime) + const duration = moment(e.end_datetime).diff(start_date, 's') const frequency = recurrent.frequency - const days = [start_date.day()] + const days = recurrent.days const type = recurrent.type - // EACH WEEK - if (frequency === '1w') { + // default frequency is '1d' => each day + const toAdd = { n: 1, unit: 'day'} + + // each week or 2 (search for the first specified day) + if (frequency === '1w' || frequency === '2w') { while(true) { const found = days.indexOf(cursor.day()) if (found!==-1) break cursor.add(1, 'day') } - cursor.set('hour', start_date.hour()).set('minute', start_date.minutes()) - while (true) { - if ((dueTo && cursor.isAfter(dueTo)) || events.length>maxEvents) break - e.start_datetime = cursor.unix()*1000 - events.push( Object.assign({}, e) ) - cursor.add(1, 'week') + if (frequency === '2w') { + const nWeeks = cursor.diff(start_datetime, 'w')%2 + if (nWeeks) cursor.add(1, 'week') } + toAdd.n = Number(frequency[0]) + toAdd.unit = 'week'; + cursor.set('hour', start_date.hour()).set('minute', start_date.minutes()) } - // EACH TWO WEEKS - if (frequency === '2w') { - while(true) { - const found = days.indexOf(cursor.day()) - if (found!==-1) break - cursor.add(1, 'day') - } - cursor.set('hour', start_date.hour()).set('minute', start_date.minutes()) - while (true) { - if ((dueTo && cursor.isAfter(dueTo)) || events.length>maxEvents) break - e.start_datetime = cursor.unix()*1000 - events.push( Object.assign({}, e) ) - cursor.add(1, 'week') - } + // each month or 2 + // if (frequency === '1m' || frequency === '2m') { + // // find first match + // if (type) { + + // } + // } + + // add event at specified frequency + while (true) { + if (dueTo && cursor.isAfter(dueTo)) break + e.start_datetime = cursor.unix()*1000 + e.end_datetime = e.start_datetime+(duration*1000)// cursor.clone().hour(end_datetime.hour()).minute(end_datetime.minute()).unix()*1000 + events.push( Object.assign({}, e) ) + cursor.add(toAdd.n, toAdd.unit) } + return events } diff --git a/store/index.js b/store/index.js index ea5d18f7..1394569c 100644 --- a/store/index.js +++ b/store/index.js @@ -46,7 +46,7 @@ export const getters = { } if (search_for_tags) { - const common_tags = intersection(map(e.tags, t => t.tag), state.filters.tags); + const common_tags = intersection(e.tags, state.filters.tags); if (common_tags.length > 0) return true } @@ -73,7 +73,7 @@ export const getters = { } if (search_for_tags) { - const common_tags = intersection(map(e.tags, t => t.tag), state.filters.tags); + const common_tags = intersection(e.tags, state.filters.tags); if (common_tags.length > 0) return true } @@ -91,9 +91,9 @@ export const mutations = { state.events = events.map((e) => { const currentDay = moment(e.start_datetime).date() e.newDay = (!lastDay || lastDay !== currentDay) && currentDay - lastDay = currentDay - const end_datetime = e.end_datetime || e.start_datetime+3600*2 - const past = (moment().unix() - end_datetime) > 0 + lastDay = currentDay + const end_datetime = e.end_datetime || e.start_datetime+3600000*2 + const past = ((moment().unix()*1000) - end_datetime) > 0 e.past = !!past return e })