From 912d3fe775fe8c19d6d04ec700ef34769a8f86e5 Mon Sep 17 00:00:00 2001 From: Yaro Kasear Date: Thu, 17 Jul 2025 13:13:11 -0500 Subject: [PATCH] Refactor export link functionality in templates to streamline CSV export and enhance title generation for inventory and worklogs --- .../templates/fragments/_link_fragment.html | 10 ++------- inventory/templates/user.html | 22 +++++++++++++++++-- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/inventory/templates/fragments/_link_fragment.html b/inventory/templates/fragments/_link_fragment.html index ad36d2c..2fbfa7d 100644 --- a/inventory/templates/fragments/_link_fragment.html +++ b/inventory/templates/fragments/_link_fragment.html @@ -41,12 +41,6 @@ {% macro export_link(id, endpoint, ids) %} -{{ icons.render_icon('box-arrow-up', 12) }} - - + +{{ icons.render_icon('box-arrow-up', 12) }} {% endmacro %} \ No newline at end of file diff --git a/inventory/templates/user.html b/inventory/templates/user.html index a4b3489..7a7cac5 100644 --- a/inventory/templates/user.html +++ b/inventory/templates/user.html @@ -125,15 +125,33 @@
{% if inventory_rows %}
+ {% set id_list = inventory_rows | map(attribute='id') | list %} + {% set inventory_title %} + Assets + {{ links.export_link( + (user.full_name | lower | replace(' ', '_')) + '_user_inventory', + 'inventory', + {'ids': id_list} + ) }} + {% endset %}
- {{ tables.render_table(headers=inventory_headers, rows=inventory_rows, id='assets', entry_route='inventory_item', title='Assets', per_page=8) }} + {{ tables.render_table(headers=inventory_headers, rows=inventory_rows, id='assets', entry_route='inventory_item', title=inventory_title, per_page=8) }}
{% endif %} {% if worklog_rows %} + {% set id_list = worklog_rows | map(attribute='id') | list %} + {% set worklog_title %} + Work Done + {{ links.export_link( + (user.full_name | lower | replace(' ', '_')) + '_user_worklog', + 'worklog', + {'ids': id_list} + ) }} + {% endset %}
- {{ tables.render_table(headers=worklog_headers, rows=worklog_rows, id='worklog', entry_route='worklog_entry', title='Work Done', per_page=8) }} + {{ tables.render_table(headers=worklog_headers, rows=worklog_rows, id='worklog', entry_route='worklog_entry', title=worklog_title, per_page=8) }}
{% endif %}