Pending form transition in form Add

ertush · Jan 12, 2024 · c48f1bf · c48f1bf
1 parent d734930
commit c48f1bf
Show file tree

Hide file tree

Showing 25 changed files with 309 additions and 360 deletions.
diff --git a/components/FacilityDetailsTabs.js b/components/FacilityDetailsTabs.js
diff --git a/components/FacilityDetailsTabsPublic.js b/components/FacilityDetailsTabsPublic.js
@@ -60,7 +60,7 @@ function FacilityDetailsTabsPulic({ facility }) {
             let rating_val = [];
             rating_val[0] = data.rating;
             rating_val[1] = data.comment;
-            alert.success({timeout: 10000}, "Review submitted successfully");
+            alert.success("Review submitted successfully");
             window.localStorage.setItem("rating", JSON.stringify(rating_val));
 
             //clear
@@ -78,7 +78,7 @@ function FacilityDetailsTabsPulic({ facility }) {
         console.log(error);
       }
     } else {
-      alert.error({timeout: 10000}, "Rating value must be greater than zero");
+      alert.error("Rating value must be greater than zero");
     }
   };
 

diff --git a/components/FacilityUpdatesTable.js b/components/FacilityUpdatesTable.js
@@ -7,7 +7,7 @@ function FacilityUpdatesTable({ facilityUpdatedJson, originalData }) {
 
 
     return (
-        <Table className="md:px-4">
+        <Table className="md:px-4 mt-4">
 
             {/* Switch FacilityTableUpdates View */}
             <TableBody className='w-full flex flex-col gap-y-6'>

diff --git a/components/Forms/BasicDetailsForm.js b/components/Forms/BasicDetailsForm.js
@@ -324,7 +324,7 @@ export function BasicDeatilsForm({ editMode }) {
     })
     .then(res => {
       if (res.status == 204 || res.status == 200) {
-        alert.success({timeout: 10000}, 'Facility Updated Successfully')
+        alert.success('Facility Updated Successfully')
         setSubmitting(false)
 
         router.push({
@@ -335,7 +335,7 @@ export function BasicDeatilsForm({ editMode }) {
         })
 
       } else {
-        alert.error({timeout: 10000}, 'Unable to update facility')
+        alert.error('Unable to update facility')
         setSubmitting(false)
         res.json()
           .then(resp => {
@@ -392,10 +392,10 @@ export function BasicDeatilsForm({ editMode }) {
 
         if (res.status == 201 || res.status == 200) {
           setSubmitting(false)
-          alert.success({timeout: 10000}, 'Facility Added Successfully')
+          alert.success('Facility Added Successfully')
         } else {
           setSubmitting(false)
-          alert.error({timeout: 10000}, 'Unable to Add facility')
+          alert.error('Unable to Add facility')
           res.json()
           .then(resp => {
             const formResponse = []

diff --git a/components/Forms/CommunityUnitsForms.js b/components/Forms/CommunityUnitsForms.js
@@ -152,13 +152,13 @@ function EditCommunityUnitsBasicDeatilsForm(props) {
 
             setSubmitting(false)
             // setFormError(Array.isArray(Object.values(detail)) && Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-            alert.error({timeout: 10000}, 'Unable to save Community Units Basic details')
+            alert.error('Unable to save Community Units Basic details')
           }
         })
     }
 
     catch (e) {
-      alert.error({timeout: 10000}, 'Error Occured: ' + e.message)
+      alert.error('Error Occured: ' + e.message)
     }
 
 
@@ -695,13 +695,13 @@ function EditCommunityUnitsCHEWSForm(props) {
 
               setSubmitting(false)
               // setFormError(Array.isArray(Object.values(detail)) && Object.values(detail).length == 1 && typeof Object.values(detail)[0] == 'string' && detail[0][0])
-              alert.error({timeout: 10000}, 'Unable to update Community Units healtjh workers')
+              alert.error('Unable to update Community Units healtjh workers')
             }
           })
       }
 
       catch (e) {
-        alert.error({timeout: 10000}, 'Error Occured: ' + e.message)
+        alert.error('Error Occured: ' + e.message)
       }
   }
 
@@ -751,7 +751,7 @@ function EditCommunityUnitsCHEWSForm(props) {
         // setDeleteButton(props?.health_unit_workers.map((_, i) => ({[i]: false})))
 
 
-        alert.success({timeout: 10000}, `${props?.health_unit_workers[index]?.name} has been deleted successfully`)
+        alert.success(`${props?.health_unit_workers[index]?.name} has been deleted successfully`)
       } else {
           resp.json().then(({detail}) => {
           alert.error('Unable to delete health worker', {timeout: 10000})
@@ -922,12 +922,10 @@ function EditCommunityUnitsCHEWSForm(props) {
 
 }
 
-
 function EditCommunityUnitsServicesForm(props) {
 
     const currentServices = props?.services?.map(({name: label, service: value}) => ({label, value})) ?? []
 
-
     const options = useContext(ChuOptionsContext)
 
     const [submitting, setSubmitting] = useState(false)

diff --git a/components/Forms/FacilityContactsForm.js b/components/Forms/FacilityContactsForm.js
@@ -246,7 +246,7 @@ export function FacilityContactsForm() {
                         .then((resp) => {
                             defer(() => updatedSavedChanges(true));
                             if (resp.status == 200 || resp.status == 204) {
-                                alert.success({timeout: 10000}, "Updated facility contacts successfully")
+                                alert.success("Updated facility contacts successfully")
 
                                 router.push({
                                     pathname: '/facilities/facility_changes/[facility_id]',
@@ -257,7 +257,7 @@ export function FacilityContactsForm() {
                             }
 
                             else {
-                                alert.error({timeout: 10000}, "Unable to update facility contacts")
+                                alert.error("Unable to update facility contacts")
                                 resp.json()
                                 .then(resp => {
                                   const formResponse = []
@@ -297,7 +297,7 @@ export function FacilityContactsForm() {
                                     }
                                 })
 
-                                alert.success({timeout: 10000}, 'Officer Incharge Contacts Saved successfully')
+                                alert.success('Officer Incharge Contacts Saved successfully')
 
                                 const formDataBase64Enc = Buffer.from(JSON.stringify(values)).toString('base64')
 
@@ -326,8 +326,8 @@ export function FacilityContactsForm() {
                             }
                             else {
                                 setSubmitting(false)
-                                alert.error({timeout: 10000}, 'Unable to save Facility Contacts')
-                                alert.error({timeout: 10000}, 'Unable to save Officer Incharge Contacts')
+                                alert.error('Unable to save Facility Contacts')
+                                alert.error('Unable to save Officer Incharge Contacts')
 
                                 resp.json()
                                 .then(resp => {

diff --git a/components/Forms/GeolocationForm.js b/components/Forms/GeolocationForm.js
@@ -101,7 +101,6 @@ export function GeolocationForm({ editMode }) {
       longitude: Number(data?.longitude),
       facility: options?.data?.id
     }
-
 
       if (payload) {
 
@@ -118,12 +117,14 @@ export function GeolocationForm({ editMode }) {
             if (resp.status == 200 || resp.status == 201) {
               alert.success('Geolocation Detatils saved Successfully', {timeout: 10000})
               setSubmitting(false)
+
               router.push({
                 pathname: '/facilities/facility_changes/[facility_id]/',
                 query: { 
                   facility_id: options?.data?.id
                 }
               })
+
             } else {
               alert.error('Unable to save Geolocation Details Successfully', {timeout: 10000})
               setSubmitting(false)
@@ -181,7 +182,7 @@ export function GeolocationForm({ editMode }) {
     })
       .then(res => {
         if (res.status == 204 || res.status == 200) {
-          alert.success({timeout: 10000}, 'Facility Geolocation Details have been saved successfully')
+          alert.success('Facility Geolocation Details have been saved successfully')
 
           setSubmitting(false)
 
@@ -216,7 +217,7 @@ export function GeolocationForm({ editMode }) {
 
         } else {
           setSubmitting(false)
-          alert.error({timeout: 10000}, 'Unable to save to Geolocation details')
+          alert.error('Unable to save to Geolocation details')
 
           res.json()
           .then(resp => {

diff --git a/components/Forms/formComponents/EditListItem.js b/components/Forms/formComponents/EditListItem.js
@@ -162,7 +162,7 @@ function EditListItem({
           .then(resp => {
             if (resp.status == 200 || resp.status == 204) {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Updated facility services successfully');
+              alert.success('Updated facility services successfully');
 
               router.push({
                 pathname: '/facilities/facility_changes/[facility_id]',
@@ -195,7 +195,7 @@ function EditListItem({
         .then(resp => {
           if (resp.status == 200 || resp.status == 204) {
             setSubmitting(false)
-            alert.success({timeout: 10000}, 'Updated Community Health Unit Services successfully');
+            alert.success('Updated Community Health Unit Services successfully');
 
             // router.push({
             //   pathname: '/facilities/facility_changes/[facility_id]',
@@ -232,7 +232,7 @@ function EditListItem({
             if (resp.status == 204 || resp.status == 200) {
               if(itemName == "facility_services") {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Facility services saved successfully');
+              alert.success('Facility services saved successfully');
 
               const services = typeof selectedItems == 'string' ? JSON.parse(selectedItems).map(({ rowid }) => ({ service: rowid })) : selectedItems.map(({ rowid }) => ({ service: rowid }))
               const payload = JSON.stringify(services)
@@ -280,7 +280,7 @@ function EditListItem({
             }
             else {
               setSubmitting(false)
-              alert.error({timeout: 10000}, 'Unable to save facility services');
+              alert.error('Unable to save facility services');
 
               resp.json()
               .then(resp => {
@@ -306,7 +306,7 @@ function EditListItem({
           .then(resp => {
             if (resp.status == 204 || resp.status == 200) {
               setSubmitting(false)
-              alert.success({timeout: 10000}, 'Community health unit services saved successfully');
+              alert.success('Community health unit services saved successfully');
               console.log('  Navigating to CHU Details page ... ')
 
               router.push({
@@ -319,7 +319,7 @@ function EditListItem({
             }
             else {
               setSubmitting(false)
-              alert.error({timeout: 10000}, 'Unable to save Community Health Unit Services');
+              alert.error('Unable to save Community Health Unit Services');
 
             }
           })

diff --git a/components/Forms/formComponents/EditListWithCount.js b/components/Forms/formComponents/EditListWithCount.js
@@ -276,7 +276,7 @@ function EditListWithCount(
                 .then(resp => {
                     if (resp.status == 200 || resp.status == 204) {
                         setSubmitting(false)
-                        alert.success({timeout: 10000}, `Facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'} form updated successfully`)
+                        alert.success(`Facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'} form updated successfully`)
 
                         router.push({
                             pathname: '/facilities/facility_changes/[facility_id]',
@@ -288,7 +288,7 @@ function EditListWithCount(
 
                     } else {
                         setSubmitting(false)
-                        alert.error({timeout: 10000}, `Unable to update facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'}`)
+                        alert.error(`Unable to update facility ${e.target.name.includes("infrastructure") ? 'Infrastructure' : 'Human resource'}`)
 
                         resp.json()
                         .then(resp => {
@@ -317,13 +317,13 @@ function EditListWithCount(
                     .then(resp => {
                         if (resp.status == 204 || resp.status == 200) {
                             setSubmitting(false)
-                            alert.success({timeout: 10000}, 'Facility humanresource saved successfully')
+                            alert.success('Facility humanresource saved successfully')
 
                             router.push(`/facilities/${itemId}`)
 
                         } else {
                             setSubmitting(false)
-                            alert.error({timeout: 10000}, 'Unable to save facility humanresource')
+                            alert.error('Unable to save facility humanresource')
                             resp.json()
                             .then(resp => {
                                 const formResponse = []
@@ -347,7 +347,7 @@ function EditListWithCount(
                 .then(resp => {
                     if (resp.status == 204 || resp.status == 200) {
                         setSubmitting(false)
-                        alert.success({timeout: 10000}, 'Facility Infrastructure saved successfully')
+                        alert.success('Facility Infrastructure saved successfully')
 
                         const infrastructure = selectedRows.map(({ rowid }) => ({ service: rowid }))
 
@@ -381,7 +381,7 @@ function EditListWithCount(
                     } else {
 
                         setSubmitting(false)
-                        alert.error({timeout: 10000}, 'Unable to save facility infrastructure')
+                        alert.error('Unable to save facility infrastructure')
                         resp.json()
                         .then(resp => {
                             const formResponse = []

diff --git a/components/Forms/formComponents/FacilityContacts.js b/components/Forms/formComponents/FacilityContacts.js
@@ -85,7 +85,7 @@ const FacilityContact = ({contactTypeOptions, setFacilityContacts, index, fieldN
                             try{
                                 if(contactTypeRef?.current) {
                                 const resp = await fetch(`/api/common/submit_form_data/?path=delete_contact&id=${contactTypeRef?.current?.state?.value[0].id ?? null}`)
-                                if(resp.status == 204) alert.success({timeout: 10000}, 'Deleted Facility Contact Successfully')
+                                if(resp.status == 204) alert.success('Deleted Facility Contact Successfully')
 
 
                                 }

diff --git a/components/Forms/formComponents/FacilityDepartmentUnits.js b/components/Forms/formComponents/FacilityDepartmentUnits.js
@@ -9,10 +9,12 @@ export default function FacilityDepartmentUnits({facilityDeptOptions,  setFacili
 
     const facilityDepts = useContext(FacilityDepartmentUnitsContext);
 
-
+    console.log(facilityDepts)
+
 
     return (
         <> 
+
 
             {/* Name */}
             <Select options={facilityDeptOptions || []} 
@@ -36,7 +38,10 @@ export default function FacilityDepartmentUnits({facilityDeptOptions,  setFacili
             onClick={(ev) => {
                 ev.preventDefault();
                 facilityDepts.splice(index, 1);
-                setFacilityDepts(facilityDepts);
+                // setFacilityDepts(prev => {
+                //     return prev.filter(({id}) => id )
+                // });
+                return facilityDepts
 
             }}><XCircleIcon className='w-7 h-7 text-red-400' /></button>