Merge pull request #219 from RieCo432/dev

Close issues #214 and #215

Author: RieCo432

vuejs/src/components/ComboboxTextInput/ComboboxTextInput.vue

@@ -2,7 +2,10 @@
   <div>
     <div class="relative mt-0"
          @focusin="() => (showSuggestions = true)"
-         @focusout="() => delay(() => (showSuggestions = false), 100)"
+         @focusout="(evt) => {
+           console.log('focusout', evt);
+           showSuggestions = false;
+         }"
     >
       <div class="relative w-full">
         <div
@@ -138,7 +141,7 @@
                       }"
                 class="relative cursor-default select-none py-2 px-4"
                 @mouseenter="() => (activeIndex = i)"
-                @click.prevent="() => selected($event, suggestion)"
+                @mousedown.prevent="(event) => selected(event, suggestion)"
             >
                       <span class="block">
                         {{ suggestion }}
@@ -258,6 +261,7 @@ export default {
   methods: {
     delay,
     selected(event, value) {
+      console.log('selected', event);
       this.showSuggestions = false;
       const i = this.suggestions.indexOf(value);
       this.selectedCallback(event, i);

vuejs/src/components/Modal/AppointmentInfoModal.vue

@@ -58,7 +58,7 @@
                 <p v-if="appointment.typeTitle !== 'Closed Day'">Confirmed: {{appointment.confirmed ? 'Yes' : 'No'}}</p>
                 <p>Notes: {{appointment.notes}}</p>
               </div>
-              <div>
+              <div v-if="appointment.typeTitle !== 'Closed Day'">
                 <AppointmentSummaryTable
                     title="Appointments"
                     :is-client="false"

vuejs/src/views/appointments/appointmentCalendar.vue

@@ -48,20 +48,36 @@ export default {
   },
   methods: {
     showEventDetail(eventClickInfo) {
-      this.showAppointmentModal = !this.showAppointmentModal;
-      this.getClientAppointmentSummaries(eventClickInfo.event.extendedProps.client.id);
-      this.appointmentModalInfo = {
-        title: eventClickInfo.event.title,
-        startDateTime: eventClickInfo.event.start,
-        notes: eventClickInfo.event.extendedProps.notes,
-        id: eventClickInfo.event.id,
-        client: eventClickInfo.event.extendedProps.client,
-        endDateTime: eventClickInfo.event.end,
-        confirmed: eventClickInfo.event.extendedProps.confirmed,
-        cancelled: eventClickInfo.event.extendedProps.cancelled,
-        clientName: eventClickInfo.event.extendedProps.clientName,
-        typeTitle: eventClickInfo.event.extendedProps.typeTitle,
-      };
+      console.log(eventClickInfo);
+      if (eventClickInfo.event.extendedProps.typeTitle === 'Closed Day') {
+        this.appointmentModalInfo = {
+          title: eventClickInfo.event.title,
+          startDateTime: eventClickInfo.event.start,
+          notes: eventClickInfo.event.extendedProps.notes,
+          id: eventClickInfo.event.id,
+          client: {},
+          endDateTime: eventClickInfo.event.end,
+          confirmed: true,
+          cancelled: false,
+          clientName: 'Workshop',
+          typeTitle: eventClickInfo.event.extendedProps.typeTitle,
+        };
+      } else {
+        this.getClientAppointmentSummaries(eventClickInfo.event.extendedProps.client.id);
+        this.appointmentModalInfo = {
+          title: eventClickInfo.event.title,
+          startDateTime: eventClickInfo.event.start,
+          notes: eventClickInfo.event.extendedProps.notes,
+          id: eventClickInfo.event.id,
+          client: eventClickInfo.event.extendedProps.client,
+          endDateTime: eventClickInfo.event.end,
+          confirmed: eventClickInfo.event.extendedProps.confirmed,
+          cancelled: eventClickInfo.event.extendedProps.cancelled,
+          clientName: eventClickInfo.event.extendedProps.clientName,
+          typeTitle: eventClickInfo.event.extendedProps.typeTitle,
+        };
+      }
+      this.showAppointmentModal = true;
     },
     openAddClosedDayModal(info) {
       this.addClosedDayDate = info.dateStr;