#28 Fixed all delete appointment UI

KrisTheCanadian · Apr 7, 2022 · 695a049 · 695a049
1 parent d54b9fa
commit 695a049
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/src/components/dashboard/PatientView/PatientAppointments.tsx b/src/components/dashboard/PatientView/PatientAppointments.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useContext } from 'react';
+import React, { useEffect, useState } from 'react';
 import AdapterDateFns from '@mui/lab/AdapterDateFns';
 import LocalizationProvider from '@mui/lab/LocalizationProvider';
 import CalendarPicker from '@mui/lab/CalendarPicker';
@@ -23,7 +23,7 @@ const style = {
   borderRadius: 4,
 };
 
-export default function PatientAppointments({ handleAppointmentViewClose } : any) {
+export default function PatientAppointments({ handleAppointmentsViewClose } : any) {
   const theme = useTheme();
   const midSize = useMediaQuery(theme.breakpoints.down(1190));
   const [appointmentDate, setAppointmentDate] = React.useState<Date | null>(new Date());
@@ -36,16 +36,21 @@ export default function PatientAppointments({ handleAppointmentViewClose } : any
   const handleClose = () => {
     setOpen(false);
   };
+  const users = firestore.collection('users');
 
   const deleteAppointment = () => {
     const cancelAppointment = Firebase.functions().httpsCallable('cancelAppointment');
-    console.log(appointmentDate);
-    cancelAppointment({ appointmentDate }).then(() => {
-      // TODO set canBookAppointment to true*
-    })
-      .catch((saveError) => {
-        console.error(saveError);
-      });
+    handleClose();
+    handleAppointmentsViewClose();
+    cancelAppointment({ appointmentDate }).then(async () => {
+      await users
+        .doc(state.id)
+        .update({
+          disableBook: false,
+        });
+    }).catch((saveError) => {
+      console.error(saveError);
+    });
   };
 
   useEffect(() => {
@@ -104,7 +109,8 @@ export default function PatientAppointments({ handleAppointmentViewClose } : any
                 {appointmentDate !== null && appointmentDate.getMinutes() < 10 && ('0')}
                 {appointmentDate?.getMinutes()}
                 {' '}
-                AM
+                {appointmentDate !== null && appointmentDate?.getHours() < 12 && (' AM')}
+                {appointmentDate !== null && appointmentDate?.getHours() >= 12 && (' PM')}
               </Typography>
             </Paper>
             {!midSize && (

diff --git a/src/components/dashboard/PatientView/PatientView.tsx b/src/components/dashboard/PatientView/PatientView.tsx
@@ -83,8 +83,8 @@ function PatientView() {
       if (data) {
         setUser(data);
         setDisableBook(data.disableBook);
-        const appointmentData = data?.appointments[data.appointments.length - 1].selectedDate;
-        const appointmentTime = appointmentData.toDate();
+        const appointmentData = data?.appointments[data.appointments.length - 1]?.selectedDate;
+        const appointmentTime = appointmentData?.toDate();
         const currentDate = new Date();
         if (appointmentTime > currentDate) {
           setAppointment(true);
@@ -120,7 +120,7 @@ function PatientView() {
             </ListItemIcon>
             <ListItemText data-testid="TestResults" primary="Test Results" onClick={handleTestROpen} />
           </ListItem>
-          {!areAssigned && (
+          {areAssigned && (
           <ListItem button key="Results" data-testid="SymptomsUpdate2">
             <ListItemIcon>
               <ContentPasteIcon />
@@ -137,7 +137,7 @@ function PatientView() {
             </ListItemIcon>
             <ListItemText primary="Main Settings" onClick={() => { setContentId(2); }} />
           </ListItem>
-          {!appointment && !disableBook && areAssigned && (
+          {!disableBook && areAssigned && (
           <ListItem button key="Booking">
             <ListItemIcon>
               <EventIcon />
@@ -148,7 +148,7 @@ function PatientView() {
             />
           </ListItem>
           )}
-          {appointment && (
+          {appointment && disableBook && (
           <ListItem button key="Appointments">
             <ListItemIcon>
               <EventIcon />

diff --git a/src/pages/booking/bookingSystem.tsx b/src/pages/booking/bookingSystem.tsx
@@ -103,7 +103,7 @@ function bookingSystem({ handleBookingClose } : Props) {
           const snapData = snapshot.data();
           if (snapData) {
             const appointmentDates = snapData?.appointments
-              .map((appointment: { date: Timestamp; }) => appointment.date.toDate());
+              .map((appointment: { selectedDate: Timestamp; }) => appointment.selectedDate.toDate());
             setBookedDates(appointmentDates);
           }
         });