inventory/templates/fragments/_link_fragment.html

@@ -41,6 +41,12 @@
 
 {% macro export_link(id, endpoint, ids) %}
 <!-- Export Link Fragment -->
- 
+<a class="link-success link-underline-opacity-0" onclick="export_{{ id }}_csv()">{{ icons.render_icon('box-arrow-up', 12) }}</a>
-<a class="link-success link-underline-opacity-0" onclick="export_csv({{ ids }}, '{{ endpoint }}', '{{ id }}_export');">{{ icons.render_icon('box-arrow-up', 12) }}</a>
+
+<script>
+    function export_{{ id }}_csv() {
+        const payload = {{ ids }};
+        export_csv(payload, '{{ endpoint }}', '{{ id }}_export');
+    }
+</script>
 {% endmacro %}

inventory/templates/inventory.html

@@ -88,15 +88,6 @@
         }
     {% endset %}
     {% set buttonBar %}
-        {% if worklog %}
-        <button class="btn btn-primary" type="button" onclick="export_csv({ids: [{% for row in worklog %}{{ row['id'] }}, {% endfor %}]}, 'worklog', '{{ item.identifier
-                    | replace('Name: ', '')
-                    | replace('ID:', '')
-                    | replace('Serial: ', '')
-                    | replace('Barcode: ', '')
-                    | lower
-                }}_worklog_export');">Export WorkLog</button>
-        {% endif %}
         <div class="btn-group">
             {{ buttons.render_button(
                 id='save',
@@ -114,6 +105,23 @@
             {% endif %}
         </div>
     {% endset %}
+    {% set middleBar %}
+        {% if worklog %}
+        <button class="btn btn-primary" type="button" onclick="export_worklog_csv()">Export WorkLog</button>
+        <script>
+            function export_worklog_csv() {
+                const ids = [{% for row in worklog %}{{ row['id'] }}, {% endfor %}];
+                export_csv({ids: ids}, 'worklog', '{{ item.identifier
+                    | replace('Name: ', '')
+                    | replace('ID:', '')
+                    | replace('Serial: ', '')
+                    | replace('Barcode: ', '')
+                    | lower
+                }}_worklog_export');
+            }
+        </script>
+        {% endif %}
+    {% endset %}
     {{ toolbars.render_toolbar(
         id='inventory',
         left=breadcrumbs.breadcrumb_header(
@@ -122,6 +130,7 @@
             ],
             title=title
         ),
+        center=middleBar,
         right=buttonBar
     ) }}
     {% if item.condition in ["Removed", "Disposed"] %}

inventory/templates/user.html

@@ -125,33 +125,15 @@
     <div class="row mt-3">
         {% if inventory_rows %}
         <div class="col">
-            {% 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 %}
             <div class="row">
-                {{ tables.render_table(headers=inventory_headers, rows=inventory_rows, id='assets', entry_route='inventory_item', title=inventory_title, per_page=8) }}
+                {{ tables.render_table(headers=inventory_headers, rows=inventory_rows, id='assets', entry_route='inventory_item', title='Assets', per_page=8) }}
             </div>
         </div>
         {% 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 %}
         <div class="col">
             <div class="row">
-                {{ tables.render_table(headers=worklog_headers, rows=worklog_rows, id='worklog', entry_route='worklog_entry', title=worklog_title, per_page=8) }}
+                {{ tables.render_table(headers=worklog_headers, rows=worklog_rows, id='worklog', entry_route='worklog_entry', title='Work Done', per_page=8) }}
             </div>
         </div>
         {% endif %}