surya/freeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Booking not available if is in the past

Browse Source 
- Delete record only if "Active Edit" is on
- Image stretch width reduced.
- Signin more dense
This commit is contained in:
Paolo Arena
2019-10-16 15:27:49 +02:00
parent 9462f6ef24
commit 35b360bf9a
14 changed files with 160 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/CEventsCalendar/CEventsCalendar.ts
View File

@@ -858,4 +858,17 @@ export default class CEventsCalendar extends Vue {
get mythis() {
return this
}
public isEventEnabled(myevent) {
// check if event is in the past
const datenow = tools.addDays(tools.getDateNow(), -1)
let dateEvent = new Date(myevent.date + ' 00:00:00')
if (myevent.days) {
dateEvent = tools.addDays(dateEvent, myevent.days)
}
return (dateEvent >= datenow)
}
}

6
src/components/CEventsCalendar/CEventsCalendar.vue
View File

@@ -90,7 +90,7 @@ $t('
</q-card-section>
<q-card-actions align="right">
<q-btn rounded v-if="!myevent.nobookable && static_data.functionality.BOOKING_EVENTS"
color="primary" @click="addBookEventMenu(myevent)"
color="primary" @click="addBookEventMenu(myevent)" :disable="!isEventEnabled(myevent)"
:label="$t('cal.booking')">
</q-btn>
<q-btn v-else :label="$t('dialog.ok')" color="primary" v-close-popup></q-btn>
@@ -258,7 +258,7 @@ $t('
<div class="q-pa-xs">
<q-card class="text-white windowcol">
<q-card-section>
<q-checkbox :disable="(bookEventpage.bookedevent && bookEventpage.bookedevent.booked) || (bookEventpage.bookedevent === undefined)" style="color: black;" v-model="bookEventForm.booked" :label="$t('cal.bookingtextdefault')" color="green">
<q-checkbox :disable="((bookEventpage.bookedevent && bookEventpage.bookedevent.booked) || (bookEventpage.bookedevent === undefined)) || !isEventEnabled(myevent)" style="color: black;" v-model="bookEventForm.booked" :label="$t('cal.bookingtextdefault')" color="green">
</q-checkbox>
<div v-if="bookEventForm.booked" class="q-gutter-md centermydiv" style="max-width: 150px; margin-top:10px;">
@@ -550,7 +550,7 @@ $t('
<q-btn rounded outline
v-if="!event.nobookable && !isAlreadyBooked(event) && static_data.functionality.BOOKING_EVENTS"
color="primary" @click="addBookEventMenu(event)"
:label="$t('cal.booking')">
:label="$t('cal.booking')" :disable="!isEventEnabled(event)">
</q-btn>
<q-btn rounded outline
v-if="!event.nobookable && isAlreadyBooked(event) && static_data.functionality.BOOKING_EVENTS"