Vaccination log in transaction view

diff --git a/librevax.py b/librevax.py
index 53c765cf81afe3b7558070f8b3cf784a6ae790fe..9967b59d7cba2dded9a7f80660d31706eca7ce50 100644 (file)
--- a/librevax.py
+++ b/librevax.py
@@ -330,13 +330,13 @@ def transaction_view(action, id=None):
                 usage=0
                 for used in administered:
                     usage=usage+int(float(used["dosage"]))
-                balance=usage
+                balance=0-usage
                 for entry in data:
                     if(entry["action"]=="IN"):
                         balance=balance+int(float(entry["target"]))
                     elif(entry["action"]=="OUT"):
                         balance=balance-int(float(entry["target"]))
-                return render_template("transaction-view.html", data=data, item=item, usage=usage, balance=balance, action=action)
+                return render_template("transaction-view.html", data=data, item=item, administered=administered, usage=usage, balance=balance, action=action)
             else:
                 raise Exception("Invalid parameter")
         elif(action=="view"):

diff --git a/templates/transaction-view.html b/templates/transaction-view.html
index 9e793527c32b586097b1bf098def5b2b176bf417..1db1733ad89f577abad5b5d845b9ab31c8e3198f 100644 (file)
--- a/templates/transaction-view.html
+++ b/templates/transaction-view.html
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with Lib
   <!-- LIST -->
 
   <div class="row">
-    <div class="col-sm-10"><h2>{{item["vaccine"]}}</h2></div>
+    <div class="col-sm-10"><h2>{{item["vaccine"]}} ({{item["batch"]}})</h2></div>
     <div class="col-sm-2 d-grid"><a href="/transaction/new/{{item["iid"]}}" class="btn btn-outline-primary">Add Transaction</a></div>
   </div>
   <hr>
@@ -30,6 +30,15 @@ You should have received a copy of the GNU General Public License along with Lib
     <tr><th>Administered</th><td></td><td>{{usage}}</td></tr>
     <tr><th>Balance</th><td></td><td>{{balance}}</td></tr>
   </table>
+  <hr>
+  <h3>Vaccination Record</h3>
+  <table class="table">
+    <tr><th>Date</th><th>Patient</th><th>Dosage</th></tr>
+    {% for rec in administered %}
+    <tr><td>{{rec["date"]|format_date}}</td><td><a href="/patient/view/{{rec["pid"]}}">{{rec["name"]}}</a></td><td>{{rec["dosage"]}}</tr>
+    {% endfor %}
+  </table>
+
 
   {% endif %}
 

diff --git a/vaccination.py b/vaccination.py
index e4ca7790104d17d9567657e8c5c5a3d581af6efe..aaf4ceb76a58d086ae20131636cbdda6b21162c0 100644 (file)
--- a/vaccination.py
+++ b/vaccination.py
@@ -57,7 +57,7 @@ def list_by_patient(cursor, pid):
 
 def list_by_inventory(cursor, iid):
     try:
-        result=cursor.execute("SELECT * FROM vaccination WHERE iid=?", (iid,))
+        result=cursor.execute("SELECT * FROM vaccination LEFT JOIN patients ON vaccination.pid=patients.pid WHERE iid=?", (iid,))
         if(cursor.rowcount==0):
             return (False, "Record not found.")
         else: