diff --git a/inventory/routes/entry.py b/inventory/routes/entry.py
index 2f8ab7d..85ede94 100644
--- a/inventory/routes/entry.py
+++ b/inventory/routes/entry.py
@@ -85,7 +85,12 @@ def _fields_for_model(model: str):
"inventory.label",
"inventory.brand.name",
"inventory.model",
- "inventory.device_type.description"
+ "inventory.device_type.description",
+ "inventory.condition.category",
+ "work_logs.work_item",
+ "work_logs.start_time",
+ "work_logs.end_time",
+ "work_logs.complete",
]
fields_spec = [
{"name": "label", "row": "label", "label": "", "type": "display",
@@ -93,24 +98,27 @@ def _fields_for_model(model: str):
{"name": "buttons", "label": "", "row": "label", "type": "template", "template": "entry_buttons.html",
"wrap": {"class": "col-auto text-end me-2"}, "attrs": {"data-model": model}},
{"name": "last_name", "label": "Last Name", "label_attrs": {"class": "form-label"},
- "attrs": {"placeholder": "Doe", "class": "form-control"}, "row": "name", "wrap": {"class": "col-3"}},
+ "attrs": {"placeholder": "Doe", "class": "form-control"}, "row": "name", "wrap": {"class": "col"}},
{"name": "first_name", "label": "First Name", "label_attrs": {"class": "form-label"},
- "attrs": {"placeholder": "John", "class": "form-control"}, "row": "name", "wrap": {"class": "col-3"}},
+ "attrs": {"placeholder": "John", "class": "form-control"}, "row": "name", "wrap": {"class": "col"}},
{"name": "title", "label": "Title", "label_attrs": {"class": "form-label"},
"attrs": {"placeholder": "President of the Universe", "class": "form-control"},
- "row": "name", "wrap": {"class": "col-3"}},
+ "row": "name", "wrap": {"class": "col"}},
{"name": "supervisor", "label": "Supervisor", "label_attrs": {"class": "form-label"},
- "label_spec": "{label}", "row": "details", "wrap": {"class": "col-3"},
+ "label_spec": "{label}", "row": "details", "wrap": {"class": "col"},
"attrs": {"class": "form-control"}, "link": {"endpoint": "entry.entry", "params": {"id": "{supervisor.id}", "model": "user"}},
"options_params": {"active__eq": True, "staff__eq": True}},
{"name": "location", "label": "Room", "label_attrs": {"class": "form-label"},
"label_spec": "{name} - {room_function.description}",
- "row": "details", "wrap": {"class": "col-3"}, "attrs": {"class": "form-control"}},
+ "row": "details", "wrap": {"class": "col"}, "attrs": {"class": "form-control"}},
{"name": "active", "label": "Active", "label_attrs": {"class": "form-check-label"},
"row": "checkboxes", "attrs": {"class": "form-check-input"}, "wrap": {"class": "form-check"}},
{"name": "staff", "label": "Staff Member", "label_attrs": {"class": "form-check-label"},
"row": "checkboxes", "attrs": {"class": "form-check-input"}, "wrap": {"class": "form-check"}},
- {"name": "inventory", "label": "Inventory", "type": "template", "row": "inventory", "template": "user_inventory.html"},
+ {"name": "inventory", "label": "Inventory", "type": "template", "row": "inventory",
+ "template": "user_inventory.html", "wrap": {"class": "col"}},
+ {"name": "work_logs", "label": "Work Logs", "row": "inventory", "type": "template",
+ "template": "user_worklogs.html", "wrap": {"class": "col"}},
]
layout = [
{"name": "label", "order": 0, "attrs": {"class": "row align-items-center"}},
@@ -118,7 +126,7 @@ def _fields_for_model(model: str):
{"name": "details", "order": 20, "attrs": {"class": "row mt-2"}},
{"name": "checkboxes", "order": 30, "parent": "details",
"attrs": {"class": "col d-flex flex-column justify-content-end"}},
- {"name": "inventory", "order": 40},
+ {"name": "inventory", "order": 40, "attrs": {"class": "row"}},
]
elif model == "worklog":
diff --git a/inventory/templates/summary.html b/inventory/templates/summary.html
index e7833ab..25ebfca 100644
--- a/inventory/templates/summary.html
+++ b/inventory/templates/summary.html
@@ -1,17 +1,11 @@
{% extends "base.html" %}
-{% block style %}
-thead.sticky-top th {
-z-index: 2;
-}
-{% endblock %}
-
{% block main %}
Inventory Summary
-
+
| Device Type |
{% for col in col_headers %}
{% if col.href %}
diff --git a/inventory/templates/user_inventory.html b/inventory/templates/user_inventory.html
index b2d3c40..5fc3708 100644
--- a/inventory/templates/user_inventory.html
+++ b/inventory/templates/user_inventory.html
@@ -1,33 +1,33 @@
{% set inv = field['template_ctx']['values']['inventory'] %}
-
-
- {% if inv %}
-
-
- | Device |
- Brand |
- Model |
- Type |
-
-
-
- {% for i in inv %}
-
- | {{ i.label }} |
- {{ i['brand.name'] }} |
- {{ i.model }} |
- {{ i['device_type.description'] }} |
-
- {% endfor %}
-
- {% else %}
-
-
- | No data. |
-
-
- {% endif %}
-
-
\ No newline at end of file
+
+
+ {% if inv %}
+
+
+ | Device |
+ Brand |
+ Model |
+ Type |
+
+
+
+ {% for i in inv if i['condition.category'] not in ['Disposed', 'Administrative'] %}
+
+ | {{ i.label }} |
+ {{ i['brand.name'] }} |
+ {{ i.model }} |
+ {{ i['device_type.description'] }} |
+
+ {% endfor %}
+
+ {% else %}
+
+
+ | No data. |
+
+
+ {% endif %}
+
+
diff --git a/inventory/templates/user_worklogs.html b/inventory/templates/user_worklogs.html
new file mode 100644
index 0000000..a9939db
--- /dev/null
+++ b/inventory/templates/user_worklogs.html
@@ -0,0 +1,37 @@
+
+
+
+{% set wl = field['template_ctx']['values']['work_logs'] %}
+{% set check %}
+
+{% endset %}
+{% set x %}
+
+{% endset %}
+
+
+
+
+
+ | Device |
+ Start |
+ End |
+ |
+
+
+
+ {% for l in wl %}
+
+ | {{ l['work_item']['label'] if l['work_item'] else '-' }} |
+ {{ l.start_time if l.start_time else '-' }} |
+ {{ l.end_time if l.end_time else '-' }} |
+ {{ check if l.complete else x }} |
+
+ {% endfor %}
+
+
+