Grey out unavailable vaccines

diff --git a/inventory.py b/inventory.py
index 0d4b0d31547ea133f71bdd56669f9729b7cd9844..a4ce7dcff17728cda169ae0283c752836c1e18a7 100644 (file)
--- a/inventory.py
+++ b/inventory.py
@@ -49,7 +49,7 @@ def delete(cursor, iid):
 def list(cursor, mid, all=False):
     try:
         if(all):
-            result=cursor.execute("SELECT * FROM inventory WHERE mid=?", (mid,))
+            result=cursor.execute("SELECT * FROM inventory WHERE mid=? ORDER BY available DESC", (mid,))
         else:
             result=cursor.execute("SELECT * FROM inventory WHERE mid=? AND available=?", (mid, True))
         if(cursor.rowcount==0):

diff --git a/templates/inventory-view.html b/templates/inventory-view.html
index 3741dceb053dc6f462ad289b93c1022e88ab04f6..5192513f3d992b66e8688f06c05d5f8b2250a344 100644 (file)
--- a/templates/inventory-view.html
+++ b/templates/inventory-view.html
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with Lib
   <table class="table">
     <tr><th>Vaccine</th><th>Batch</th><th>Date of Expiry</th></tr>
     {% for rec in data %}
-    <tr><td><a href="/inventory/view/{{rec["iid"]}}">{{rec["vaccine"]}}</a></td><td><a href="/inventory/view/{{rec["iid"]}}">{{rec["batch"]}}</a></td><td><a href="/inventory/view/{{rec["iid"]}}">{{rec["doe"]}}</a></td></tr>
+    <tr><td><a href="/inventory/view/{{rec["iid"]}}" {%if not rec["available"]%}class="text-muted"{%endif%}>{{rec["vaccine"]}}</a></td><td><a href="/inventory/view/{{rec["iid"]}}" {%if not rec["available"]%}class="text-muted"{%endif%}>{{rec["batch"]}}</a></td><td><a href="/inventory/view/{{rec["iid"]}}" {%if not rec["available"]%}class="text-muted"{%endif%}>{{rec["doe"]}}</a></td></tr>
     {% endfor %}
   </table>
   <a href="/inventory/new/{{g.mid}}" class="btn btn-outline-primary">Add Inventory</a>