From 1d3a96aae7ae85f2dc431a2471f19017e92dcaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Freitag?= Date: Wed, 3 Apr 2024 18:42:56 +0200 Subject: [PATCH] Filter job seeker job applications with HTMX Instead of reloading the page, use HTMX to reload the content. --- itou/static/js/job_applications_filters.js | 6 - .../apply/includes/list_job_applications.html | 25 ++- itou/templates/apply/list_for_job_seeker.html | 72 +------- itou/www/apply/views/list_views.py | 6 +- tests/www/apply/__snapshots__/test_list.ambr | 155 ++++++++++-------- tests/www/apply/test_list.py | 19 +++ 6 files changed, 144 insertions(+), 139 deletions(-) diff --git a/itou/static/js/job_applications_filters.js b/itou/static/js/job_applications_filters.js index 7c775b5cc7..ce0b787a84 100644 --- a/itou/static/js/job_applications_filters.js +++ b/itou/static/js/job_applications_filters.js @@ -1,7 +1 @@ -function submitFiltersForm() { - $("#js-job-applications-filters-form").submit(); -} -$("#js-job-applications-filters-form :input").change(submitFiltersForm); -$("#js-job-applications-filters-form duet-date-picker").on("duetChange", submitFiltersForm); - $("#js-job-applications-filters-apply-button").hide(); diff --git a/itou/templates/apply/includes/list_job_applications.html b/itou/templates/apply/includes/list_job_applications.html index 5e57f62527..7e439b7467 100644 --- a/itou/templates/apply/includes/list_job_applications.html +++ b/itou/templates/apply/includes/list_job_applications.html @@ -12,7 +12,8 @@

{% include "apply/includes/job_applications_export_button.html" %} {% if filters_counter > 0 %} - + Réinitialiser les filtres ({{ filters_counter }}) @@ -24,7 +25,7 @@

- {% if request.user.is_prescriber %} + {% if request.user.is_prescriber or request.user.is_job_seeker %} Aucune candidature pour le moment {% elif request.user.is_employer %} {% if pending_states_job_applications_count == 0 %} @@ -45,6 +46,10 @@

Pour recevoir des candidatures, vérifiez que les postes ouverts
dans votre structure sont bien à jour. + {% elif request.user.is_job_seeker %} + Vous trouverez ici vos candidatures, émises par un prescripteur +
+ ou par vous même. {% endif %}

@@ -58,6 +63,11 @@

Gérer les métiers et recrutements + {% elif request.user.is_job_seeker %} + + + Rechercher un emploi inclusif + {% endif %}

{% if request.user.is_employer %} @@ -66,7 +76,11 @@

{% else %} {% for job_application in job_applications_page %}
- {% include "apply/includes/list_card_body_company.html" %} + {% if request.user.is_job_seeker %} + {% include "apply/includes/list_card_body_jobseeker.html" %} + {% else %} + {% include "apply/includes/list_card_body_company.html" %} + {% endif %}
{% if job_application.pending_for_weeks >= job_application.WEEKS_BEFORE_CONSIDERED_OLD %} @@ -87,6 +101,11 @@

href="{% url 'apply:details_for_company' job_application_id=job_application.id %}?back_url={{ request.get_full_path|urlencode }}" aria-label="Gérer la candidature de {{ job_application.job_seeker.get_full_name|mask_unless:job_application.user_can_view_personal_information }}" {% matomo_event "candidature" "clic" "voir-candidature-employeur" %}>Voir sa candidature + {% elif request.user.is_job_seeker %} + + Voir ma candidature + {% endif %}

diff --git a/itou/templates/apply/list_for_job_seeker.html b/itou/templates/apply/list_for_job_seeker.html index 28a817e264..32bb9fba95 100644 --- a/itou/templates/apply/list_for_job_seeker.html +++ b/itou/templates/apply/list_for_job_seeker.html @@ -17,7 +17,12 @@ Filtrer les candidatures
-
+
{% include "apply/includes/job_applications_filters/statut.html" %}
@@ -30,69 +35,7 @@
- -
-
-
-

- {% with job_applications_page.paginator.count as counter %} - {{ counter }} résultat{{ counter|pluralizefr }} - {% endwith %} -

-
- {% include "apply/includes/job_applications_export_button.html" %} - {% if filters_counter > 0 %} - - - Réinitialiser les filtres ({{ filters_counter }}) - - {% endif %} -
-
- - {% if not job_applications_page %} -
- -

- Aucune candidature pour le moment -

-

- - Vous trouverez ici vos candidatures, émises par un prescripteur -
- ou par vous même. - -

- - - Rechercher un emploi inclusif - -
- {% else %} - {% for job_application in job_applications_page %} -
- {% include "apply/includes/list_card_body_jobseeker.html" %} -
-
- {% if job_application.pending_for_weeks >= job_application.WEEKS_BEFORE_CONSIDERED_OLD %} -

