From 90c56cbcb9103fa8a12056c2cc198cd0ccb51abc Mon Sep 17 00:00:00 2001 From: hellodeloo Date: Thu, 28 Mar 2024 14:31:44 +0100 Subject: [PATCH] feat: update siae evaluations templates --- itou/static/css/itou.css | 8 - .../siae_evaluations/campaign_calendar.html | 8 +- .../includes/criterion_infos.html | 61 ++--- .../includes/criterion_validation.html | 73 +++--- .../job_seeker_infos_for_institution.html | 51 ++-- .../includes/job_seeker_infos_for_siae.html | 47 ++-- .../siae_evaluations/includes/list_item.html | 131 +++++----- .../siae_evaluations/includes/siae_infos.html | 39 ++- ...institution_evaluated_job_application.html | 112 +++++---- .../institution_evaluated_siae_detail.html | 151 ++++++------ .../institution_evaluated_siae_list.html | 75 +++--- .../siae_job_applications_list.html | 79 +++--- .../siae_evaluations/siae_upload_doc.html | 8 - itou/www/siae_evaluations_views/views.py | 3 - tests/siae_evaluations/factories.py | 5 + .../test_institutions_views.ambr | 232 +++++++++++++----- .../test_institutions_views.py | 187 ++++++++------ .../test_siaes_views.py | 145 ++++++----- 18 files changed, 776 insertions(+), 639 deletions(-) diff --git a/itou/static/css/itou.css b/itou/static/css/itou.css index 1c8f794b8c..8eb978c551 100644 --- a/itou/static/css/itou.css +++ b/itou/static/css/itou.css @@ -339,14 +339,6 @@ an input field being invalid, generating an uncontrolled red box-shadow. */ } } -.scrolldown-anchor { - /* navigation : class to force the scroll down and avoid the banner to hide the map */ - display: block; - position: relative; - top: -130px; - visibility: hidden; -} - .approval-left-border { border-left-width: 3px !important; } diff --git a/itou/templates/siae_evaluations/campaign_calendar.html b/itou/templates/siae_evaluations/campaign_calendar.html index b83ad2f47d..f22e238520 100644 --- a/itou/templates/siae_evaluations/campaign_calendar.html +++ b/itou/templates/siae_evaluations/campaign_calendar.html @@ -15,13 +15,7 @@

Calendrier

-
- {{ campaign_calendar_html|safe }} - -

- Retour -

-
+
{{ campaign_calendar_html|safe }}
diff --git a/itou/templates/siae_evaluations/includes/criterion_infos.html b/itou/templates/siae_evaluations/includes/criterion_infos.html index 406b79dac9..8119030dcf 100644 --- a/itou/templates/siae_evaluations/includes/criterion_infos.html +++ b/itou/templates/siae_evaluations/includes/criterion_infos.html @@ -1,39 +1,22 @@ -
-
-

{{ criteria.name }}

-
-
- {% if review_state == "ACCEPTED" %} -

- Validé -

- {% elif review_state == "REFUSED" or review_state == "REFUSED_2" %} -

- Refusé -

- {% endif %} -
-
-
-
- {% if criteria.written_proof %} -

- Pièce justificative : - {{ criteria.written_proof }} -

- {% endif %} - {% if criteria.written_proof_validity %} -

- Durée de validité du justificatif : - {{ criteria.written_proof_validity }} -

- {% endif %} - {% if criteria.written_proof_url %} -

- - {{ criteria.written_proof_url }} - -

- {% endif %} -
-
+{% if review_state == "ACCEPTED" %} + Validé +
+{% elif review_state == "REFUSED" or review_state == "REFUSED_2" %} + Refusé +
+{% endif %} +{{ criteria.name }} +
+ diff --git a/itou/templates/siae_evaluations/includes/criterion_validation.html b/itou/templates/siae_evaluations/includes/criterion_validation.html index 5247ee73d3..626d39ee90 100644 --- a/itou/templates/siae_evaluations/includes/criterion_validation.html +++ b/itou/templates/siae_evaluations/includes/criterion_validation.html @@ -1,45 +1,34 @@ -
-
-
-
- - - {% if evaluated_siae.state == "SUBMITTED" or evaluated_siae.state == "ACCEPTED" or evaluated_siae.state == "REFUSED" %} - Vérifier ce justificatif - {% else %} - Revoir ce justificatif - {% endif %} - - -
- {% if can_edit_proof %} - {% if evaluated_administrative_criteria.review_state == 'PENDING' %} -
-
- {% csrf_token %} - -
-
-
-
- {% csrf_token %} - -
-
- {% else %} -
-
- {% csrf_token %} - -
-
- {% endif %} +
+ +
+ {% if can_edit_proof %} +
+ {% if evaluated_administrative_criteria.review_state == 'PENDING' %} +
+ {% csrf_token %} + +
+
+ {% csrf_token %} + +
+ {% else %} +
+ {% csrf_token %} + +
+ {% endif %} +
+ {% endif %}
diff --git a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html index 81b2f4f6a2..79784a372a 100644 --- a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html +++ b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html @@ -1,64 +1,63 @@ {% load format_filters %} -
-
-

- Auto-prescription pour - {{ job_seeker.get_full_name }} -

-

- PASS IAE : {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }} -

+ +
+
+ +
+

PASS IAE {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }}

+ {{ job_seeker.get_full_name }} +
-
+
{% if evaluated_siae.evaluation_is_final %} {% if state == "PENDING" %} -

Non téléversés

+ Non téléversés {% elif state == "PROCESSING" %} -

Téléversement incomplet

+ Téléversement incomplet {% elif state == "UPLOADED" %} -

Justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" %} -

Justificatifs non contrôlés

+ Justificatifs non contrôlés {% elif state == "ACCEPTED" %} -

Validé

+ Validé {% elif state == "REFUSED" or state == "REFUSED_2" %} -

Problème constaté

+ Problème constaté {% endif %} {% else %} {% if state == "PENDING" or state == "PROCESSING" %} {% if evaluated_siae.submission_freezed_at %} -

Justificatifs non transmis

+ Justificatifs non transmis {% else %} -

En attente

+ En attente {% endif %} {% elif state == "UPLOADED" %} {% if evaluated_siae.submission_freezed_at %} -

Justificatifs non transmis

+ Justificatifs non transmis {% else %} -

Justificatifs téléversés

+ Justificatifs téléversés {% endif %} {% elif state == "SUBMITTED" %} -

+ {% if reviewed_at %} Nouveaux justificatifs à traiter {% else %} À traiter {% endif %} -

+ {% elif state == "ACCEPTED" %} -

Validé

+ Validé {% elif state == "REFUSED" %} {% if reviewed_at %} -

Phase contradictoire - En attente

