Merge branch 'feature/audit-icons'

This commit is contained in:
Paul Brinkmeier 2023-12-13 13:38:56 +01:00
commit 61cf7696a5
3 changed files with 22 additions and 0 deletions

View File

@ -58,3 +58,19 @@ FROM garfield.inventory_items
) m USING (item_id) ) m USING (item_id)
ORDER BY inventory_items.name; ORDER BY inventory_items.name;
-- How many *other* active inventory lines exist with the same barcode in the same location that are newer?
CREATE TEMPORARY VIEW more_recent_inventory_lines_with_same_barcode AS
SELECT
a.item_id,
-- It's important not to count(*) here because item_id is NULL
-- when no other inventory lines exist.
count(b.item_id) AS other_lines_count
FROM garfield.inventory_items AS a
LEFT JOIN garfield.inventory_items AS b
ON a.item_barcode = b.item_barcode
AND a.item_id != b.item_id
AND a.location = b.location
AND b.available
AND b.bought > a.bought
GROUP BY a.item_id;

View File

@ -1,6 +1,7 @@
SELECT SELECT
* *
FROM all_inventory_item_overview FROM all_inventory_item_overview
LEFT JOIN more_recent_inventory_lines_with_same_barcode USING (item_id)
WHERE (%(location_id)s IS NULL OR location = %(location_id)s) WHERE (%(location_id)s IS NULL OR location = %(location_id)s)
AND available AND available
ORDER BY ORDER BY

View File

@ -3,6 +3,7 @@
{% block content %} {% block content %}
<table> <table>
<tr> <tr>
<th>Stat</th>
<th>ID</th> <th>ID</th>
<th>Barcode</th> <th>Barcode</th>
<th>Name</th> <th>Name</th>
@ -17,6 +18,10 @@
</tr> </tr>
{% for item in items %} {% for item in items %}
<tr> <tr>
<td>
{% if item.units_left == 0 %}<span title="Leerer aktiver Inventareintrag">🅾️</span>{% endif %}
{% if item.other_lines_count != 0 %}<span title="{% if item.other_lines_count == 1 %}Neuerer Eintrag mit demselben Barcode ist aktiv{% else %}{{ item.other_lines_count }} Einträge mit demselben Barcode sind aktiv{% endif %}">🔄</span>{% endif %}
</td>
<td><a href="/inventory/item/{{ item.item_id }}">{{ item.item_id }}</a></td> <td><a href="/inventory/item/{{ item.item_id }}">{{ item.item_id }}</a></td>
<td><code>{{ item.item_barcode }}</code></td> <td><code>{{ item.item_barcode }}</code></td>
<td>{{ item.name }}</td> <td>{{ item.name }}</td>