groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-05-18 17:31:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Moved table rendering logic into macro

Browse source
This commit is contained in:
Jan Böhmer 2026-05-04 21:19:46 +02:00
parent 47891ca8c4
commit 81c7be1827
1 changed files with 29 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

72
templates/info_providers/bulk_import/manage.html.twig
View file

@ -35,27 +35,7 @@
<i class="fas fa-tasks me-1"></i> {% trans %}info_providers.bulk_import.active_jobs{% endtrans %} <i class="fas fa-tasks me-1"></i> {% trans %}info_providers.bulk_import.active_jobs{% endtrans %}
<span class="badge bg-primary">{{ active_jobs|length }}</span> <span class="badge bg-primary">{{ active_jobs|length }}</span>
</h5> </h5>
<div class="table-responsive mb-4"> {{ _self.job_table(active_jobs, false) }}
<table class="table table-striped">
<thead>
<tr>
<th>{% trans %}info_providers.bulk_import.job_name{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.parts_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.results_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.progress{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.status{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_by{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_at{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.action.label{% endtrans %}</th>
</tr>
</thead>
<tbody>
{% for job in active_jobs %}
{{ _self.job_row(job) }}
{% endfor %}
</tbody>
</table>
</div>
{% endif %} {% endif %}
{# Finished Jobs (History) #} {# Finished Jobs (History) #}
@ -64,28 +44,7 @@
<i class="fas fa-history me-1"></i> {% trans %}info_providers.bulk_import.finished_jobs{% endtrans %} <i class="fas fa-history me-1"></i> {% trans %}info_providers.bulk_import.finished_jobs{% endtrans %}
<span class="badge bg-secondary">{{ finished_jobs|length }}</span> <span class="badge bg-secondary">{{ finished_jobs|length }}</span>
</h5> </h5>
<div class="table-responsive"> {{ _self.job_table(finished_jobs, true) }}
<table class="table table-striped">
<thead>
<tr>
<th>{% trans %}info_providers.bulk_import.job_name{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.parts_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.results_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.progress{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.status{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_by{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_at{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.completed_at{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.action.label{% endtrans %}</th>
</tr>
</thead>
<tbody>
{% for job in finished_jobs %}
{{ _self.job_row(job, true) }}
{% endfor %}
</tbody>
</table>
</div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -93,6 +52,33 @@
{% endblock %} {% endblock %}
{% macro job_table(jobs, showCompletedAt) %}
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>{% trans %}info_providers.bulk_import.job_name{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.parts_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.results_count{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.progress{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.status{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_by{% endtrans %}</th>
<th>{% trans %}info_providers.bulk_import.created_at{% endtrans %}</th>
{% if showCompletedAt %}
<th>{% trans %}info_providers.bulk_import.completed_at{% endtrans %}</th>
{% endif %}
<th>{% trans %}info_providers.bulk_import.action.label{% endtrans %}</th>
</tr>
</thead>
<tbody>
{% for job in jobs %}
{{ _self.job_row(job, showCompletedAt) }}
{% endfor %}
</tbody>
</table>
</div>
{% endmacro %}
{% macro job_row(job, showCompletedAt) %} {% macro job_row(job, showCompletedAt) %}
{% set showCompletedAt = showCompletedAt|default(false) %} {% set showCompletedAt = showCompletedAt|default(false) %}
<tr> <tr>