From a6abe36877d834d66308e58bc963f6a10ea347e2 Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Wed, 6 Mar 2024 01:49:23 +0530
Subject: [PATCH] Administered vaccine in balance

---
 librevax.py                     | 10 ++++++++--
 templates/transaction-view.html |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/librevax.py b/librevax.py
index 1d623b3..53c765c 100644
--- a/librevax.py
+++ b/librevax.py
@@ -324,13 +324,19 @@ def transaction_view(action, id=None):
                 (ok, item)=inventory.read(cursor, id)
                 if(not ok):
                     raise Exception(item)
-                balance=0
+                (ok, administered)=vaccination.list_by_inventory(cursor, id)
+                if(not ok):
+                    raise Exception(administered)
+                usage=0
+                for used in administered:
+                    usage=usage+int(float(used["dosage"]))
+                balance=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, balance=balance, action=action)
+                return render_template("transaction-view.html", data=data, item=item, 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 d99581e..9e79352 100644
--- a/templates/transaction-view.html
+++ b/templates/transaction-view.html
@@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License along with Lib
     {% for rec in data %}
     <tr><td><a href="/transaction/view/{{rec["tid"]}}">{{rec["date"]|format_date}}</a></td><td><a href="/transaction/view/{{rec["tid"]}}">{{rec["action"]}}</a></td><td><a href="/transaction/view/{{rec["tid"]}}">{{rec["target"]}}</a></td></tr>
     {% endfor %}
+    <tr><th>Administered</th><td></td><td>{{usage}}</td></tr>
     <tr><th>Balance</th><td></td><td>{{balance}}</td></tr>
   </table>
 
-- 
2.39.5