From 24e1e0402015b13b4f19ae782c8a59d37ef2a844 Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Fri, 12 Jan 2024 01:26:56 +0530
Subject: [PATCH] Show patient in vaccination edit

---
 librevax.py                     | 14 ++++++++++----
 templates/vaccination-edit.html |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/librevax.py b/librevax.py
index ab1420f..988c8e8 100644
--- 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 fd1f58c..e029588 100644
--- 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">
-- 
2.39.5