Administered vaccine in balance

diff --git a/librevax.py b/librevax.py
index 1d623b344e15d0060ab15594ff38d94b7f28821f..53c765cf81afe3b7558070f8b3cf784a6ae790fe 100644 (file)
--- 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 d99581ed54440a248f3e7173ffc3ecb37eefa976..9e793527c32b586097b1bf098def5b2b176bf417 100644 (file)
--- 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>