fix: Add item details to individual summary page (#33)

* fix: Add item details to individual summary page * refactor: remove useless print statement
drahamim · Feb 25, 2023 · dfb9371 · dfb9371
1 parent 0f3d347
commit dfb9371
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/src/invenflask/app.py b/src/invenflask/app.py
@@ -473,17 +473,19 @@ def single_history(rq_type, item_id):
 
     if rq_type == 'asset':
         conn = get_db()
+        item_info = get_asset(item_id, 'edit')
         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':
+        item_info = get_staff(item_id)
         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)
+                           current=current, history=history, item_info=item_info)
diff --git a/src/invenflask/templates/single_history.html b/src/invenflask/templates/single_history.html
@@ -3,7 +3,31 @@
 {% block content %}
 {% if hist_type == 'staff' %}
 <h1>Staff History</h1>
-<label></label>
+
+<table id="Staff" class="table table-striped">
+  <thead>
+    <tr>
+      <th style="text-align:left">First Name</th>
+      <th style="text-align:left">Last Name</th>
+      <th style="text-align:left">Staff ID</th>
+      <th style="text-align:left">Division</th>
+      <th style="text-align:left">Department</th>
+      <th style="text-align:left">Title</th>
+    </tr>
+  </thead>
+  <tbody>
+      <tr>
+        <td>{{ item_info.first_name }}</td>
+        <td>{{ item_info.last_name }}</td>
+        <td>{{ item_info.id }}</td>
+        <td>{{ item_info.division }}</td>
+        <td>{{ item_info.department }}</td>
+        <td>{{ item_info.title }}</td>
+      </tr>
+  </tbody>
+</table>
+
+<h4>Current Assets</h4>
 <table id="current" class="table table-striped">
   <thead>
     <tr>
@@ -21,7 +45,7 @@ <h1>Staff History</h1>
   </tbody>
 </table>
 
-<label>History</label>
+<h4>History</h4>
 <table id="history" class="table table-striped">
   <thead>
     <tr>
@@ -41,9 +65,27 @@ <h1>Staff History</h1>
   </tbody>
 </table>
 
+
 {% else %}
 
+
 <h1> Asset History </h1>
+<table id="Assets" class="table table-striped">
+  <thead>
+    <tr>
+      <th>Radio ID</th>
+      <th>Type</th>
+      <th>Status</th>
+    </tr>
+  </thead>
+  <tbody>
+      <tr>
+        <td>{{ item_info.id }}</td>
+        <td>{{ item_info.asset_type }}</td>
+        <td>{{ item_info.asset_status }}</td>
+      </tr>
+  </tbody>
+</table>
 <label>Current</label>
 <table id="Staff" class="table table-striped">
   <thead>