+ Phase contradictoire - En attente {% else %} {% comment %} Show “Problème constaté” until the review is submitted, which starts the “phase contradictoire” (tracked by the reviewed_at field). {% endcomment %} -

Problème constaté

+ Problème constaté {% endif %} {% elif state == "REFUSED_2" %} -

Problème constaté

+ Problème constaté {% endif %} {% endif %}
diff --git a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html index 0fc6952521..a6e49bca81 100644 --- a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html +++ b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html @@ -1,47 +1,40 @@ {% load format_filters %} -
-
-

- Auto-prescription pour - {{ job_seeker.get_full_name }} -

+ +
+
+ +
+

PASS IAE {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }}

+ {{ job_seeker.get_full_name }} +
-
+
{% if state == "REFUSED_2" %} -

problème constaté

- + Problème constaté {% elif reviewed_at %} {% if state == "ACCEPTED" %} -

validé

+ Validé {% elif state == "UPLOADED" %} -

justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" %} -

transmis

+ Transmis {% elif state == "REFUSED" %} -

problème constaté

+ Problème constaté {% elif state == "PROCESSING" %} -

à traiter

+ À traiter {% else %} -

nouveaux justificatifs à traiter

+ Nouveaux justificatifs à traiter {% endif %} - {% else %} {% if state == "PENDING" %} -

à traiter

+ À traiter {% elif state == "PROCESSING" %} -

en cours

+ En cours {% elif state == "UPLOADED" %} -

justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" or state == "REFUSED" or state == "ACCEPTED" %} -

transmis

+ Transmis {% endif %} {% endif %}
-
-
-

- PASS IAE : {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }} -

