Generic name

diff --git a/inventory.py b/inventory.py
index 1476d5e6f1c01bf00ec52151bffc49ae2d73cd02..efa7363317b68e37614201636aba3a4a9424c2cb 100644 (file)
--- a/inventory.py
+++ b/inventory.py
@@ -7,7 +7,7 @@
 
 def create(cursor, data):
     try:
-        cursor.execute("INSERT INTO inventory (mid, vaccine, dose, dpv, route, batch, doe, available, data) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", (data["mid"], data["vaccine"], data["dose"], data["dpv"], data["route"], data["batch"], data["doe"], "", ""))
+        cursor.execute("INSERT INTO inventory (mid, vaccine, altname, dose, dpv, route, batch, doe, available, data) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", (data["mid"], data["vaccine"], data["altname"], data["dose"], data["dpv"], data["route"], data["batch"], data["doe"], "", ""))
         if(cursor.rowcount==0):
             return (False, "Failed to create record.")
         else:
@@ -28,7 +28,7 @@ def read(cursor, iid):
 
 def update(cursor, iid, data):
     try:
-        cursor.execute("UPDATE inventory SET vaccine=?, dose=?, dpv=?, route=?, batch=?, doe=?, available=? WHERE iid=?", (data["vaccine"], data["dose"], data["dpv"], data["route"], data["batch"], data["doe"], "", iid))
+        cursor.execute("UPDATE inventory SET vaccine=?, altname=?, dose=?, dpv=?, route=?, batch=?, doe=?, available=? WHERE iid=?", (data["vaccine"], data["altname"], data["dose"], data["dpv"], data["route"], data["batch"], data["doe"], "", iid))
         if(cursor.rowcount==0):
             return (False, "Failed to update record.")
         else:

diff --git a/templates/inventory-edit.html b/templates/inventory-edit.html
index d61aae5966e87fb407fa129ad4311a3bf38519cd..06c5ab290119a69206567696ead27248d456c3a6 100644 (file)
--- a/templates/inventory-edit.html
+++ b/templates/inventory-edit.html
@@ -21,6 +21,12 @@ You should have received a copy of the GNU General Public License along with Lib
         <input name="vaccine" placeholder="Name of the vaccine" required class="form-control" value="{{data["vaccine"]}}">
       </div>
     </div>
+    <div class="mb-2 row">
+      <label class="form-label col-sm-3">Generic</label>
+      <div class="col-sm-9">
+        <input name="altname" placeholder="Generic name" required class="form-control" value="{{data["altname"]}}">
+      </div>
+    </div>
     <div class="mb-2 row">
       <label class="form-label col-sm-3">Dose</label>
       <div class="col-sm-9">

diff --git a/templates/inventory-view.html b/templates/inventory-view.html
index 78c8eca00db9128ab9adb3f32d1761a4a3661486..4e72d80414b6067c351b8d1c865dae7a24e3d0e3 100644 (file)
--- a/templates/inventory-view.html
+++ b/templates/inventory-view.html
@@ -31,12 +31,13 @@ You should have received a copy of the GNU General Public License along with Lib
 
   <!-- VIEW -->
   <table class="table">
-    <tr><th>Vaccine</th><td>{{data["vaccine"]}}</td>
-      <tr><th>Dose</th><td>{{data["dose"]}}</td>
-        <tr><th>Dose per Vial</th><td>{{data["dpv"]}}</td>
-          <tr><th>Route of Administration</th><td>{{data["route"]}}</td>
-            <tr><th>Batch Number</th><td>{{data["batch"]}}</td>
-              <tr><th>Date of Expiry</th><td>{{data["doe"]}}</td>
+    <tr><th>Vaccine</th><td>{{data["vaccine"]}}</td></tr>
+    <tr><th>Generic</th><td>{{data["altname"]}}</td></tr>
+    <tr><th>Dose</th><td>{{data["dose"]}}</td></tr>
+    <tr><th>Dose per Vial</th><td>{{data["dpv"]}}</td></tr>
+    <tr><th>Route of Administration</th><td>{{data["route"]}}</td></tr>
+    <tr><th>Batch Number</th><td>{{data["batch"]}}</td></tr>
+    <tr><th>Date of Expiry</th><td>{{data["doe"]}}</td></tr>
   </table>
   <a href="/inventory/edit/{{data["iid"]}}" class="btn btn-primary">Edit</a>
   <a href="/delete/inventory/{{data["iid"]}}" class="btn btn-danger delete-link">Delete</a>