From 589bb537d2ef3f3494a2760ab3c6631b578a623f Mon Sep 17 00:00:00 2001 From: hellodeloo Date: Tue, 10 Sep 2024 17:24:34 +0200 Subject: [PATCH] wip --- itou/templates/approvals/list.html | 60 +++++++----- itou/templates/employee_record/list.html | 114 ++++++++++++++--------- 2 files changed, 107 insertions(+), 67 deletions(-) diff --git a/itou/templates/approvals/list.html b/itou/templates/approvals/list.html index c4d44b55427..d6740ade23d 100644 --- a/itou/templates/approvals/list.html +++ b/itou/templates/approvals/list.html @@ -1,6 +1,7 @@ {% extends "layout/base.html" %} {% load django_bootstrap5 %} {% load static %} +{% load matomo %} {% block title %}Salariés et PASS IAE {{ block.super }}{% endblock %} @@ -8,35 +9,51 @@ {% include "layout/previous_step.html" with back_url=back_url only %} {% endblock %} -{% block title_content %}

Salariés et PASS IAE

{% endblock %} +{% block title_content %}

Salariés

{% endblock %} + +{% block title_extra %} + +{% endblock %} {% block content %}
-
-
- {% include "approvals/includes/approvals_filters/status.html" %} - {% include "includes/btn_dropdown_filter/radio.html" with field=filters_form.expiry only %} - {% include "approvals/includes/list_reset_filters.html" %} +
+

Salariés et PASS IAE

+ +
+ {% include "approvals/includes/approvals_filters/status.html" %} + {% include "includes/btn_dropdown_filter/radio.html" with field=filters_form.expiry only %} + {% include "approvals/includes/list_reset_filters.html" %} +
+ +
+ {% include "approvals/includes/list_counter.html" %} +
{% bootstrap_field filters_form.job_seeker layout="inline" %}
- -
-
-
-
-
- {% include "approvals/includes/list_counter.html" %} -
{% bootstrap_field filters_form.job_seeker layout="inline" %}
+ {% include "approvals/includes/list_results.html" %}
- {% include "approvals/includes/list_results.html" %}
@@ -45,6 +62,7 @@ {% block script %} {{ block.super }} + diff --git a/itou/templates/employee_record/list.html b/itou/templates/employee_record/list.html index 0660e3a6ff2..c65ade8774e 100644 --- a/itou/templates/employee_record/list.html +++ b/itou/templates/employee_record/list.html @@ -1,6 +1,7 @@ {% extends "layout/base.html" %} {% load django_bootstrap5 %} {% load static %} +{% load matomo %} {% block title %}Fiches salarié ASP - {{ request.current_organization.display_name }} {{ block.super }}{% endblock %} @@ -29,20 +30,23 @@ {% endif %} {% endblock %} -{% block title_content %} -

Fiches salarié ASP - {{ request.current_organization.display_name }}

-

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

-

Une fois envoyées et validées, vous retrouverez directement vos données sur l'extranet de l'ASP.

-
    -
  • - Ne sont présentes dans cette liste que les candidatures acceptées (embauches) à partir du {{ feature_availability_date|date }}. +{% block title_content %}

    Salariés

    {% endblock %} + +{% block title_extra %} + - {% include "employee_record/includes/list_status_help.html" with request=request status=form.status.value only %} {% endblock %} {% block content %} @@ -50,46 +54,63 @@

    Nous transférons vos fiches salarié à l'ASP afin de vous faire
    -
    -
    Vous ne trouvez pas la fiche salarié d’un de vos salariés ?
    - Créer une fiche salarié -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - {% include "employee_record/includes/list_counter.html" %} - {% include "employee_record/includes/list_order.html" %} -
    - {% bootstrap_field filters_form.job_seeker layout="inline" %} +
    +
    + +
    + {# 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_order.html" %} +
    + {% bootstrap_field filters_form.job_seeker layout="inline" %} +
    + {% include "employee_record/includes/list_results.html" %}
    - {% include "employee_record/includes/list_results.html" %}
    @@ -98,6 +119,7 @@

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