From d42fc35983a12375554b00c373ddd42ee984dbd3 Mon Sep 17 00:00:00 2001
From: Daniel Rahamim <drahamim@users.noreply.github.com>
Date: Fri, 24 Feb 2023 22:15:38 -0800
Subject: [PATCH] feat: history buttons for assets and staff (#31)

* feat: history buttons for assets and staff

* style: formatting app.py
---
 src/invenflask/app.py                        | 23 ++++-
 src/invenflask/templates/single_history.html | 94 ++++++++++++++++++++
 src/invenflask/templates/staff.html          |  4 +
 src/invenflask/templates/status.html         |  3 +
 4 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 src/invenflask/templates/single_history.html

diff --git a/src/invenflask/app.py b/src/invenflask/app.py
index ac0068d..bb5a068 100644
--- a/src/invenflask/app.py
+++ b/src/invenflask/app.py
@@ -346,7 +346,7 @@ def checkin():
                             ('Available', asset_id))
                 conn.commit()
                 flash('Asset checkin Completed')
-                return redirect(url_for('checkout'))
+                return redirect(url_for('checkin'))
             except sqlite3.IntegrityError as e:
                 flash(f"{e}")
                 return redirect(url_for('checkin'))
@@ -464,3 +464,24 @@ def parseCSV_staff(
             flash("Asset upload failed import")
             return redirect(url_for('create_asset'))
     return redirect(url_for('status'))
+
+
+@app.route('/single_history/<rq_type>/<item_id>')
+def single_history(rq_type, item_id):
+
+    if rq_type == 'asset':
+        conn = get_db()
+        current = conn.execute(
+            'select * from checkouts where assetid = ?', (item_id,))
+        history = conn.execute(
+            'select * from history where assetid = ?', (item_id,))
+        conn.commit()
+    if rq_type == 'staff':
+        conn = get_db()
+        current = conn.execute(
+            'select * from checkouts where staffid = ?', (item_id,))
+        history = conn.execute(
+            'select * from history where staffid = ?', (item_id,))
+        conn.commit()
+    return render_template('single_history.html', hist_type=rq_type,
+                           current=current, history=history)
diff --git a/src/invenflask/templates/single_history.html b/src/invenflask/templates/single_history.html
new file mode 100644
index 0000000..b60f373
--- /dev/null
+++ b/src/invenflask/templates/single_history.html
@@ -0,0 +1,94 @@
+{% extends 'base.html' %}
+
+{% block content %}
+{% if hist_type == 'staff' %}
+<h1>Staff History</h1>
+<label></label>
+<table id="current" class="table table-striped">
+  <thead>
+    <tr>
+      <th>Asset ID</th>
+      <th>Time Stamp</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for item in current %}
+    <tr>
+      <td>{{ item.assetid }}</td>
+      <td>{{ item.timestamp }}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<label>History</label>
+<table id="history" class="table table-striped">
+  <thead>
+    <tr>
+      <th>Asset ID</th>
+      <th>Check Out</th>
+      <th>Check In</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for item in history %}
+    <tr>
+      <td>{{ item.assetid }}</td>
+      <td>{{ item.checkouttime }}</td>
+      <td>{{ item.returntime }}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+{% else %}
+
+<h1> Asset History </h1>
+<label>Current</label>
+<table id="Staff" class="table table-striped">
+  <thead>
+    <tr>
+      <th style="text-align:left">Staff ID</th>
+      <th style="text-align:left">Department</th>
+      <th style="text-align:left">Timestamp</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for item in current %}
+    <tr>
+      <td>{{ item.staffid }}</td>
+      <td>{{ item.department }}</td>
+      <td>{{ item.timestamp }}</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<label>History</label>
+<table id="history" class="table table-striped">
+  <thead>
+    <tr>
+      <th>Staff ID</th>
+      <th>Department</th>
+      <th>division</th>
+      <th>Check Out</th>
+      <th>Check In</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for item in history %}
+    <tr>
+      <td>{{ item.staffid }}</td>
+      <td>{{ item.department }}</td>
+      <td>{{ item.division }}</td>
+      <td>{{ item.checkouttime }}</td>
+      <td>{{ item.returntime }}</td>
+    </tr>
+  </tbody>
+</table>
+{% endfor %}
+
+{% endif %}
+{{ data_var|safe }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/src/invenflask/templates/staff.html b/src/invenflask/templates/staff.html
index c9f9914..9b0a23e 100644
--- a/src/invenflask/templates/staff.html
+++ b/src/invenflask/templates/staff.html
@@ -10,6 +10,8 @@
         <th style="text-align:left">Division</th>
         <th style="text-align:left">Department</th>
         <th style="text-align:left">Title</th>
+        <th style="text-align:left">Edit</th>
+        <th style="text-align:left">History</th>
       </tr>
     </thead>
     <tbody>
@@ -23,6 +25,8 @@
           <td>{{ staff.title }}</td>
           <td><button type="button" onclick="document.location.href='/staff/edit/{{staff.id}}'">Edit</button>
           </td>
+          <td><button type="button" onclick="document.location.href='/single_history/staff/{{staff.id}}'">History</button>
+          </td>
         </tr>
       {% endfor %}
     </tbody>
diff --git a/src/invenflask/templates/status.html b/src/invenflask/templates/status.html
index 0ec8371..3785844 100644
--- a/src/invenflask/templates/status.html
+++ b/src/invenflask/templates/status.html
@@ -8,6 +8,7 @@
         <th>Type</th>
         <th>Status</th>
         <th>Edit</th>
+        <th>History</th>
       </tr>
     </thead>
     <tbody>
@@ -18,6 +19,8 @@
           <td>{{ asset.asset_status }}</td>
           <td><button type="button" onclick="document.location.href='/{{asset.id}}/edit/'">Edit</button>
           </td>
+          <td><button type="button" onclick="document.location.href='/single_history/asset/{{asset.id}}'">History</button>
+          </td>
         </tr>
       {% endfor %}
     </tbody>