{{ Username }} - {{ Name }}
+ {{ Username }} - {{ myName }}
{{ $t('user.loggati') }}
diff --git a/src/model/Calendar.ts b/src/model/Calendar.ts
index 2ab8870..adfcf55 100644
--- a/src/model/Calendar.ts
+++ b/src/model/Calendar.ts
@@ -28,9 +28,20 @@ export interface IBookedEvent {
infoevent: string
msgbooking: string
datebooked?: Date
+ modified: boolean
booked: boolean
}
+export enum EState {
+ None, Creating, Modifying
+}
+
+export interface IBookedEventPage {
+ show: boolean
+ bookedevent: IBookedEvent
+ state: EState
+}
+
export interface ICalendarState {
editable: boolean
eventlist: IEvents[]
diff --git a/src/statics/i18n.js b/src/statics/i18n.js
index 7c2aae4..2b397ba 100644
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -8,6 +8,7 @@ const msgglobal = {
no: 'No',
delete: 'Elimina',
cancel: 'Annulla',
+ update: 'Aggiorna',
today: 'Oggi',
book: 'Prenota',
msg: {
@@ -158,6 +159,7 @@ const msgglobal = {
booked_error: 'Prenotazione non avvenuta. Riprovare più tardi',
booking: 'Prenota Evento',
titlebooking: 'Prenotazione',
+ modifybooking: 'Modifica Prenotazione',
cancelbooking: 'Cancella Prenotazione',
canceledbooking: 'Prenotazione Cancellata',
cancelederrorbooking: 'Cancellazione non effettuata, Riprovare più tardi',
@@ -204,6 +206,7 @@ const msgglobal = {
no: 'No',
delete: 'Borrar',
cancel: 'Cancelar',
+ update: 'Actualiza',
today: 'Hoy',
book: 'Reserva',
msg: {
@@ -348,6 +351,7 @@ const msgglobal = {
booked_error: 'Reserva fallida. Intenta nuevamente más tarde',
booking: 'Reserva Evento',
titlebooking: 'Reserva',
+ modifybooking: 'Edita Reserva',
cancelbooking: 'Cancelar Reserva',
canceledbooking: 'Reserva Cancelada',
cancelederrorbooking: 'Cancelación no realizada, intente nuevamente más tarde',
@@ -393,6 +397,7 @@ const msgglobal = {
yes: 'Oui',
no: 'Non',
delete: 'Supprimer',
+ update: 'mises à jour',
cancel: 'annuler',
today: 'Aujourd\'hui',
book: 'Réserve',
@@ -537,6 +542,7 @@ const msgglobal = {
booked_error: 'La réservation a échoué. Réessayez plus tard',
booking: 'Réserver l\'événement',
titlebooking: 'Réservation',
+ modifybooking: 'changement de réservation',
cancelbooking: 'Annuler la réservation',
canceledbooking: 'Réservation annulée',
cancelederrorbooking: 'Annulation non effectuée, réessayez plus tard',
@@ -582,6 +588,7 @@ const msgglobal = {
yes: 'Yes',
no: 'No',
delete: 'Delete',
+ update: 'Update',
cancel: 'Cancel',
today: 'Today',
book: 'Book',
@@ -725,6 +732,7 @@ const msgglobal = {
booked_error: 'Reservation failed. Try again later',
booking: 'Book the Event',
titlebooking: 'Reservation',
+ modifybooking: 'Modify Reservation',
cancelbooking: 'Cancel Reservation',
canceledbooking: 'Booking cancelled',
cancelederrorbooking: 'Cancellation unsuccessfully, try again later',
@@ -770,6 +778,7 @@ const msgglobal = {
yes: 'Yes',
no: 'No',
delete: 'Delete',
+ update: 'Update',
cancel: 'Cancel',
today: 'Today',
book: 'Book',
@@ -915,6 +924,7 @@ const msgglobal = {
booked_error: 'Reservation failed. Try again later',
booking: 'Book the Event',
titlebooking: 'Reservation',
+ modifybooking: 'Modify Reservation',
cancelbooking: 'Cancel Reservation',
canceledbooking: 'Booking cancelled',
cancelederrorbooking: 'Cancellation unsuccessfully, try again later',
diff --git a/src/store/Modules/Store/calendar/CalendarStore.ts b/src/store/Modules/Store/calendar/CalendarStore.ts
index cdb5dda..5a56ac1 100644
--- a/src/store/Modules/Store/calendar/CalendarStore.ts
+++ b/src/store/Modules/Store/calendar/CalendarStore.ts
@@ -113,6 +113,7 @@ namespace Actions {
datebooked: bookevent.datebooked,
userId: UserStore.state.userId,
booked: bookevent.booked,
+ modified: bookevent.modified,
}
}
@@ -125,7 +126,15 @@ namespace Actions {
.then((res) => {
if (res.status === 200) {
if (res.data.code === serv_constants.RIS_CODE_OK) {
- state.bookedevent.push(bookevent)
+ if (bookevent.modified) {
+
+ const foundIndex = state.bookedevent.findIndex((x) => x.id_bookedevent === bookevent.id_bookedevent)
+ if (foundIndex >= 0)
+ state.bookedevent[foundIndex] = bookevent
+
+ } else {
+ state.bookedevent.push(bookevent)
+ }
return true
}
}
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 5799591..9d08a87 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -1305,9 +1305,10 @@ export const tools = {
if (myfunc === costanti.FuncDialog.CANCEL_BOOKING) {
console.log(' ENTRATO ! CancelBookingEvent ')
CalendarStore.actions.CancelBookingEvent(par.param1).then((ris) => {
- if (ris)
+ if (ris) {
tools.showPositiveNotif(myself.$q, myself.$t('cal.canceledbooking') + ' "' + par.param1.title + '"')
- else
+ myself.bookEventpage.show = false
+ } else
tools.showNegativeNotif(myself.$q, myself.$t('cal.cancelederrorbooking'))
})
}
@@ -2077,7 +2078,7 @@ export const tools = {
return msg
},
gettextevent(myevent) {
- return '"' + myevent.title + '" (' + this.getDateStr(myevent.date) + ') - ' + myevent.time
+ return '"' + myevent.title + '" (' + func_tools.getDateStr(myevent.date) + ') - ' + myevent.time
},
setLangAtt(mylang) {