Show both vial and dosage in transaction

diff --git a/librevax.py b/librevax.py
index d5ea3b8db7e409162337c3cfc4200f47fec7a066..a32897005e1700b3807f289c2fc5fe886ad48cc1 100644 (file)
--- a/librevax.py
+++ b/librevax.py
@@ -327,16 +327,16 @@ def transaction_view(action, id=None):
                 (ok, administered)=vaccination.list_by_inventory(cursor, id)
                 if(not ok):
                     raise Exception(administered)
-                usage=0
+                usedDosage=0
                 for used in administered:
-                    usage=usage+int(float(used["dosage"]))
-                balance=0-usage
+                    usedDosage=usedDosage+int(float(used["dosage"]))
+                stockVial=0
                 for entry in data:
                     if(entry["action"]=="IN"):
-                        balance=balance+int(float(entry["target"]))
+                        stockVial=stockVial+int(float(entry["target"]))
                     elif(entry["action"]=="OUT"):
-                        balance=balance-int(float(entry["target"]))
-                return render_template("transaction-view.html", data=data, item=item, administered=administered, usage=usage, balance=balance, action=action)
+                        stockVial=stockVial-int(float(entry["target"]))
+                return render_template("transaction-view.html", data=data, item=item, administered=administered, usage=usedDosage, stock=stockVial, action=action)
             else:
                 raise Exception("Invalid parameter")
         elif(action=="view"):

diff --git a/templates/transaction-view.html b/templates/transaction-view.html
index 982e070456c59d6e2f0aa80f1c9ade99c905f590..09fd07d9668e213ebfcc52ebd351044c3ba32f0c 100644 (file)
--- a/templates/transaction-view.html
+++ b/templates/transaction-view.html
@@ -23,12 +23,12 @@ You should have received a copy of the GNU General Public License along with Lib
   </div>
   <hr>
   <table class="table">
-    <tr><th>Date</th><th>Type</th><th>Amount</th></tr>
+    <tr><th>Date</th><th>Type</th><th>Vial</th><th>Dosage</th></tr>
     {% 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>
+    <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><td><a href="/transaction/view/{{rec["tid"]}}">{{(rec["target"]|float*item["dpv"]|float)|int}}</a></td></tr>
     {% endfor %}
-    <tr><th>Administered</th><td></td><td>{{usage}}</td></tr>
-    <tr><th>Balance</th><td></td><td>{{balance}}</td></tr>
+    <tr><th>Administered</th><td></td><td>{{usage|float/item["dpv"]|float}}</td><td>{{usage}}</td></tr>
+    <tr><th>Balance</th><td></td><td>{{stock|float-(usage|float/item["dpv"]|float)}}</td><td>{{(stock|float*item["dpv"]|float)-usage|float}}</td></tr>
   </table>
   <hr>
   <h3>Vaccination Record</h3>