-
-
diff --git a/itou/templates/siae_evaluations/includes/list_item.html b/itou/templates/siae_evaluations/includes/list_item.html index d16277caaa..b23ddef17d 100644 --- a/itou/templates/siae_evaluations/includes/list_item.html +++ b/itou/templates/siae_evaluations/includes/list_item.html @@ -1,64 +1,81 @@ -
- {# navigation : anchor to scroll to a specific card when returning to this page #} - -
+{% load str_filters %} + +{# navigation : anchor to scroll to a specific card when returning to this page #} +
+
{% include "siae_evaluations/includes/job_seeker_infos_for_siae.html" with job_seeker=item.job_application.job_seeker approval=item.job_application.approval state=item.compute_state_for_siae reviewed_at=item.evaluated_siae.reviewed_at %}
- -
- - {% for evaluated_administrative_criteria in item.evaluated_administrative_criteria.all %} - {% with criteria_review_state=evaluated_administrative_criteria.review_state_for_siae %} -
-
- {% if item.evaluated_siae.reviewed_at %} - {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria review_state=criteria_review_state %} - {% else %} - {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria %} - {% endif %} -
-
- {% if evaluated_administrative_criteria.can_upload %} - - {% if evaluated_administrative_criteria.proof_id %} - Modifier le justificatif - {% else %} - Ajouter un justificatif - {% endif %} - - {% elif evaluated_administrative_criteria.proof_id %} - Visualiser le justificatif soumis - {% endif %} +
+ {% if item.evaluated_siae.reviewed_at or item.evaluated_administrative_criteria.all %} +
+
+ {% if item.evaluated_siae.reviewed_at %} + {% if not item.hide_state_from_siae %} + {% with jobapp_state=item.compute_state %} + {% if jobapp_state == 'REFUSED' or jobapp_state == 'REFUSED_2' %} +

Commentaires de la DDETS

+
{{ item.labor_inspector_explanation }}
+ {% endif %} + {% endwith %} + {% endif %} + {% endif %} +
+ {% if item.evaluated_administrative_criteria.all %} +
+ +
+
    + {% for evaluated_administrative_criteria in item.evaluated_administrative_criteria.all %} + {% with criteria_review_state=evaluated_administrative_criteria.review_state_for_siae %} +
  • + {% if item.evaluated_siae.reviewed_at %} + {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria review_state=criteria_review_state %} + {% else %} + {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria %} + {% endif %} +
    + {% if evaluated_administrative_criteria.can_upload %} + {% if evaluated_administrative_criteria.proof_id %} + + + Modifier le justificatif + + {% else %} + + + Ajouter un justificatif + + {% endif %} + {% elif evaluated_administrative_criteria.proof_id %} + + + Voir le justificatif + + {% endif %} +
    + {% if not forloop.last %}
    {% endif %} +
    • + {% endwith %} + {% endfor %} +
- {% endwith %} - {% endfor %} - -
-
- {% if item.should_select_criteria == "PENDING" %} - Sélectionner les critères - {% elif item.should_select_criteria == "EDITABLE" %} - Modifier les critères - {% endif %} - + {% endif %} +
+ {% endif %} + {% if item.should_select_criteria == "PENDING" %} +
+
+ Sélectionner les critères
- - {% if item.evaluated_siae.reviewed_at %} - {% if not item.hide_state_from_siae %} - {% with jobapp_state=item.compute_state %} - {% if jobapp_state == 'REFUSED' or jobapp_state == 'REFUSED_2' %} -
-
-

Commentaires de la DDETS

- {{ item.labor_inspector_explanation }} -
-
- {% endif %} - {% endwith %} - {% endif %} - {% endif %} -
+ {% elif item.should_select_criteria == "EDITABLE" %} +
+
+ Modifier les critères +
+
+ {% endif %}
diff --git a/itou/templates/siae_evaluations/includes/siae_infos.html b/itou/templates/siae_evaluations/includes/siae_infos.html index b01acee56c..2fe5b271ae 100644 --- a/itou/templates/siae_evaluations/includes/siae_infos.html +++ b/itou/templates/siae_evaluations/includes/siae_infos.html @@ -1,47 +1,44 @@ -
-
-

{{ evaluated_siae }}

+
+
+ +
+

{{ evaluated_siae }}

+
-
+
{% if evaluated_siae.evaluation_is_final %} {# Only 2 states are possible when evaluation_is_final: ACCEPTED and REFUSED #} {% if evaluated_siae.state == "ACCEPTED" %} -

- Résultat positif -

+ Résultat positif {% elif evaluated_siae.state == "REFUSED" %} {% if evaluated_siae.notified_at %} -

- Résultat négatif -

+ Résultat négatif {% else %} -

- Notification à faire -

+ Notification à faire {% endif %} {% endif %} {% else %} {% if evaluated_siae.state == "SUBMITTED" %} -

+ {% if evaluated_siae.reviewed_at %}Phase contradictoire -{% endif %} À traiter -

+ {% elif evaluated_siae.state == "REFUSED" or evaluated_siae.state == "ACCEPTED" %} -

En cours

+ En cours {% elif evaluated_siae.state == "ADVERSARIAL_STAGE" %} -

Phase contradictoire

+ Phase contradictoire {% else %} {# PENDING or SUBMITTABLE (NOTIFICATION_PENDING impossible without evaluation_is_final) #} {% if evaluated_siae.submission_freezed_at %} -

+ {% if evaluated_siae.reviewed_at %}Phase contradictoire -{% endif %} Problème constaté -

+ {% else %} -

+ {% if evaluated_siae.reviewed_at %}Phase contradictoire -{% endif %} En attente -

+ {% endif %} {% endif %} {% endif %} diff --git a/itou/templates/siae_evaluations/institution_evaluated_job_application.html b/itou/templates/siae_evaluations/institution_evaluated_job_application.html index 8c2485c88e..92a8672a82 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_job_application.html +++ b/itou/templates/siae_evaluations/institution_evaluated_job_application.html @@ -1,62 +1,86 @@ {% extends "layout/base.html" %} {% load django_bootstrap5 %} +{% load str_filters %} {% load static %} {% block title %}Contrôler les pièces justificatives {{ block.super }}{% endblock %} +{% if back_url %} + {% block breadcrumbs %} +
+ + + Retour + +
+ {% endblock %} +{% endif %} + +{% block content_title_wrapper %}{% endblock %} + {% block content %}
-
-
-
-
-
-
- {% include "siae_evaluations/includes/job_seeker_infos_for_institution.html" with job_seeker=evaluated_job_application.job_application.job_seeker approval=evaluated_job_application.job_application.approval state=evaluated_job_application.compute_state %} -
-
- {% for evaluated_administrative_criteria in evaluated_job_application.evaluated_administrative_criteria.all %} - {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria review_state=evaluated_administrative_criteria.review_state %} - {% if evaluated_siae.evaluation_is_final %} - - Revoir ce justificatif - - {% else %} - {% include "siae_evaluations/includes/criterion_validation.html" with evaluated_administrative_criteria=evaluated_administrative_criteria evaluated_siae=evaluated_siae %} - {% endif %} - {% endfor %} - {% if not evaluated_siae.evaluation_is_final %} -
-
-
- {% csrf_token %} - - {% bootstrap_form form alert_error_type="all" %} - {% with evaluated_job_application_state=evaluated_job_application.compute_state %} - - {% endwith %} -
-
-
- {% endif %} +
+
+
+
+ {% include "siae_evaluations/includes/job_seeker_infos_for_institution.html" with job_seeker=evaluated_job_application.job_application.job_seeker approval=evaluated_job_application.job_application.approval state=evaluated_job_application.compute_state %} +
+
+
+
+ +
+
    + {% for evaluated_administrative_criteria in evaluated_job_application.evaluated_administrative_criteria.all %} +
  • + {% include "siae_evaluations/includes/criterion_infos.html" with criteria=evaluated_administrative_criteria.administrative_criteria review_state=evaluated_administrative_criteria.review_state %} + {% if evaluated_siae.evaluation_is_final %} +
    + + Revoir ce justificatif + +
    + {% else %} + {% include "siae_evaluations/includes/criterion_validation.html" with evaluated_administrative_criteria=evaluated_administrative_criteria evaluated_siae=evaluated_siae %} + {% endif %} + {% if not forloop.last %}
    {% endif %} +
    • + {% endfor %} +
- - {% if back_url %} -

- Retour -

- {% endif %}
+ {% if not evaluated_siae.evaluation_is_final %} +
+
+
+ {% csrf_token %} + + {% bootstrap_form form alert_error_type="all" %} + {% with evaluated_job_application_state=evaluated_job_application.compute_state %} + + {% endwith %} +
+
+
+ {% endif %}
diff --git a/itou/templates/siae_evaluations/institution_evaluated_siae_detail.html b/itou/templates/siae_evaluations/institution_evaluated_siae_detail.html index b36662d7ce..aca293fbc6 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_siae_detail.html +++ b/itou/templates/siae_evaluations/institution_evaluated_siae_detail.html @@ -5,6 +5,17 @@ {% block title %}Contrôler les pièces justificatives {{ block.super }}{% endblock %} +{% if back_url %} + {% block breadcrumbs %} +
+ + + Retour + +
+ {% endblock %} +{% endif %} + {% block messages %} {{ block.super }} {% if campaign_closed_before_final_evaluation or accepted_by_default %} @@ -14,7 +25,7 @@
-

+

{% if campaign_closed_before_final_evaluation %} {% if evaluated_siae.state == "ACCEPTED" %} {{ evaluated_siae|capfirst }} a soumis des justificatifs, mais leur contrôle n’a pas été @@ -51,96 +62,74 @@

-
-
-
-

- Liste des auto-prescriptions de {{ evaluated_siae }} -

-

- Numéro de téléphone à utiliser au besoin : - {% if evaluated_siae.siae.phone %} - - {{ evaluated_siae.siae.phone|format_phone }} - - {% else %} - Non renseigné - {% endif %} -

- {% if not evaluated_siae.evaluation_is_final %} -
-
-

- Lorsque vous aurez contrôlé tous vos justificatifs pour cette SIAE, - veuillez valider le contrôle effectué pour la notifier de son résultat. -

-
+
+

Liste des auto-prescriptions de {{ evaluated_siae }}

+

+ Numéro de téléphone à utiliser au besoin : + {% if evaluated_siae.siae.phone %} + + {{ evaluated_siae.siae.phone|format_phone }} + + {% else %} + Non renseigné + {% endif %} +

-
-
- {% csrf_token %} - -
-
-
- {% endif %} + {% if not evaluated_siae.evaluation_is_final %} +
+
+ Lorsque vous aurez contrôlé tous vos justificatifs pour cette SIAE, veuillez valider le contrôle effectué pour la notifier de son résultat. +
+
+ {% csrf_token %} + +
-
-
-
- {% for evaluated_job_application in evaluated_siae.evaluated_job_applications.all %} -
- {# navigation : anchor to scroll to a specific card when returning to this page #} - -
- {% include "siae_evaluations/includes/job_seeker_infos_for_institution.html" with job_seeker=evaluated_job_application.job_application.job_seeker approval=evaluated_job_application.job_application.approval state=evaluated_job_application.compute_state reviewed_at=evaluated_job_application.evaluated_siae.reviewed_at %} -
+ {% endif %} -
- {% with evaluated_job_application_state=evaluated_job_application.compute_state %} - {% if not evaluated_siae.evaluation_is_final and evaluated_job_application_state == "SUBMITTED" %} - - Contrôler cette auto-prescription - - {% elif evaluated_job_application_state != "PENDING" and evaluated_job_application_state != "PROCESSING" %} - - Revoir ses justificatifs - - {% endif %} - {% endwith %} + {% for evaluated_job_application in evaluated_siae.evaluated_job_applications.all %} + {# navigation : anchor to scroll to a specific card when returning to this page #} +
+
+ {% include "siae_evaluations/includes/job_seeker_infos_for_institution.html" with job_seeker=evaluated_job_application.job_application.job_seeker approval=evaluated_job_application.job_application.approval state=evaluated_job_application.compute_state reviewed_at=evaluated_job_application.evaluated_siae.reviewed_at %} +
+ {% with evaluated_job_application_state=evaluated_job_application.compute_state %} + {% if not evaluated_siae.evaluation_is_final and evaluated_job_application_state == "SUBMITTED" %} +
+
+
+ + Contrôler cette auto-prescription + +
-
- {% endfor %} + {% elif evaluated_job_application_state != "PENDING" and evaluated_job_application_state != "PROCESSING" %} +
+
+
+ + Revoir ses justificatifs + +
+
+ {% endif %} + {% endwith %}
-
+ {% endfor %} {% if not evaluated_siae.evaluation_is_final and evaluated_siae.can_review %} -
-
-

- Lorsque vous aurez contrôlé tous vos justificatifs pour cette SIAE, - veuillez valider le contrôle effectué pour la notifier de son résultat. -

-
- -
-
- {% csrf_token %} - -
+
+
+ Lorsque vous aurez contrôlé tous vos justificatifs pour cette SIAE, veuillez valider le contrôle effectué pour la notifier de son résultat.
+
+ {% csrf_token %} + +
{% endif %} - - - - {% if back_url %} -

- Retour -

- {% endif %}
diff --git a/itou/templates/siae_evaluations/institution_evaluated_siae_list.html b/itou/templates/siae_evaluations/institution_evaluated_siae_list.html index d94866614b..dba3c93bc7 100644 --- a/itou/templates/siae_evaluations/institution_evaluated_siae_list.html +++ b/itou/templates/siae_evaluations/institution_evaluated_siae_list.html @@ -5,6 +5,17 @@ {% block title %}Contrôler les pièces justificatives {{ block.super }}{% endblock %} +{% if back_url %} + {% block breadcrumbs %} +
+ + + Retour + +
+ {% endblock %} +{% endif %} + {% block content_title %}

Contrôler les pièces justificatives

@@ -25,48 +36,40 @@

-
+
{% for evaluated_siae in evaluated_siaes %} -
-
-
-
- {% include "siae_evaluations/includes/siae_infos.html" with evaluated_siae=evaluated_siae %} -
-
-
- {% if evaluated_siae.state == "REFUSED" and evaluated_siae.notified_at %} - Voir la notification de sanction - {% endif %} - - {% if evaluated_siae.evaluation_is_final %} - Voir le résultat - {% else %} - {% if evaluated_siae.state == "SUBMITTED" or evaluated_siae.state == "ACCEPTED" or evaluated_siae.state == "REFUSED" %} - Contrôler cette SIAE - {% elif evaluated_siae.state == "ADVERSARIAL_STAGE" %} - Revoir ses justificatifs - {% else %} - Voir - {% endif %} - {% endif %} - - {% if evaluated_siae.state == "REFUSED" and not evaluated_siae.notified_at and evaluated_siae.evaluation_is_final %} - - Notifier la sanction - +
+
+ {% include "siae_evaluations/includes/siae_infos.html" with evaluated_siae=evaluated_siae %} +
+
+
+
+ {% if evaluated_siae.state == "REFUSED" and evaluated_siae.notified_at %} + Voir la notification de sanction + {% endif %} + + {% if evaluated_siae.evaluation_is_final %} + Voir le résultat + {% else %} + {% if evaluated_siae.state == "SUBMITTED" or evaluated_siae.state == "ACCEPTED" or evaluated_siae.state == "REFUSED" %} + Contrôler cette SIAE + {% elif evaluated_siae.state == "ADVERSARIAL_STAGE" %} + Revoir ses justificatifs + {% else %} + Voir {% endif %} -
-
+ {% endif %} + + {% if evaluated_siae.state == "REFUSED" and not evaluated_siae.notified_at and evaluated_siae.evaluation_is_final %} + + Notifier la sanction + + {% endif %}
{% endfor %} - {% if back_url %} -

- Retour -

- {% endif %}
diff --git a/itou/templates/siae_evaluations/siae_job_applications_list.html b/itou/templates/siae_evaluations/siae_job_applications_list.html index 4d516b25b4..6551836df8 100644 --- a/itou/templates/siae_evaluations/siae_job_applications_list.html +++ b/itou/templates/siae_evaluations/siae_job_applications_list.html @@ -21,65 +21,42 @@ {% block content %}
-
-
-
-
-

Liste de mes auto-prescriptions à justifier

-

Contrôle initié le {{ evaluated_siae.evaluation_campaign.evaluations_asked_at|date:"d F Y" }}

-
-
-
-
-

- Lorsque vous aurez ajouté tous vos justificatifs, - veuillez les soumettre à validation, la DDETS effectuera un contrôle de ceux-ci et reviendra vers vous. -

-
+
+
+

Liste de mes auto-prescriptions à justifier

+

Contrôle initié le {{ evaluated_siae.evaluation_campaign.evaluations_asked_at|date:"d F Y" }}

-
-
- {% csrf_token %} - -
-
-
-
-
- {% for evaluated_job_application in evaluated_job_applications %} - {% include "siae_evaluations/includes/list_item.html" with item=evaluated_job_application %} - {% endfor %} +
+
+ Lorsque vous aurez ajouté tous vos justificatifs, veuillez les soumettre à validation. +
+ La DDETS effectuera un contrôle de ceux-ci et reviendra vers vous.
+
+ {% csrf_token %} + +
- {% if is_submittable %} -
-
-

- Lorsque vous aurez ajouté tous vos justificatifs, - veuillez les soumettre à validation, la DDETS effectuera un contrôle de ceux-ci et reviendra vers vous. -

-
+ {% for evaluated_job_application in evaluated_job_applications %} + {% include "siae_evaluations/includes/list_item.html" with item=evaluated_job_application %} + {% endfor %} -
-
- {% csrf_token %} - -
+ {% if is_submittable %} +
+
+ Lorsque vous aurez ajouté tous vos justificatifs, veuillez les soumettre à validation. +
+ La DDETS effectuera un contrôle de ceux-ci et reviendra vers vous.
+
+ {% csrf_token %} + +
{% endif %} - - - {% if back_url %} -

- Retour -

- {% endif %}
diff --git a/itou/templates/siae_evaluations/siae_upload_doc.html b/itou/templates/siae_evaluations/siae_upload_doc.html index 1dd3e63c2d..63f219df20 100644 --- a/itou/templates/siae_evaluations/siae_upload_doc.html +++ b/itou/templates/siae_evaluations/siae_upload_doc.html @@ -10,7 +10,6 @@
-
{% include "siae_evaluations/includes/job_seeker_infos_for_siae.html" with job_seeker=evaluated_administrative_criteria.evaluated_job_application.job_application.job_seeker approval=evaluated_administrative_criteria.evaluated_job_application.job_application.approval state=evaluated_administrative_criteria.evaluated_job_application.compute_state reviewed_at=evaluated_administrative_criteria.evaluated_job_application.evaluated_siae.reviewed_at %} @@ -57,13 +56,6 @@
- - {% if back_url %} -

- Retour -

- {% endif %} -
diff --git a/itou/www/siae_evaluations_views/views.py b/itou/www/siae_evaluations_views/views.py index 76a68e3e12..f5dba756c6 100644 --- a/itou/www/siae_evaluations_views/views.py +++ b/itou/www/siae_evaluations_views/views.py @@ -78,8 +78,6 @@ def campaign_calendar(request, evaluation_campaign_pk, template_name="siae_evalu pk=evaluation_campaign_pk, ) - back_url = get_safe_url(request, "back_url", fallback_url=reverse("dashboard:index")) - if request.user.is_employer: evaluated_siae = get_object_or_404( EvaluatedSiae, @@ -98,7 +96,6 @@ def campaign_calendar(request, evaluation_campaign_pk, template_name="siae_evalu context = { "breadcrumbs": breadcrumbs, "campaign_calendar_html": evaluation_campaign.calendar.html, - "back_url": back_url, } return render(request, template_name, context) diff --git a/tests/siae_evaluations/factories.py b/tests/siae_evaluations/factories.py index 19c9ba2751..9e64b93743 100644 --- a/tests/siae_evaluations/factories.py +++ b/tests/siae_evaluations/factories.py @@ -59,6 +59,11 @@ class Params: reviewed_at=factory.LazyFunction(timezone.now), final_reviewed_at=factory.LazyFunction(timezone.now), ) + for_snapshot = factory.Trait( + siae__for_snapshot=True, + siae__post_code="14000", + siae__city="Caen", + ) evaluation_campaign = factory.SubFactory(EvaluationCampaignFactory) siae = factory.SubFactory(CompanyFactory, department="14") diff --git a/tests/www/siae_evaluations_views/__snapshots__/test_institutions_views.ambr b/tests/www/siae_evaluations_views/__snapshots__/test_institutions_views.ambr index e14e63df98..6936043e49 100644 --- a/tests/www/siae_evaluations_views/__snapshots__/test_institutions_views.ambr +++ b/tests/www/siae_evaluations_views/__snapshots__/test_institutions_views.ambr @@ -1,252 +1,374 @@ # serializer version: 1 # name: InstitutionEvaluatedSiaeListViewTest.test_access[notification pending state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Notification à faire -

+ Notification à faire
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_access[waiting state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ En attente -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_notified_siae[final refused state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Résultat négatif -

+ Résultat négatif
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_recently_closed_campaign[final accepted state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Résultat positif -

+ Résultat positif
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_incomplete_refused_can_be_notified[notification pending state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Notification à faire -

+ Notification à faire
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_incomplete_refused_can_be_notified_after_review[notification pending state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Notification à faire -

+ Notification à faire
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[adversarial in progress state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

Phase contradictoire

+ Phase contradictoire
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[adversarial stage state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

Phase contradictoire

+ Phase contradictoire
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[adversarial to process state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ Phase contradictoire - À traiter -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[adversarial waiting state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ Phase contradictoire - En attente -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[final accepted state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Résultat positif -

+ Résultat positif
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[in progress state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

En cours

+ En cours
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[to process state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ À traiter -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos[waiting state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ En attente -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos_with_submission_freezed_at[identified issue state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ Problème constaté -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_infos_with_submission_freezed_at[to process state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

+ À traiter -

+
+
''' # --- # name: InstitutionEvaluatedSiaeListViewTest.test_siae_refused_can_be_notified[notification pending state] ''' -
+
+
+ +
+

ACME Inc.

+
+
+
-

- Notification à faire -

+ Notification à faire
+
''' # --- diff --git a/tests/www/siae_evaluations_views/test_institutions_views.py b/tests/www/siae_evaluations_views/test_institutions_views.py index c47ee79a7e..568e342531 100644 --- a/tests/www/siae_evaluations_views/test_institutions_views.py +++ b/tests/www/siae_evaluations_views/test_institutions_views.py @@ -188,7 +188,13 @@ def test_access(self): # institution with evaluation_campaign in "institution sets its ratio" phase evaluation_campaign = EvaluationCampaignFactory(institution=self.institution) - evaluated_siae = EvaluatedSiaeFactory(pk=1000, evaluation_campaign=evaluation_campaign) + evaluated_siae = EvaluatedSiaeFactory( + evaluation_campaign=evaluation_campaign, + pk=1000, + for_snapshot=True, + ) + evaluated_job_app = EvaluatedJobApplicationFactory(evaluated_siae=evaluated_siae) + EvaluatedAdministrativeCriteriaFactory.create(evaluated_job_application=evaluated_job_app) response = self.client.get( reverse( "siae_evaluations_views:institution_evaluated_siae_list", @@ -227,6 +233,7 @@ def test_recently_closed_campaign(self): evaluated_siae = EvaluatedSiaeFactory( pk=1000, complete=True, + for_snapshot=True, job_app__criteria__review_state=evaluation_enums.EvaluatedJobApplicationsState.ACCEPTED, evaluation_campaign__institution=self.institution, ) @@ -244,7 +251,7 @@ def test_recently_closed_campaign(self): self.assertContains( response, f""" - + Voir le résultat """, @@ -259,6 +266,7 @@ def test_siae_refused_can_be_notified(self): evaluated_siae = EvaluatedSiaeFactory( pk=1000, complete=True, + for_snapshot=True, job_app__criteria__review_state=evaluation_enums.EvaluatedJobApplicationsState.REFUSED_2, evaluation_campaign__institution=self.institution, ) @@ -279,8 +287,8 @@ def test_siae_refused_can_be_notified(self): self.assertContains( response, f""" - - Notifier la sanction + + Notifier la sanction """, html=True, @@ -292,7 +300,11 @@ def test_siae_refused_can_be_notified(self): ) self.assertContains( response, - f'Voir le résultat', + f""" + + Voir le résultat + + """, html=True, count=1, ) @@ -300,6 +312,7 @@ def test_siae_refused_can_be_notified(self): def test_siae_incomplete_refused_can_be_notified(self): evaluated_siae = EvaluatedSiaeFactory( pk=1000, + for_snapshot=True, evaluation_campaign__institution=self.institution, evaluation_campaign__evaluations_asked_at=timezone.now() - relativedelta(weeks=10), evaluation_campaign__ended_at=timezone.now(), @@ -321,8 +334,8 @@ def test_siae_incomplete_refused_can_be_notified(self): self.assertContains( response, f""" - - Notifier la sanction + + Notifier la sanction """, html=True, @@ -334,19 +347,22 @@ def test_siae_incomplete_refused_can_be_notified(self): ) self.assertContains( response, - f'Voir le résultat', + f'Voir le résultat', html=True, count=1, ) def test_siae_incomplete_refused_can_be_notified_after_review(self): evaluated_siae = EvaluatedSiaeFactory( - pk=1000, evaluation_campaign__institution=self.institution, evaluation_campaign__evaluations_asked_at=timezone.now() - relativedelta(weeks=10), evaluation_campaign__ended_at=timezone.now(), + pk=1000, + for_snapshot=True, reviewed_at=timezone.now() - relativedelta(weeks=4), ) + evaluated_job_app = EvaluatedJobApplicationFactory(evaluated_siae=evaluated_siae) + EvaluatedAdministrativeCriteriaFactory.create(evaluated_job_application=evaluated_job_app) self.client.force_login(self.user) response = self.client.get( reverse( @@ -364,8 +380,8 @@ def test_siae_incomplete_refused_can_be_notified_after_review(self): self.assertContains( response, f""" - - Notifier la sanction + + Notifier la sanction """, html=True, @@ -377,7 +393,11 @@ def test_siae_incomplete_refused_can_be_notified_after_review(self): ) self.assertContains( response, - f'Voir le résultat', + f""" + + Voir le résultat + + """, html=True, count=1, ) @@ -386,6 +406,7 @@ def test_notified_siae(self): evaluated_siae = EvaluatedSiaeFactory( pk=1000, complete=True, + for_snapshot=True, job_app__criteria__review_state=evaluation_enums.EvaluatedJobApplicationsState.REFUSED_2, evaluation_campaign__institution=self.institution, notified_at=timezone.now(), @@ -413,10 +434,10 @@ def test_notified_siae(self): self.assertContains( response, f""" - + Voir la notification de sanction - + Voir le résultat """, @@ -460,9 +481,13 @@ def test_siae_infos(self): evaluation_campaign = EvaluationCampaignFactory( institution=self.institution, evaluations_asked_at=timezone.now() ) - evaluated_siae = create_evaluated_siae_consistent_datas( - evaluation_campaign, extra_evaluated_siae_kwargs={"pk": 1000} + evaluated_siae = EvaluatedSiaeFactory( + evaluation_campaign=evaluation_campaign, + pk=1000, + for_snapshot=True, ) + evaluated_job_app = EvaluatedJobApplicationFactory(evaluated_siae=evaluated_siae) + EvaluatedAdministrativeCriteriaFactory.create(evaluated_job_application=evaluated_job_app) url = reverse( "siae_evaluations_views:institution_evaluated_siae_list", kwargs={"evaluation_campaign_pk": evaluation_campaign.pk}, @@ -563,9 +588,13 @@ def test_siae_infos_with_submission_freezed_at(self): evaluation_campaign = EvaluationCampaignFactory( institution=self.institution, evaluations_asked_at=timezone.now() ) - evaluated_siae = create_evaluated_siae_consistent_datas( - evaluation_campaign, extra_evaluated_siae_kwargs={"pk": 1000} + evaluated_siae = EvaluatedSiaeFactory( + evaluation_campaign=evaluation_campaign, + pk=1000, + for_snapshot=True, ) + evaluated_job_app = EvaluatedJobApplicationFactory(evaluated_siae=evaluated_siae) + EvaluatedAdministrativeCriteriaFactory(evaluated_job_application=evaluated_job_app, proof=None) url = reverse( "siae_evaluations_views:institution_evaluated_siae_list", kwargs={"evaluation_campaign_pk": evaluation_campaign.pk}, @@ -698,13 +727,13 @@ def test_recently_closed_campaign(self): ) self.assertContains( response, - '

Validé

', + 'Validé', count=1, ) self.assertContains( response, f""" - + Revoir ses justificatifs """, @@ -743,7 +772,7 @@ def test_campaign_closed_before_final_evaluation_refused_review_not_submitted(se ) self.assertContains( response, - '

Problème constaté

', + 'Problème constaté', html=True, count=1, ) @@ -780,9 +809,9 @@ def test_transition_to_adversarial_phase_before_institution_review_submitted(sel self.assertContains( response, """ -

- Justificatifs non contrôlés -

+ + Justificatifs non contrôlés + """, html=True, count=1, @@ -825,7 +854,7 @@ def test_refused_does_not_show_accepted_by_default(self): ) self.assertContains( response, - '

Problème constaté

', + 'Problème constaté', html=True, count=1, ) @@ -865,9 +894,9 @@ def test_campaign_closed_before_final_evaluation_adversarial_stage_review_not_su self.assertContains( response, """ -

- Justificatifs non contrôlés -

+ + Justificatifs non contrôlés + """, html=True, count=1, @@ -899,7 +928,7 @@ def test_campaign_closed_before_final_evaluation_no_docs(self): ) self.assertContains( response, - '

Non téléversés

', + 'Non téléversés', html=True, count=1, ) @@ -945,11 +974,11 @@ def test_content(self): kwargs={"evaluated_siae_pk": evaluated_siae.pk}, ) validation_button_disabled = f""" - """ validation_button = f""" - """ back_url = reverse( @@ -977,9 +1006,9 @@ def test_content(self): self.assertContains( response, f""" -

+ {pending_status} -

+ """, html=True, count=1, @@ -1019,9 +1048,9 @@ def test_content(self): self.assertContains( response, f""" -

+ {submitted_status} -

+ """, html=True, count=1, @@ -1040,9 +1069,9 @@ def test_content(self): self.assertContains( response, """ -

+ Validé -

+ """, html=True, count=1, @@ -1061,9 +1090,9 @@ def test_content(self): self.assertContains( response, """ -

+ Validé -

+ """, html=True, count=1, @@ -1085,9 +1114,9 @@ def test_content(self): self.assertContains( response, f""" -

+ {refused_status} -

+ """, html=True, count=1, @@ -1105,9 +1134,9 @@ def test_content(self): self.assertContains( response, """ -

+ Phase contradictoire - En attente -

+ """, html=True, count=1, @@ -1155,9 +1184,9 @@ def test_content(self): self.assertContains( response, """ -

+ Validé -

+ """, html=True, count=1, @@ -1177,9 +1206,9 @@ def test_content(self): self.assertContains( response, """ -

+ Validé -

+ """, html=True, count=1, @@ -1202,9 +1231,9 @@ def test_content(self): self.assertContains( response, f""" -

+ {refused_status} -

+ """, html=True, count=1, @@ -1222,9 +1251,9 @@ def test_content(self): self.assertContains( response, f""" -

+ {refused_status} -

+ """, html=True, count=1, @@ -1252,7 +1281,7 @@ def test_content_with_submission_freezed_at(self): kwargs={"evaluated_siae_pk": evaluated_siae.pk}, ) validation_button_disabled = f""" - """ back_url = reverse( @@ -1278,9 +1307,9 @@ def test_content_with_submission_freezed_at(self): self.assertContains( response, f""" -

+ {not_transmitted_status} -

+ """, html=True, count=1, @@ -1295,9 +1324,9 @@ def test_content_with_submission_freezed_at(self): self.assertContains( response, f""" -

+ {not_transmitted_status} -

+ """, html=True, count=1, @@ -1320,9 +1349,9 @@ def test_content_with_submission_freezed_at(self): self.assertContains( response, f""" -

+ {submitted_status} -

+ """, html=True, count=1, @@ -1373,7 +1402,7 @@ def test_job_app_status_evaluation_is_final_pending(self): ) self.assertContains( response, - '

Non téléversés

', + 'Non téléversés', count=1, ) @@ -1396,7 +1425,12 @@ def test_job_app_status_evaluation_is_final_processing(self): ) self.assertContains( response, - '

Téléversement incomplet

', + """ + + Téléversement incomplet + + """, + html=True, count=1, ) @@ -1418,7 +1452,12 @@ def test_job_app_status_evaluation_is_final_uploaded(self): ) self.assertContains( response, - '

Justificatifs téléversés

', + """ + + Justificatifs téléversés + + """, + html=True, count=1, ) @@ -1443,7 +1482,11 @@ def test_job_app_status_evaluation_is_final_submitted(self): ) self.assertContains( response, - '

Justificatifs non contrôlés

', + """ + + Justificatifs non contrôlés + """, + html=True, count=1, ) @@ -1473,7 +1516,7 @@ def test_job_app_status_evaluation_is_final_accepted(self): ) self.assertContains( response, - '

Validé

', + 'Validé', count=1, ) @@ -1503,7 +1546,7 @@ def test_job_app_status_evaluation_is_final_refused(self): ) self.assertContains( response, - '

Problème constaté

', + 'Problème constaté', count=1, ) @@ -1533,7 +1576,7 @@ def test_job_app_status_evaluation_is_final_refused_2(self): ) self.assertContains( response, - '

Problème constaté

', + 'Problème constaté', count=1, ) @@ -1558,7 +1601,7 @@ def test_notification_pending_show_view_evaluated_admin_criteria(self): self.assertContains( response, f""" - + Revoir ses justificatifs """, @@ -3231,9 +3274,7 @@ def test_post_combined_sanctions(self): class InstitutionEvaluatedJobApplicationViewTest(TestCase): btn_modifier_html = """ - + """ save_text = "Enregistrer le commentaire" @@ -3333,6 +3374,7 @@ def test_recently_closed_campaign(self): Revoir ce justificatif @@ -3473,6 +3515,7 @@ def test_evaluations_from_previous_campaigns_read_only(self): Revoir ce justificatif @@ -3532,7 +3575,7 @@ def test_criterion_validation(self): self.assertNotContains(response, accepte_url) self.assertContains(response, reinit_url) self.assertContains( - response, '

Validé

', html=True + response, ' Validé', html=True ) # refused @@ -3544,7 +3587,7 @@ def test_criterion_validation(self): self.assertNotContains(response, accepte_url) self.assertContains(response, reinit_url) self.assertContains( - response, '

Refusé

', html=True + response, ' Refusé', html=True ) # reinited @@ -3683,7 +3726,7 @@ def test_job_application_state_labels(self): # Unset response = self.client.get(url_view) - self.assertContains(response, "bg-pilotage") + self.assertContains(response, "bg-accent-03") self.assertContains(response, "À traiter") # Refused diff --git a/tests/www/siae_evaluations_views/test_siaes_views.py b/tests/www/siae_evaluations_views/test_siaes_views.py index 0e8c2e4228..03fcc7829b 100644 --- a/tests/www/siae_evaluations_views/test_siaes_views.py +++ b/tests/www/siae_evaluations_views/test_siaes_views.py @@ -5,13 +5,14 @@ from django.core import mail from django.core.files.storage import default_storage from django.urls import reverse -from django.utils import dateformat, timezone +from django.utils import dateformat, html, timezone from freezegun import freeze_time from itou.eligibility.enums import AdministrativeCriteriaLevel from itou.eligibility.models import AdministrativeCriteria, EligibilityDiagnosis from itou.siae_evaluations import enums as evaluation_enums from itou.siae_evaluations.models import EvaluatedAdministrativeCriteria +from itou.utils.templatetags.format_filters import format_approval_number from tests.companies.factories import CompanyMembershipFactory from tests.files.factories import FileFactory from tests.institutions.factories import InstitutionMembershipFactory @@ -64,10 +65,9 @@ def create_evaluated_siae_with_consistent_datas(siae, user, level_1=True, level_ class SiaeJobApplicationListViewTest(TestCase): - refused_html = """\ -

- Refusé -

""" + refused_html = ( + 'Problème constaté' + ) def setUp(self): super().setUp() @@ -186,7 +186,7 @@ def test_redirection_with_submission_freezed_at(self): response, siae_upload_doc_url, ) - SHOW_PROOF_URL_LABEL = "Visualiser le justificatif soumis" + SHOW_PROOF_URL_LABEL = "Voir le justificatif" self.assertNotContains(response, SHOW_PROOF_URL_LABEL) response = self.client.get(siae_upload_doc_url) assert response.status_code == 403 @@ -204,6 +204,7 @@ def test_redirection_with_submission_freezed_at(self): ), ) + @freeze_time("2024-04-08") def test_state_hidden_with_submission_freezed_at(self): not_in_output = "This string should not be in output." evaluated_siae_phase_2bis = EvaluatedSiaeFactory( @@ -219,15 +220,20 @@ def test_state_hidden_with_submission_freezed_at(self): reviewed_at=timezone.now() - relativedelta(days=5), final_reviewed_at=timezone.now(), ) - for evaluated_siae, state in [ - (evaluated_siae_phase_2bis, evaluation_enums.EvaluatedAdministrativeCriteriaState.REFUSED), - (evaluated_siae_phase_3bis, evaluation_enums.EvaluatedAdministrativeCriteriaState.REFUSED_2), + for evaluated_siae, state, approval_number in [ + (evaluated_siae_phase_2bis, evaluation_enums.EvaluatedAdministrativeCriteriaState.REFUSED, "XXXXX2412345"), + ( + evaluated_siae_phase_3bis, + evaluation_enums.EvaluatedAdministrativeCriteriaState.REFUSED_2, + "XXXXX2423456", + ), ]: with self.subTest(evaluated_siae): evaluated_job_app = EvaluatedJobApplicationFactory( evaluated_siae=evaluated_siae, job_application__job_seeker__first_name="Manny", job_application__job_seeker__last_name="Calavera", + job_application__approval__number=approval_number, labor_inspector_explanation=not_in_output, ) EvaluatedAdministrativeCriteriaFactory( @@ -238,17 +244,22 @@ def test_state_hidden_with_submission_freezed_at(self): ) self.client.force_login(self.user) response = self.client.get(self.url(evaluated_siae)) + approval_number_html = format_approval_number(approval_number) self.assertContains( response, - """ -
-
-

- Auto-prescription pour Manny CALAVERA -

+ f""" +
+
+ +
+

PASS IAE {approval_number_html} délivré le 08 Avril 2024

+ Manny CALAVERA +
-
-

transmis

+
+ + Transmis +
""", @@ -258,37 +269,32 @@ def test_state_hidden_with_submission_freezed_at(self): self.assertNotContains(response, not_in_output) self.assertNotContains(response, self.refused_html, html=True) + @freeze_time("2024-04-08") def test_application_shown_after_submission_freeze_phase_3bis(self): test_data = [ ( evaluation_enums.EvaluatedAdministrativeCriteriaState.ACCEPTED, - '

validé

', + "XXXXX2412345", + 'Validé', """ -
-

Bénéficiaire du RSA

-
-
-

- Validé -

-
+ Validé +
+ Bénéficiaire du RSA """, ), ( evaluation_enums.EvaluatedAdministrativeCriteriaState.REFUSED, - '

problème constaté

', - f""" -
-

Bénéficiaire du RSA

-
-
- {self.refused_html} -
+ "XXXXX2423456", + self.refused_html, + """ + Refusé +
+ Bénéficiaire du RSA """, ), ] brsa = AdministrativeCriteria.objects.get(name="Bénéficiaire du RSA") - for state, expected_jobapp_html, expected_criteria_html in test_data: + for state, approval_number, expected_jobapp_html, expected_criteria_html in test_data: with self.subTest(state): evaluated_siae_phase_3bis = EvaluatedSiaeFactory( evaluation_campaign__evaluations_asked_at=timezone.now() - relativedelta(days=10), @@ -303,6 +309,7 @@ def test_application_shown_after_submission_freeze_phase_3bis(self): evaluated_siae=evaluated_siae_phase_3bis, job_application__job_seeker__first_name="Manny", job_application__job_seeker__last_name="Calavera", + job_application__approval__number=approval_number, ) EvaluatedAdministrativeCriteriaFactory( evaluated_job_application=evaluated_job_app, @@ -311,19 +318,22 @@ def test_application_shown_after_submission_freeze_phase_3bis(self): submitted_at=timezone.now() - relativedelta(days=8), review_state=state, ) + approval_number_html = format_approval_number(approval_number) self.client.force_login(self.user) response = self.client.get(self.url(evaluated_siae_phase_3bis)) self.assertContains( response, f""" -
-
-

- Auto-prescription pour Manny CALAVERA -

+
+
+ +
+

PASS IAE {approval_number_html} délivré le 08 Avril 2024

+ Manny CALAVERA +
-
- {expected_jobapp_html} +
+ {expected_jobapp_html}
""", @@ -332,30 +342,36 @@ def test_application_shown_after_submission_freeze_phase_3bis(self): ) self.assertContains(response, expected_criteria_html, html=True, count=1) + @freeze_time("2024-04-08") def test_state_when_not_sent_before_submission_freeze(self): evaluated_siae = EvaluatedSiaeFactory( evaluation_campaign__evaluations_asked_at=timezone.now() - relativedelta(days=10), siae=self.siae, submission_freezed_at=timezone.now() - relativedelta(days=1), ) + approval_number = "XXXXX2412345" EvaluatedJobApplicationFactory( evaluated_siae=evaluated_siae, job_application__job_seeker__first_name="Manny", job_application__job_seeker__last_name="Calavera", + job_application__approval__number=approval_number, ) self.client.force_login(self.user) response = self.client.get(self.url(evaluated_siae)) + approval_number_html = format_approval_number(approval_number) self.assertContains( response, - """ -
-
-

- Auto-prescription pour Manny CALAVERA -

+ f""" +
+
+ +
+

PASS IAE {approval_number_html} délivré le 08 Avril 2024

+ Manny CALAVERA +
-
-

à traiter

+
+ À traiter
""", @@ -381,9 +397,7 @@ def test_content_with_selected_criteria(self): ) response = self.client.get(self.url(evaluated_job_application.evaluated_siae)) self.assertContains(response, siae_select_criteria_url) - self.assertContains( - response, f"

{evaluated_administrative_criteria.administrative_criteria.name}

", html=True - ) + self.assertContains(response, html.escape(evaluated_administrative_criteria.administrative_criteria.name)) self.assertContains(response, siae_upload_doc_url) # Freeze submission @@ -391,19 +405,20 @@ def test_content_with_selected_criteria(self): response = self.client.get(self.url(evaluated_job_application.evaluated_siae)) self.assertNotContains(response, siae_select_criteria_url) + self.assertContains(response, html.escape(evaluated_administrative_criteria.administrative_criteria.name)) self.assertContains( - response, f"

{evaluated_administrative_criteria.administrative_criteria.name}

", html=True + response, 'En cours' ) - self.assertContains(response, '

en cours

') self.assertNotContains(response, siae_upload_doc_url) # Transition to adversarial phase evaluated_job_application.evaluated_siae.evaluation_campaign.transition_to_adversarial_phase() response = self.client.get(self.url(evaluated_job_application.evaluated_siae)) + self.assertContains(response, html.escape(evaluated_administrative_criteria.administrative_criteria.name)) self.assertContains( - response, f"

{evaluated_administrative_criteria.administrative_criteria.name}

", html=True + response, + 'À traiter', ) - self.assertContains(response, '

à traiter

') self.assertNotContains(response, siae_select_criteria_url) self.assertContains(response, siae_upload_doc_url) @@ -412,12 +427,12 @@ def test_post_buttons_state(self): evaluated_job_application = create_evaluated_siae_with_consistent_datas(self.siae, self.user) submit_disabled = """ - """ submit_active = """ - """ @@ -454,7 +469,13 @@ def test_post_buttons_state(self): self.assertContains(response, select_criteria) self.assertContains(response, upload_proof) self.assertContains( - response, '

justificatifs téléversés

' + response, + """ + + Justificatifs téléversés + + """, + html=True, ) # criterion submitted @@ -477,12 +498,12 @@ def test_post_buttons_state_with_submission_freezed(self): evaluated_job_application = create_evaluated_siae_with_consistent_datas(self.siae, self.user) submit_disabled = """ - """ submit_active = """ - """