feat(ZMS-2936): fix timeslot bug

it-at-m · Feb 18, 2025 · 7afe546 · 7afe546
1 parent 962f6c2
commit 7afe546
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 67 deletions.
diff --git a/zmscitizenview/src/components/Appointment/AppointmentView.vue b/zmscitizenview/src/components/Appointment/AppointmentView.vue
@@ -18,7 +18,7 @@
               <service-finder
                 :base-url="baseUrl"
                 :preselected-service-id="serviceId"
-                :preselected-offive-id="locationId"
+                :preselected-office-id="locationId"
                 :exclusive-location="exclusiveLocation"
                 :t="t"
                 @next="setServices"
@@ -340,7 +340,7 @@ const setRebookData = () => {
       rebookedAppointment.value.customTextfield;
     updateAppointment(appointment.value, props.baseUrl ?? undefined).then(
       (data) => {
-        if ((data as AppointmentDTO).processId !== undefined) {
+        if ((data as AppointmentDTO).processId != undefined) {
           appointment.value = data as AppointmentDTO;
         } else {
           if (
@@ -366,7 +366,7 @@ const nextReserveAppointment = () => {
     selectedProvider.value.id,
     props.baseUrl ?? undefined
   ).then((data) => {
-    if ((data as AppointmentDTO).processId !== undefined) {
+    if ((data as AppointmentDTO).processId != undefined) {
       if (appointment.value && !isRebooking.value) {
         cancelAppointment(appointment.value, props.baseUrl ?? undefined);
       }
@@ -398,7 +398,7 @@ const nextUpdateAppointment = () => {
 
     updateAppointment(appointment.value, props.baseUrl ?? undefined).then(
       (data) => {
-        if ((data as AppointmentDTO).processId !== undefined) {
+        if ((data as AppointmentDTO).processId != undefined) {
           appointment.value = data as AppointmentDTO;
         } else {
           if (
@@ -419,18 +419,16 @@ const nextBookAppointment = () => {
   if (appointment.value) {
     preconfirmAppointment(appointment.value, props.baseUrl ?? undefined).then(
       (data) => {
-        if ((data as AppointmentDTO).processId !== undefined) {
+        if ((data as AppointmentDTO).processId != undefined) {
           appointment.value = data as AppointmentDTO;
           if (isRebooking.value && rebookedAppointment.value) {
             cancelAppointment(
               rebookedAppointment.value,
               props.baseUrl ?? undefined
             );
           }
-        } else {
-          // error.value = true;
+          increaseCurrentView();
         }
-        increaseCurrentView();
       }
     );
   }
@@ -440,7 +438,7 @@ const nextCancelAppointment = () => {
   if (appointment.value) {
     cancelAppointment(appointment.value, props.baseUrl ?? undefined).then(
       (data) => {
-        if ((data as AppointmentDTO).processId !== undefined) {
+        if ((data as AppointmentDTO).processId != undefined) {
           cancelAppointmentSuccess.value = true;
         } else {
           cancelAppointmentError.value = true;
@@ -491,8 +489,8 @@ onMounted(() => {
     try {
       appointmentData = JSON.parse(window.atob(props.confirmAppointmentHash));
       if (
-        appointmentData.id === undefined ||
-        appointmentData.authKey === undefined
+        appointmentData.id == undefined ||
+        appointmentData.authKey == undefined
       ) {
         confirmAppointmentError.value = true;
         return;
@@ -503,7 +501,7 @@ onMounted(() => {
     }
     confirmAppointment(appointmentData, props.baseUrl ?? undefined).then(
       (data) => {
-        if ((data as AppointmentDTO).processId !== undefined) {
+        if ((data as AppointmentDTO).processId != undefined) {
           confirmAppointmentSuccess.value = true;
         } else {
           confirmAppointmentError.value = true;
@@ -527,8 +525,8 @@ onMounted(() => {
       try {
         appointmentData = JSON.parse(window.atob(props.appointmentHash));
         if (
-          appointmentData.id === undefined ||
-          appointmentData.authKey === undefined
+          appointmentData.id == undefined ||
+          appointmentData.authKey == undefined
         ) {
           confirmAppointmentError.value = true;
           return;
@@ -539,7 +537,7 @@ onMounted(() => {
       }
       fetchAppointment(appointmentData, props.baseUrl ?? undefined).then(
         (data) => {
-          if ((data as AppointmentDTO).processId !== undefined) {
+          if ((data as AppointmentDTO).processId != undefined) {
             appointment.value = data as AppointmentDTO;
             selectedService.value = services.value.find(
               (service) => service.id == appointment.value.serviceId

diff --git a/zmscitizenview/src/components/Appointment/CalendarView.vue b/zmscitizenview/src/components/Appointment/CalendarView.vue
@@ -402,6 +402,7 @@ const allowedDates = (date: Date) => {
 };
 
 watch(selectedDay, (newDate) => {
+  selectedTimeslot.value = 0;
   if (newDate) {
     getAppointmentsOfDay(convertDateToString(newDate));
   }

diff --git a/zmscitizenview/src/components/Appointment/ServiceFinder.vue b/zmscitizenview/src/components/Appointment/ServiceFinder.vue
@@ -122,7 +122,7 @@ import {
 const props = defineProps<{
   baseUrl: string | undefined;
   preselectedServiceId: string | undefined;
-  preselectedOffiveId: string | undefined;
+  preselectedOfficeId: string | undefined;
   exclusiveLocation: string | undefined;
   t: any;
 }>();
@@ -189,9 +189,9 @@ const setServiceData = (selectedService: ServiceImpl) => {
       })
       .filter((subService) => {
         if (subService === undefined) return false;
-        if (props.preselectedOffiveId) {
+        if (props.preselectedOfficeId) {
           return subService.providers.some(
-            (provider) => provider.id == props.preselectedOffiveId
+            (provider) => provider.id == props.preselectedOfficeId
           );
         }
         return true;
@@ -314,7 +314,7 @@ onMounted(() => {
   } else {
     fetchServicesAndProviders(
       props.preselectedServiceId ?? undefined,
-      props.preselectedOffiveId ?? undefined,
+      props.preselectedOfficeId ?? undefined,
       props.baseUrl ?? undefined
     ).then((data) => {
       services.value = data.services;

diff --git a/zmscitizenview/tests/unit/AppointmentView.spec.ts b/zmscitizenview/tests/unit/AppointmentView.spec.ts