- Enable Edit Event into dialog form ... (and save to the db)

- Add Where table
This commit is contained in:
Paolo Arena
2019-10-21 20:38:22 +02:00
parent 9656b14cd0
commit bfe5053407
12 changed files with 474 additions and 433 deletions

View File

@@ -270,10 +270,12 @@ namespace Mutations {
}
function getListByTable(table): any[] {
if (table === 'events')
if (table === 'myevents')
return CalendarStore.state.eventlist
else if (table === 'operators')
return CalendarStore.state.operators
else if (table === 'wheres')
return CalendarStore.state.wheres
else if (table === 'bookings')
return CalendarStore.state.bookedevent
else if (table === 'users')

View File

@@ -18,6 +18,7 @@ const state: ICalendarState = {
eventlist: [],
bookedevent: [],
operators: [],
wheres: [],
// ---------------
titlebarHeight: 0,
locale: 'it-IT',
@@ -63,6 +64,24 @@ namespace Getters {
return mystate.bookedevent.filter((bookedevent) => (bookedevent.id_bookedevent === idevent) && (bookedevent.booked) && (showall || (!showall && bookedevent.userId === UserStore.state.userId) ))
}, 'getEventsBookedByIdEvent')
const getTeacherName = b.read((mystate: ICalendarState) => (teacherusername) => {
const op = mystate.operators.find((myop) => myop.username === teacherusername)
return (op) ? `${op.name} ${op.surname}` : ''
}, 'getTeacherName')
const getTeacher = b.read((mystate: ICalendarState) => (teacherusername) => {
const op = mystate.operators.find((myop) => myop.username === teacherusername)
return (op)
}, 'getTeacher')
const getWhereRec = b.read((mystate: ICalendarState) => (wherecode) => {
const whererec = mystate.wheres.find((mywhere) => mywhere.code === wherecode)
return (whererec)
}, 'getWhereRec')
export const getters = {
get findEventBooked() {
return findEventBooked()
@@ -72,6 +91,15 @@ namespace Getters {
},
get getEventsBookedByIdEvent() {
return getEventsBookedByIdEvent()
},
get getTeacher() {
return getTeacher()
},
get getWhereRec() {
return getWhereRec()
},
get getTeacherName() {
return getTeacherName()
}
}
@@ -92,9 +120,7 @@ namespace Actions {
async function loadAfterLogin(context) {
// console.log('CalendarStore: loadAfterLogin')
// Load local data
state.editable = db_data.userdata.calendar_editable
// state.eventlist = db_data.events
// state.bookedevent = db_data.userdata.bookedevent
state.editable = UserStore.state.isAdmin || UserStore.state.isManager
if (UserStore.getters.isUserInvalid) {
state.bookedevent = []
@@ -113,6 +139,7 @@ namespace Actions {
state.bookedevent = (res.data.bookedevent) ? res.data.bookedevent : []
state.eventlist = (res.data.eventlist) ? res.data.eventlist : []
state.operators = (res.data.operators) ? res.data.operators : []
state.wheres = (res.data.wheres) ? res.data.wheres : []
})
.catch((error) => {

View File

@@ -19,7 +19,7 @@ export const lists = {
DUPLICATE_RECTABLE: 310,
CAN_EDIT_TABLE: 400,
SHOW_PREV_REC: 401,
SHOW_PREV_REC: 401
},
selectTheme: [

View File

@@ -1664,8 +1664,10 @@ export const tools = {
,
getstrYYMMDDDate(mytimestamp) {
return date.formatDate(mytimestamp, 'YYYY-MM-DD')
}
,
},
getstrYYMMDDDateTime(mytimestamp) {
return date.formatDate(mytimestamp, 'YYYY-MM-DD HH:mm')
},
// mystrdate "26.04.2013"
convertstrtoDate(mystrdate
@@ -2144,7 +2146,7 @@ export const tools = {
},
gettextevent(myevent: IEvents) {
// return '"' + myevent.title + '" (' + func_tools.getDateStr(myevent.date) + ') - ' + myevent.time
return '"' + myevent.title + '" (' + tools.getstrDateTime(myevent.date)
return '"' + myevent.title + '" (' + tools.getstrDateTime(myevent.dateTimeStart)
},
setLangAtt(mylang) {
@@ -2299,9 +2301,9 @@ export const tools = {
param2: notify
})
},
ActionRecTable(mythis, action, table, id, item?) {
console.log('CancelRecTable', id)
return tools.askConfirm(mythis.$q, translate('db.deleterecord'), translate('db.deletetherecord'), translate('dialog.yes'), translate('dialog.no'), mythis, table, action, 0, {
ActionRecTable(mythis, action, table, id, item, askaction) {
console.log('ActionRecTable', id)
return tools.askConfirm(mythis.$q, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), mythis, table, action, 0, {
param1: id,
param2: item
})

View File

@@ -1,4 +1,5 @@
import { UserStore } from '@store'
import { date } from 'quasar'
export const toolsext = {
getLocale(vero?: boolean) {
@@ -34,12 +35,23 @@ export const func_tools = {
// timeZone: 'UTC'
})
if (DateFormatter) {
const date = new Date(mydate)
return DateFormatter.format(date)
const date1 = new Date(mydate)
return DateFormatter.format(date1)
}
return mydate
},
hasManyDays(mydatestart, mydateend) {
if (mydateend)
return this.getDateStr(mydatestart) !== this.getDateStr(mydateend)
else
return false
},
getMinutesDuration(mydatestart, mydateend) {
return date.getDateDiff(mydateend, mydatestart, 'minutes')
},
getDateTimeShortStr(mydate) {
const DateFormatter = new Intl.DateTimeFormat(func_tools.getLocale() || void 0, {
hour: 'numeric',