diff --git a/itou/templates/employee_record/includes/employee_record_filters/reset.html b/itou/templates/employee_record/includes/employee_record_filters/reset.html new file mode 100644 index 00000000000..676a99d79b6 --- /dev/null +++ b/itou/templates/employee_record/includes/employee_record_filters/reset.html @@ -0,0 +1,12 @@ +{% load str_filters %} + +
+ {% if filters_counter > 0 %} + + + Effacer tout + + {% endif %} +
diff --git a/itou/templates/employee_record/includes/employee_record_filters/status.html b/itou/templates/employee_record/includes/employee_record_filters/status.html new file mode 100644 index 00000000000..d613a6f6cab --- /dev/null +++ b/itou/templates/employee_record/includes/employee_record_filters/status.html @@ -0,0 +1,24 @@ +{% load list_filters %} + +
+ +
diff --git a/itou/templates/employee_record/includes/list_counter.html b/itou/templates/employee_record/includes/list_counter.html new file mode 100644 index 00000000000..869ff32caf0 --- /dev/null +++ b/itou/templates/employee_record/includes/list_counter.html @@ -0,0 +1,7 @@ +{% load str_filters %} + +{% with navigation_pages.paginator.count as counter %} +

+ {{ counter }} résultat{{ counter|pluralizefr }} +

+{% endwith %} diff --git a/itou/templates/employee_record/includes/list_form_fields.html b/itou/templates/employee_record/includes/list_form_fields.html deleted file mode 100644 index d3a49719b2d..00000000000 --- a/itou/templates/employee_record/includes/list_form_fields.html +++ /dev/null @@ -1,21 +0,0 @@ -{% load django_bootstrap5 %} -{% load list_filters %} -
-
- Statut -
- {% for status, badge in form.status|zip:badges %} -
-
{{ status }}
-
- {{ badge.0 }} -
-
- {% endfor %} -
-
-
- Par candidat - {% bootstrap_field filters_form.job_seekers show_label=False %} -
-
diff --git a/itou/templates/employee_record/includes/list_results.html b/itou/templates/employee_record/includes/list_results.html index 0fb68378399..5ce9f2a180b 100644 --- a/itou/templates/employee_record/includes/list_results.html +++ b/itou/templates/employee_record/includes/list_results.html @@ -1,25 +1,7 @@ +{% load django_bootstrap5 %} {% load str_filters %} +
-
-
- {% with navigation_pages.paginator.count as counter %} -

{{ counter }} résultat{{ counter|pluralizefr }}

- {% endwith %} -
-
- Trier par : - - -
-
{# "Real" employee records objects #}
{% if employee_records_list %} @@ -42,7 +24,9 @@

{{ counter }} résultat{{ counter|pluralizefr }}

{% endif %} {% include "includes/pagination.html" with page=navigation_pages boost=True boost_target="#employee-records-container" boost_indicator="#employee-records-container" %}
+ {% if request.htmx %} {% include "employee_record/includes/list_status_help.html" with request=request status=form.status.value only %} - {% include "employee_record/includes/list_form_fields.html" %} + {% include "employee_record/includes/list_counter.html" %} + {% include "employee_record/includes/employee_record_filters/reset.html" %} {% endif %} diff --git a/itou/templates/employee_record/includes/list_sort.html b/itou/templates/employee_record/includes/list_sort.html new file mode 100644 index 00000000000..8f28d8d1566 --- /dev/null +++ b/itou/templates/employee_record/includes/list_sort.html @@ -0,0 +1,13 @@ +
+ Trier par : + + +
diff --git a/itou/templates/employee_record/list.html b/itou/templates/employee_record/list.html index 2593206993e..99321b4a24b 100644 --- a/itou/templates/employee_record/list.html +++ b/itou/templates/employee_record/list.html @@ -1,4 +1,5 @@ {% extends "layout/base.html" %} +{% load django_bootstrap5 %} {% load static %} {% block title %}Fiches salarié ASP - {{ request.current_organization.display_name }} {{ block.super }}{% endblock %} @@ -56,22 +57,34 @@

Nous transférons vos fiches salarié à l'ASP afin de vous faire

-
- + {# Filled via jQuery. Does not need reloading with HTMX, its content is static. #} + {{ form.order.as_hidden }} + +
+
+
+
+
+ {% include "employee_record/includes/list_counter.html" %} + {% include "employee_record/includes/list_sort.html" %} +
+ {% bootstrap_field filters_form.job_seekers layout="inline" %} +
+
+ {% include "employee_record/includes/list_results.html" %}
-
{% include "employee_record/includes/list_results.html" %}
@@ -80,6 +93,7 @@

Nous transférons vos fiches salarié à l'ASP afin de vous faire {% block script %} {{ block.super }} + {{ filters_form.media.js }}