- - En attente de réponse depuis {{ job_application.pending_for_weeks }} semaines. -

- {% endif %} - - Voir ma candidature - -
-
-
- {% endfor %} - - {% include "includes/pagination.html" with page=job_applications_page %} - {% endif %} -
-
+
{% include "apply/includes/list_job_applications.html" %}
@@ -100,5 +43,6 @@

{% block script %} {{ block.super }} + {% endblock %} diff --git a/itou/www/apply/views/list_views.py b/itou/www/apply/views/list_views.py index cbd5370b12..4eadf5de7c 100644 --- a/itou/www/apply/views/list_views.py +++ b/itou/www/apply/views/list_views.py @@ -91,7 +91,11 @@ def list_for_job_seeker(request, template_name="apply/list_for_job_seeker.html") "filters_form": filters_form, "filters_counter": filters_counter, } - return render(request, template_name, context) + return render( + request, + "apply/includes/list_job_applications.html" if request.htmx else template_name, + context, + ) @login_required diff --git a/tests/www/apply/__snapshots__/test_list.ambr b/tests/www/apply/__snapshots__/test_list.ambr index dc93808192..e9170e803d 100644 --- a/tests/www/apply/__snapshots__/test_list.ambr +++ b/tests/www/apply/__snapshots__/test_list.ambr @@ -824,24 +824,24 @@ # --- # name: TestListForSiae.test_warns_about_long_awaiting_applications[JOB SEEKER - no warnings] ''' -
-
-

- - 3 résultats - -

-
- - - -
-
+
+
+

+ + 3 résultats + +

+
+ - - -
- + +
+
+ + +
+ +
@@ -889,18 +889,23 @@
-
-
- - - Voir ma candidature - -
-
-
- -
- + +
+
+ + + + Voir ma candidature + + +
+
+
+ + +
+ +
@@ -948,23 +953,28 @@
-
-
- -

- - En attente de réponse depuis 3 semaines. -

- - - Voir ma candidature - -
-
- - -
- + +
+
+ +

+ + En attente de réponse depuis 3 semaines. +

+ + + + Voir ma candidature + + +
+
+
+ + +
+ +
@@ -1012,28 +1022,31 @@
-
-
- -

- - En attente de réponse depuis 8 semaines. -

- - - Voir ma candidature - -
-
- - - - + +
+
+ +

+ + En attente de réponse depuis 8 semaines. +

+ + + + Voir ma candidature + + +
+
+ + + + - -
+ +
''' # --- # name: TestListForSiae.test_warns_about_long_awaiting_applications[PRESCRIBER - warnings for 2222 and 3333] @@ -1060,6 +1073,7 @@
+
@@ -1122,6 +1136,7 @@
+
@@ -1137,6 +1152,7 @@
+
@@ -1199,6 +1215,7 @@
+
@@ -1219,6 +1236,7 @@
+
@@ -1281,6 +1299,7 @@
+
@@ -1331,6 +1350,7 @@
+
@@ -1383,6 +1403,7 @@
+
@@ -1426,6 +1447,7 @@
+
@@ -1478,6 +1500,7 @@
+
@@ -1496,6 +1519,7 @@
+
@@ -1548,6 +1572,7 @@
+
diff --git a/tests/www/apply/test_list.py b/tests/www/apply/test_list.py index 80a72404d0..d7b1e469ed 100644 --- a/tests/www/apply/test_list.py +++ b/tests/www/apply/test_list.py @@ -184,6 +184,25 @@ def test_list_for_job_seeker_view_filtered_by_dates(self): assert applications[0].created_at >= start_date assert applications[0].created_at <= end_date + def test_htmx_filters(self): + job_seeker = JobSeekerFactory() + JobApplicationFactory(job_seeker=job_seeker, state=JobApplicationWorkflow.STATE_ACCEPTED) + self.client.force_login(job_seeker) + response = self.client.get(reverse("apply:list_for_job_seeker")) + page = parse_response_to_soup(response, selector="#main") + # Check the refused checkbox, that triggers the HTMX request. + [refused_checkbox] = page.find_all("input", attrs={"name": "states", "value": "refused"}) + refused_checkbox["checked"] = "" + response = self.client.get( + reverse("apply:list_for_job_seeker"), + {"states": ["refused"]}, + headers={"HX-Request": "true"}, + ) + update_page_with_htmx(page, "#asideFiltersCollapse > form", response) + response = self.client.get(reverse("apply:list_for_job_seeker"), {"states": ["refused"]}) + fresh_page = parse_response_to_soup(response, selector="#main") + assertSoupEqual(page, fresh_page) + ################################################### #################### SIAE ######################### # noqa E266