Last Page

app.py

@@ -7,7 +7,7 @@
 import csv as csv
 from csv import writer
 from flask import request
-from flask import Flask, render_template, Blueprint
+from flask import Flask, render_template, Blueprint,redirect, url_for
 hosp=pd.read_csv('static/Database/hospitals.csv')
 
 app=Flask(__name__)
@@ -86,7 +86,9 @@ def UpdateDatabase():
 
     return result
 
-@app.route('/OrganRequest', methods=['POST'])
+orderedlist = []
+sortdist = []
+@app.route('/OrganRequest', methods=['POST','GET'])
 def OrganRequest():
     output = request.get_json()
     print(output) # This is the output that was stored in the JSON within the browser
@@ -98,18 +100,19 @@ def OrganRequest():
     sourcee=result['HospitalIndex']
     organname=result['OrganName']
 
-    orderedlist, sortdist=main.shortestsorting(int(sourcee), organname)
+    orderedlists, sortdists=main.shortestsorting(int(sourcee), organname)
+    orderedlist.append(orderedlists)
+    sortdist.append(str(sortdists))
     print(orderedlist, sortdist)
     return result
 
 @app.route('/NearestHospital')
 def NearestHospital():
-
-    return render_template('Nearesthospital.html')
+    return render_template('Nearesthospital.html',OrderedList=orderedlist,SortList=sortdist)
 
 
 
 if __name__ == "__main__":
-    app.run(debug=True)
+    app.run(debug=False)
 
 

static/Database/hospitals.csv

@@ -1,6 +1,6 @@
 Index,Hospital_Name,Password,Email,cornea,heart,kidney,liver,lung,pancreas
 0,malin,psword,malinhosp@gmail.com,0,3,0,3,1,0
-1,aspatre,helloworld,aspatrehosp@gmail.com,0,3,0,0,0,3
-2,lazarett,savlives,lazaretthosp@gmail.com,1,10,2,0,0,0
-3,ospedale,iloquis,ospedalehosp@gmail.com,0,0,3,4,6,0
+1,aspatre,helloworld,aspatrehosp@gmail.com,0,0,0,9,10,1
+2,lazarett,savlives,lazaretthosp@gmail.com,0,0,0,0,0,0
+3,ospedale,iloquis,ospedalehosp@gmail.com,0,0,0,3,6,0
 4,ziekenhuis,medsch,ziekenhuishosp@gmail.com,0,0,0,0,0,0

static/JavaScript/NearesHospital.js

@@ -1,8 +1,26 @@
-var ListofNearbyHospital = ['malin','aspatre','lazarett','ospedale','ziekenhuis'];
-var ListOfDistance = [20,12,123,121,12];
+var ListofNearbyHospital = [];
+var ListOfDistance = [];
+
+
+
+
+
+
+
 const Hospitals = document.getElementById("Hospitals");
 function AddHospitals() {
-   for (let index = 0; index < ListOfDistance.length; index++) {
+    OrderedList.forEach(Hos=>{
+        if (Hos[0] != undefined) {
+            ListofNearbyHospital.push(Hos[0]);
+        }
+    });
+    SortList.forEach(Hos=>{
+        if (Hos != undefined) {
+            ListOfDistance.push(Hos[1]);
+        }
+    });
+    console.log(ListofNearbyHospital.length);
+    for (let index = 0; index < ListofNearbyHospital.length; index++) {
         var div = document.createElement("div");
         div.setAttribute("class","card");
         Hospitals.appendChild(div);
@@ -16,9 +34,9 @@ function AddHospitals() {
         i.setAttribute("class","fa-solid fa-hospital");
         div.appendChild(i);
         var h3 = document.createElement("h3");
-        h3.innerHTML="Hospital Name : <br>"+ListofNearbyHospital[index]+"<br><br><br>Distance: "+ListOfDistance[index];
+        h3.innerHTML="Hospital Name <br>"+ListofNearbyHospital[index]+"<br><br><br>Distance: "+ListOfDistance[index]+" Km";
         div.appendChild(h3);
-   }
+    }
 
    const cards = document.querySelectorAll(".card");
    const popup = document.getElementById("popup");

static/JavaScript/SelectOrgan.js

@@ -37,19 +37,3 @@ function getCookie(cname) {
     }
     return "";
   }
-
-var Cards = document.querySelectorAll(".card");
-Cards.forEach(card=>{
-    card.addEventListener("click",()=>{
-    let HospitalIndex = getCookie("User");
-    let OrganName = card.classList[1];
-    console.log(OrganName);
-    const dict_values = {OrganName,HospitalIndex} //Pass the javascript variables to a dictionary.
-    const s = JSON.stringify(dict_values); // Stringify converts a JavaScript object or value to a JSON string
-    $.ajax({
-        url:"/OrganRequest",
-        type:"POST",
-        contentType: "application/json",
-        data: JSON.stringify(s)});
-    });
-});

tempCodeRunnerFile.py

@@ -1 +1 @@
-Request
+OrderedList

templates/Nearesthospital.html

@@ -6,6 +6,12 @@
     <title>Transparent card</title>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
         <script src="https://kit.fontawesome.com/36bed4b74a.js" crossorigin="anonymous"></script>
+        <script>
+          var OrderedList = {{OrderedList|tojson}};
+          console.log(OrderedList);
+          var SortList = {{SortList|tojson}};
+          console.log(SortList);
+        </script>
     <link href="../static/css/NearestHospital.css" rel="stylesheet">
 
   </head>

templates/Select_Organ.html

@@ -1,20 +1,40 @@
 <!DOCTYPE html>
 <html>
   <head>
-
-    <script src="https://kit.fontawesome.com/36bed4b74a.js" crossorigin="anonymous"></script>
+    <script
+      src="https://kit.fontawesome.com/36bed4b74a.js"
+      crossorigin="anonymous"
+    ></script>
     <title>SElect Organ</title>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
-    <script src="../static/JavaScript/SelectOrgan.js" defer></script>
-    <link href="../static/css/Select_Organ.css" rel="stylesheet">
-
+    <link href="../static/css/Select_Organ.css" rel="stylesheet" />
   </head>
   <body>
     <section>
       <h1>Select Required Organ</h1>
-      <div class="container" id="Organ_Select_List">
-
-      </div>
+      <div class="container" id="Organ_Select_List"></div>
     </section>
+    <script src="../static/JavaScript/SelectOrgan.js"></script>
+    <script>
+      var Cards = document.querySelectorAll(".card");
+      Cards.forEach((card) => {
+        card.addEventListener("click", () => {
+          let HospitalIndex = getCookie("User");
+          let OrganName = card.classList[1];
+          console.log(OrganName);
+          const dict_values = { OrganName, HospitalIndex }; //Pass the javascript variables to a dictionary.
+          const s = JSON.stringify(dict_values); // Stringify converts a JavaScript object or value to a JSON string
+          $.ajax({
+            url: "/OrganRequest",
+            type: "POST",
+            contentType: "application/json",
+            data: JSON.stringify(s),
+            success: function(){
+                window.location.href = "{{url_for('NearestHospital')}}";
+            }
+          });
+        });
+      });
+    </script>
   </body>
 </html>