Fixed the patient list table

mnashat · Apr 6, 2022 · b5fe304 · b5fe304
1 parent eac77cc
commit b5fe304
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/Services/ProfileUpdateSercices/PatientProfileUpdate/SymptomsRequiredUpdate.js b/src/Services/ProfileUpdateSercices/PatientProfileUpdate/SymptomsRequiredUpdate.js
@@ -90,6 +90,13 @@ export default function SymptomsRequiredUpdate() {
             handleFormInformationLoad();
     }, [patients])
 
+
+    function redirectProfile() {
+        const user = window.location.href.split("/")[4];
+        window.location = "/profile/" + user
+    }
+
+
     const handleFormInformationLoad = () => {
         const patient = patients[0];
 
@@ -131,7 +138,7 @@ export default function SymptomsRequiredUpdate() {
         const newPatients = [patients];
         newPatients[0] = editedPatient;
         setPatients(newPatients);
-        updateRequiredSymptoms(newPatients[0], patientEmail).then();
+        updateRequiredSymptoms(newPatients[0], patientEmail).then(() => redirectProfile());
 
     };
 
@@ -240,6 +247,7 @@ export default function SymptomsRequiredUpdate() {
                                         type="button"
                                         fullWidth={true}
                                         variant="contained"
+                                        onClick={redirectProfile}
                                     >
                                         Cancel
                                     </Button>

diff --git a/src/components/Dashboard/CommonTabs/patientListTable.js b/src/components/Dashboard/CommonTabs/patientListTable.js
@@ -185,13 +185,10 @@ export default function PatientListTable() {
     const emptyRows =
         page > 0 ? Math.max(0, (1 + page) * rowsPerPage - data.length) : 0;
 
-    const profileLink = (email, e) => {
+    const profileLink = (email) => {
         let url = email.split("@")
-        e.target.reset();
-        navigate({
-            pathname:  "/profile/" + url[0],
-            state: email,
-    })};
+        return ("/profile/" + url[0]);
+    };
 
 
     return (

diff --git a/src/components/UserProfile/PatientProfile/PatientProfilePage.js b/src/components/UserProfile/PatientProfile/PatientProfilePage.js
@@ -58,10 +58,9 @@ class PatientProfilePage extends React.Component {
     }
 
    redirectSymptomsRequired() {
-       const userEmail = JSON.parse(localStorage.getItem("email"));
-       const urlToFetch = userEmail.split("@")[0]
-       alert(urlToFetch)
-       window.location = "/update-required-symptoms/" + urlToFetch
+       const user = window.location.href.split("/")[4];
+
+       window.location = "/update-required-symptoms/" + user
    }
 
     scheduleRedirect() {
@@ -238,11 +237,11 @@ class PatientProfilePage extends React.Component {
                             </Box>
 
                             <Box className="button" sx={{pt: 5}}>
-                                {/*{JSON.parse(localStorage.getItem("type")) !== "patient" ?*/}
+                                {JSON.parse(localStorage.getItem("type")) !== "patient" ?
                                     <Button
                                         variant="contained"
                                         name="update-required-symptoms"
-                                        onClick={this.redirectSymptomsRequired}>Update required Symptoms</Button> {/* : <></> *}*/}
+                                        onClick={this.redirectSymptomsRequired}>Update required Symptoms</Button>  : <></> }
                             </Box>