Show patient in vaccination edit

diff --git a/librevax.py b/librevax.py
index ab1420fc75d8bf1c166d314e19bc948ed1f126e1..988c8e8a98049d6d0233fb73370a37ecadf6c772 100644 (file)
--- a/librevax.py
+++ b/librevax.py
@@ -445,10 +445,10 @@ def vaccination_view(action, id=None):
                     raise Exception(data)
                 (ok, inv)=inventory.read(cursor, data["iid"])
                 if(not ok):
-                    raise Exception(inventory)
+                    raise Exception(inv)
                 (ok, pat)=patient.read(cursor, data["pid"])
                 if(not ok):
-                    raise Exception(patient)
+                    raise Exception(pat)
                 (ok, consultant)=personnel.read(cursor, data["consultant"])
                 if(not ok):
                     raise Exception(consultant)
@@ -472,7 +472,10 @@ def vaccination_view(action, id=None):
                 (ok, vaccinator)=personnel.list(cursor, g.mid, "vaccinator")
                 if(not ok):
                     raise Exception(vaccinator)
-                return render_template("vaccination-edit.html", data=data, inventory=inv, consultant=consultant, vaccinator=vaccinator, action=action)
+                (ok, pat)=patient.read(cursor, data["pid"])
+                if(not ok):
+                    raise Exception(pat)
+                return render_template("vaccination-edit.html", data=data, inventory=inv, consultant=consultant, vaccinator=vaccinator, patient=pat, action=action)
             else:
                 raise Exception("Invalid parameter")
         elif(action=="new"):
@@ -486,10 +489,13 @@ def vaccination_view(action, id=None):
                 (ok, vaccinator)=personnel.list(cursor, g.mid, "vaccinator")
                 if(not ok):
                     raise Exception(vaccinator)
+                (ok, pat)=patient.read(cursor, id)
+                if(not ok):
+                    raise Exception(pat)
                 data={"pid": id, "date":datetime.now().strftime("%Y-%m-%dT%H:%M:%S")}
                 if(len(inv)<=0):
                     raise Exception("Please add a vaccine to inventory before vaccination.")
-                return render_template("vaccination-edit.html", data=data, inventory=inv, consultant=consultant, vaccinator=vaccinator, action=action)
+                return render_template("vaccination-edit.html", data=data, inventory=inv, consultant=consultant, vaccinator=vaccinator, patient=pat, action=action)
             else:
                 raise Exception("Invalid parameter")
     except Exception as e:

diff --git a/templates/vaccination-edit.html b/templates/vaccination-edit.html
index fd1f58c19cf243b0a0664e05b792156cc705e95c..e0295884e6f77984ce2026e9b502ea5f7c0edd4c 100644 (file)
--- a/templates/vaccination-edit.html
+++ b/templates/vaccination-edit.html
@@ -13,6 +13,9 @@ You should have received a copy of the GNU General Public License along with Lib
 {% block content %}
 
 <div class="content">
+  <table class="table">
+    <tr><td>Patient</td><td>{{patient["name"]}} ({{patient["cid"]}})</td></tr>
+  </table>
   <form method="post">
     <input type="hidden" name="pid" value="{{data["pid"]}}">
     <div class="mb-2 row">