fix: Checkin failed to mark assets available (#34)

drahamim · Feb 25, 2023 · 444ed71 · 444ed71
1 parent dfb9371
commit 444ed71
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/src/invenflask/app.py b/src/invenflask/app.py
@@ -337,15 +337,16 @@ def checkin():
                      asset_checkout['timestamp']))
                 conn.execute(
                     'DELETE from checkouts WHERE assetid = ?', (asset_id,))
-                if get_asset(asset_id, 'edit') is dict:
-                    if get_asset(asset_id, "edit")['asset_status'] == "damaged":
-                        conn.execute(
-                            'UPDATE assets SET asset_status = ? WHERE id = ?',
-                            ('damaged', asset_id))
-                    else:
-                        conn.execute(
-                            'UPDATE assets SET asset_status = ? WHERE id = ?',
-                            ('Available', asset_id))
+                if get_asset(asset_id, "edit")['asset_status'] == "damaged":
+                    conn.execute(
+                        'UPDATE assets SET asset_status = ? WHERE id = ?',
+                        ('damaged', asset_id,))
+                    print(f'Checkin damaged {asset_id}')
+                else:
+                    conn.execute(
+                        'UPDATE assets SET asset_status = ? WHERE id = ?',
+                        ('Available', asset_id,))
+                    print(f'Checkin {asset_id} as Available')
                 conn.commit()
                 flash('Asset checkin Completed')
                 return redirect(url_for('checkin'))

diff --git a/src/invenflask/templates/create_asset.html b/src/invenflask/templates/create_asset.html
@@ -24,10 +24,10 @@ <h1>{% block title %} Create Asset {% endblock %}</h1>
        <label for="status">asset Status</label>
        <br>
        <select id="asset_status" name="asset_status">
-              <option value="available">Available</option>
-              <option value="good">Good</option>
-              <option value="damaged">Damaged</option>
-              <option value="checkedout">Checked Out</option>
+              <option value="Available">Available</option>
+              <option value="Good">Good</option>
+              <option value="Damaged">Damaged</option>
+              <option value="Checkedout">Checked Out</option>
        </select>
        <br>
        <button type="submit">Submit</button>

diff --git a/src/invenflask/templates/edit_asset.html b/src/invenflask/templates/edit_asset.html
@@ -17,10 +17,10 @@ <h1>{% block title %} Edit {{ asset.id }} {% endblock %}</h1>
        <label for="status">Asset Status</label>
        <br>
        <select id="asset_status" name="asset_status">
-              <option value="available">Available</option>
-              <option value="good">Good</option>
-              <option value="damaged">Damaged</option>
-              <option value="checkedout">Checked Out</option>
+              <option value="Available">Available</option>
+              <option value="Good">Good</option>
+              <option value="Damaged">Damaged</option>
+              <option value="Checkedout">Checked Out</option>
        </select>
         <br>
         <button type="submit">Submit</button>