- Booking: added modify a booking (+ emails).

src/components/Header/Header.ts

@@ -38,7 +38,6 @@ export default class Header extends Vue {
   public photo = ''
   public visuimg: boolean = true
 
-
   get getappname(){
     if (Screen.width < 400) {
       return this.$t('msg.myAppNameShort')

src/components/Header/Header.vue

@@ -102,7 +102,13 @@
                     <label>{{ $t('msg.hello') }}</label> <span v-model="prova"></span> !
                 </div>-->
 
-                <q-btn v-if="static_data.functionality.SHOW_USER_MENU" dense flat round icon="menu" @click="right = !right">
+                <!-- BUTTON USER BAR -->
+
+                <q-btn v-if="static_data.functionality.SHOW_USER_MENU && !isLogged" dense flat round icon="menu"
+                       @click="right = !right">
+                </q-btn>
+                <q-btn v-if="static_data.functionality.SHOW_USER_MENU && isLogged" dense flat round
+                       icon="img:statics/images/avatar-1.svg" @click="right = !right">
                 </q-btn>
 
             </q-toolbar>
@@ -121,7 +127,8 @@
 
         </q-drawer>
 
-        <q-drawer v-if="static_data.functionality.SHOW_USER_MENU" v-model="right" side="right" overlay bordered>
+        <!-- USER BAR -->
+        <q-drawer v-if="static_data.functionality.SHOW_USER_MENU" v-model="right" side="right" elevated>
             <div id="profile">
                 <q-img class="absolute-top" src="../../statics/images/landing_first_section.png"
                        style="height: 150px">
@@ -130,7 +137,9 @@
                         <q-avatar class="q-mb-sm center_img">
                             <img src="../../statics/images/avatar-1.svg">
                         </q-avatar>
-                        <div v-if="Username" class="text-weight-bold text-user">{{ Username }} - {{ Name }}</div>
+                        <q-btn class="absolute-top-right" style="margin-top: 9px; margin-right: 12px; color: white;" dense flat round icon="close" @click="right = !right">
+                        </q-btn>
+                        <div v-if="Username" class="text-weight-bold text-user">{{ Username }} - {{ myName }}</div>
                         <div v-else class="text-italic">{{ $t('user.loggati') }}</div>
 
                         <!--<span class="text-white" v-if="Verificato"> {{$t('reg.verificato')}} </span>-->

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[]

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',

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) {
+            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
           }
         }

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) {