Fix OS-1460: [V1.C.2] Back-office : Nouvelle gestion liée aux fraudeurs > Pastille d'en-tête, Données perso (dont nouvel état "Avis expert"), Décision SIC

Author: Gagaro

ddd/admission/formation_generale/domain/model/statut_checklist.py

@@ -185,6 +185,11 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
             statut=ChoixStatutChecklist.GEST_BLOCAGE,
             extra={'fraud': '0'},
         ),
+        ConfigurationStatutChecklist(
+            identifiant='AVIS_EXPERT',
+            libelle=_('Expert opinion'),
+            statut=ChoixStatutChecklist.GEST_EN_COURS,
+        ),
         ConfigurationStatutChecklist(
             identifiant='FRAUDEUR',
             libelle=_('Fraudster'),

ddd/admission/formation_generale/dtos/proposition.py

@@ -172,10 +172,8 @@ class PropositionGestionnaireDTO(PropositionDTO):
 
     candidat_a_plusieurs_demandes: bool
 
-    titre_acces: str
     candidat_assimile: bool
-    fraudeur_ares: bool
-    non_financable: bool
+    est_fraudeur: bool
     est_inscription_tardive: bool
 
     profil_soumis_candidat: Optional[ProfilCandidatDTO]

infrastructure/admission/formation_generale/repository/proposition.py

@@ -47,7 +47,7 @@
     BesoinDeDerogationDelegueVrae,
     ChoixStatutPropositionGenerale,
     DerogationFinancement,
-    PoursuiteDeCycle,
+    PoursuiteDeCycle, ChoixStatutChecklist,
 )
 from admission.ddd.admission.formation_generale.domain.model.proposition import (
     Proposition,
@@ -942,6 +942,7 @@ def _load_dto_for_gestionnaire(
         is_french_language = get_language() == settings.LANGUAGE_CODE_FR
         proposition = cls._load_dto(admission)
         poursuite_de_cycle_a_specifier = proposition.formation.type == TrainingType.BACHELOR.name
+        checklist_actuelle = admission.checklist.get('current')
 
         return PropositionGestionnaireDTO(
             **dto_to_dict(proposition),
@@ -975,12 +976,13 @@ def _load_dto_for_gestionnaire(
             poursuite_de_cycle_a_specifier=poursuite_de_cycle_a_specifier,
             poursuite_de_cycle=admission.cycle_pursuit if poursuite_de_cycle_a_specifier else '',
             candidat_a_plusieurs_demandes=admission.has_several_admissions_in_progress,  # from annotation
-            titre_acces='',  # TODO
             candidat_assimile=admission.accounting
             and admission.accounting.assimilation_situation
             and admission.accounting.assimilation_situation != TypeSituationAssimilation.AUCUNE_ASSIMILATION.name,
-            fraudeur_ares=False,  # TODO
-            non_financable=False,  # TODO,
+            est_fraudeur=(
+                checklist_actuelle['donnees_personnelles']['statut'] == ChoixStatutChecklist.GEST_BLOCAGE.name
+                and checklist_actuelle['donnees_personnelles']['extra'].get('fraud') == '1'
+            ) if checklist_actuelle else False,
             est_inscription_tardive=admission.late_enrollment,
             profil_soumis_candidat=(
                 ProfilCandidatDTO.from_dict(

locale/en/LC_MESSAGES/django.po

@@ -142,8 +142,8 @@ msgid ""
 msgstr ""
 
 msgid ""
-"<strong>Warning</strong> the candidate is reported as a <strong>fraudster</"
-"strong>"
+"<strong>Warning</strong> the candidate is reported as <strong>fraudster</"
+"strong> by the ARES"
 msgstr ""
 
 #, python-format
@@ -3013,15 +3013,9 @@ msgstr ""
 msgid "Fraudster"
 msgstr ""
 
-msgid "Fraudster (ARES)"
-msgstr ""
-
 msgid "Fraudster status from ARES"
 msgstr ""
 
-msgid "Fraudster status from SIC"
-msgstr ""
-
 msgid "Free additional approval condition"
 msgstr ""
 
@@ -4442,9 +4436,6 @@ msgstr ""
 msgid "No enrolment application"
 msgstr ""
 
-msgid "No fraud identified"
-msgstr ""
-
 msgid "No general enrolment"
 msgstr ""
 
@@ -4547,9 +4538,6 @@ msgstr ""
 msgid "Not free"
 msgstr ""
 
-msgid "Not fundable"
-msgstr ""
-
 msgctxt "dashboard-indicator admission"
 msgid "Not in order of registration"
 msgstr ""
@@ -5507,6 +5495,9 @@ msgstr ""
 msgid "Requested on"
 msgstr ""
 
+msgid "Requesting fraud status from the ARES"
+msgstr ""
+
 #, python-format
 msgid "Require changes for \"%(object)s\""
 msgstr ""
@@ -5781,6 +5772,11 @@ msgstr ""
 msgid "Sender"
 msgstr ""
 
+msgid ""
+"Sending the authorization is impossible while the personal data are in the "
+"\"Fraudster\" status."
+msgstr ""
+
 msgid "Sent to EPC"
 msgstr ""
 
@@ -7076,6 +7072,9 @@ msgstr ""
 msgid "UUID"
 msgstr ""
 
+msgid "Unable to get fraud status from the ARES at the moment"
+msgstr ""
+
 msgid "Unavailable"
 msgstr ""
 

locale/fr_BE/LC_MESSAGES/django.po

@@ -173,10 +173,11 @@ msgstr ""
 "l’adresse <a href=\"mailto:{mail}\">{mail}</a> :</p>"
 
 msgid ""
-"<strong>Warning</strong> the candidate is reported as a <strong>fraudster</"
-"strong>"
+"<strong>Warning</strong> the candidate is reported as <strong>fraudster</"
+"strong> by the ARES"
 msgstr ""
-"<strong>Attention</strong> le candidat est signalé <strong>fraudeur</strong>"
+"<strong>Attention</strong> le candidat est signalé <strong>fraudeur</strong> "
+"par l'ARES"
 
 #, python-format
 msgid ""
@@ -3303,15 +3304,9 @@ msgstr "Ancien·ne étudiant·e UCLouvain"
 msgid "Fraudster"
 msgstr "Fraudeur"
 
-msgid "Fraudster (ARES)"
-msgstr "Fraudeur (ARES)"
-
 msgid "Fraudster status from ARES"
 msgstr "Statut fraudeur d'après l'ARES"
 
-msgid "Fraudster status from SIC"
-msgstr "Statut fraudeur d'après SIC"
-
 msgid "Free additional approval condition"
 msgstr "Condition complémentaire d'acceptation libre"
 
@@ -4948,9 +4943,6 @@ msgstr ""
 msgid "No enrolment application"
 msgstr "Aucune demande d'inscription n'a été trouvée"
 
-msgid "No fraud identified"
-msgstr "Pas de fraude identifiée"
-
 msgid "No general enrolment"
 msgstr "Aucune inscription en formation générale n'a été trouvée"
 
@@ -5053,9 +5045,6 @@ msgstr "Non finançable - %(rule)s (Établi par %(established_by)s)"
 msgid "Not free"
 msgstr "Non libre"
 
-msgid "Not fundable"
-msgstr "Non-finançable"
-
 msgctxt "dashboard-indicator admission"
 msgid "Not in order of registration"
 msgstr "Pas en ordre d’inscription"
@@ -6084,6 +6073,9 @@ msgstr "Liste des documents réclamés"
 msgid "Requested on"
 msgstr "Réclamé le"
 
+msgid "Requesting fraud status from the ARES"
+msgstr "Demande du statut fraudeur depuis l'ARES"
+
 #, python-format
 msgid "Require changes for \"%(object)s\""
 msgstr "Demander des changements pour \"%(object)s\""
@@ -6364,6 +6356,13 @@ msgstr "Envoyer en faculté"
 msgid "Sender"
 msgstr "Expéditeur"
 
+msgid ""
+"Sending the authorization is impossible while the personal data are in the "
+"\"Fraudster\" status."
+msgstr ""
+"L’envoi de l’autorisation est impossible lorsque les données personnelles "
+"sont à l'état \"Fraudeur\"."
+
 msgid "Sent to EPC"
 msgstr "Envoyée à EPC"
 
@@ -7879,6 +7878,9 @@ msgstr "UE"
 msgid "UUID"
 msgstr "UUID"
 
+msgid "Unable to get fraud status from the ARES at the moment"
+msgstr "Impossible de récupérer l'état fraudeur depuis l'ARES"
+
 msgid "Unavailable"
 msgstr "Non disponible"
 

templates/admission/general_education/checklist.html

@@ -436,22 +436,16 @@
         {% include "admission/general_education/includes/checklist/sic_decision_approval_final_modal.html" %}
         {% include "admission/general_education/includes/checklist/sic_decision_delegate_vrae_dispensation_modal.html" %}
 
+        {% if autres_demandes %}
         <div class="info-part">
-          {% include 'admission/general_education/includes/checklist/sic_decision_sic_fraud_status.html' %}
           <dl>
-            <dt>{% trans "Fraudster status from ARES" %}</dt>
-            <dd class="mb-15">
-              Not implemented yet.
-            </dd>
-
-            {% if autres_demandes %}
               <dt>{% trans "Other demand(s) by the candidate." %}</dt>
               <dd>
                 {% include 'admission/includes/lite_admission_list.html' with with_title=True %}
               </dd>
-            {% endif %}
           </dl>
         </div>
+        {% endif %}
 
       </div>
 
@@ -1068,6 +1062,19 @@
               htmx.trigger('#financabilite-computed-rule', 'financabiliteComputeRule');
           });
 
+          // Update ares result
+          $('#list-group-link-donnees_personnelles').on('show.bs.tab', function() {
+            if (document.getElementById('ares-fraudster-result-donnees_personnelles') !== null) {
+              htmx.trigger('#ares-fraudster-result-donnees_personnelles', 'fraudAresResult');
+            }
+          });
+
+          $('#list-group-link-decision_sic').on('show.bs.tab', function() {
+              if (document.getElementById('ares-fraudster-result-decision_sic') !== null) {
+                htmx.trigger('#ares-fraudster-result-decision_sic', 'fraudAresResult');
+              }
+          });
+
           // Pass the ckeditor data to the form data if necessary
           $(document).on('click', '.ckeditor-form [type="submit"], .ckeditor-form [name="save"]', function(event) {
             $(this).closest('form').find("textarea").each(function() {

…klist/sic_decision_sic_fraud_status.html …ncludes/checklist/fraud_ares_status.htmltemplates/admission/general_education/includes/checklist/sic_decision_sic_fraud_status.html renamed to templates/admission/general_education/includes/checklist/fraud_ares_status.html templates/admission/general_education/includes/checklist/sic_decision_sic_fraud_status.html renamed to templates/admission/general_education/includes/checklist/fraud_ares_status.html

@@ -7,7 +7,7 @@
 * The core business involves the administration of students, teachers,
 * courses, programs and so on.
 *
-* Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+* Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -24,10 +24,23 @@
 * see http://www.gnu.org/licenses/.
 {% endcomment %}
 
-<div id="sic-decision-sic-fraud-status" hx-swap-oob="true">
-  {% if original_admission.checklist.current.donnees_personnelles.statut == 'GEST_BLOCAGE' and original_admission.checklist.current.donnees_personnelles.extra.fraud == '1' %}
-    {% field_data _('Fraudster status from SIC') _('Fraudster') css_class='bg-danger' html_tag='span' %}
-  {% else %}
-    {% field_data _('Fraudster status from SIC') _('No fraud identified') %}
-  {% endif %}
-</div>
+{% if is_fraudster_from_ares_error %}
+  <div class="alert alert-warning">
+    {% blocktranslate %}Unable to get fraud status from the ARES at the moment{% endblocktranslate %}
+  </div>
+{% elif is_fraudster_from_ares is True %}
+  <div class="alert alert-danger">
+    {% blocktranslate %}<strong>Warning</strong> the candidate is reported as <strong>fraudster</strong> by the ARES{% endblocktranslate %}
+  </div>
+{% elif is_fraudster_from_ares is False %}
+{% else %}
+  <div hx-post="{% url view.base_namespace|add:':fraudster-check' uuid=view.kwargs.uuid %}"
+     hx-trigger="fraudAresResult"
+     hx-swap="outerHTML"
+     id="ares-fraudster-result-{{ container_id }}"
+  >
+    <div class="alert alert-info">
+      <i class="fas fa-spinner fa-spin-pulse"></i> {% blocktranslate %}Requesting fraud status from the ARES{% endblocktranslate %}
+    </div>
+  </div>
+{% endif %}

templates/admission/general_education/includes/checklist/personal_data.html

@@ -24,6 +24,7 @@
 {% endcomment %}
 
 {% with initial=original_admission.checklist.initial.donnees_personnelles current=original_admission.checklist.current.donnees_personnelles %}
+  {% include 'admission/general_education/includes/checklist/fraud_ares_status.html' with container_id="donnees_personnelles" %}
   <div
     id="personal-data-statuses"
     class="form-group btn-group status-group"
@@ -32,17 +33,20 @@
   >
     {% concat view.base_namespace ':personal-data-change-status' as personal_data_base_url %}
     {% url personal_data_base_url view.kwargs.uuid initial.statut as initial_status_url %}
+    {% url personal_data_base_url view.kwargs.uuid 'GEST_EN_COURS' as ongoing_status_url %}
     {% url personal_data_base_url view.kwargs.uuid 'GEST_BLOCAGE' as blocking_status_url %}
     {% url personal_data_base_url view.kwargs.uuid 'GEST_REUSSITE' as success_status_url %}
     {% translate initial.libelle as initial_state_label %}
     {% checklist_state_button tab='donnees_personnelles' label=initial_state_label icon='user' state=initial.statut class='muted' htmx_post=initial_status_url %}
     {% checklist_state_button tab='donnees_personnelles' label=_("To be completed") icon='circle-stop' state='GEST_BLOCAGE' class='danger' fraud='0' htmx_post=blocking_status_url %}
+    {% checklist_state_button tab='donnees_personnelles' label=_("Expert opinion") icon='pencil' state='GEST_EN_COURS' class='warning' htmx_post=ongoing_status_url %}
     {% checklist_state_button tab='donnees_personnelles' label=_("Fraudster") icon='circle-stop' state='GEST_BLOCAGE' class='danger' fraud='1' htmx_post=blocking_status_url %}
     {% checklist_state_button tab='donnees_personnelles' label=_("Validated") icon='check' state='GEST_REUSSITE' class='success' htmx_post=success_status_url %}
   </div>
   {% if request.htmx %}
     {# Update the checklist menu item status #}
     {% include "admission/general_education/checklist_menu_item_status.html" with statut=current.statut item_name='donnees_personnelles' %}
+
     {# Update the sic decision statuses #}
     {% if view.is_doctorate %}
       {% include 'admission/doctorate/includes/checklist/sic_decision_statuses.html' with proposition=admission current=original_admission.checklist.current.decision_sic %}

templates/admission/general_education/includes/checklist/sic_decision.html

@@ -29,6 +29,7 @@
       id="sic-decision-container"
       hx-swap-oob="true"
   >
+    {% include 'admission/general_education/includes/checklist/fraud_ares_status.html' with container_id="decision_sic" %}
     {% if view.is_doctorate %}
     {% include 'admission/doctorate/includes/checklist/sic_decision_statuses.html' with proposition=resume_proposition.proposition current=current  %}
     {% else %}

templates/admission/general_education/includes/checklist/sic_decision_approval_final_form.html

@@ -7,7 +7,7 @@
   * The core business involves the administration of students, teachers,
   * courses, programs and so on.
   *
-  * Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+  * Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
   *
   * This program is free software: you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@ -38,9 +38,6 @@ <h3 class="modal-title" id="myModalLabel">{% translate "SIC Approval" %}</h3>
   </div>
 
   <div class="modal-body" style="overflow:auto;">
-    {% if original_admission.checklist.current.donnees_personnelles.statut == 'GEST_BLOCAGE' and original_admission.checklist.current.donnees_personnelles.extra.fraud == '1' %}
-    <div class="alert alert-danger">{% trans "<strong>Warning</strong> the candidate is reported as a <strong>fraudster</strong>" %}</div>
-    {% endif %}
 
     <div class="form-group"><strong>{% trans "Contact language" %}</strong> <span class="label label-admission-primary">{{ admission.langue_contact_candidat|formatted_language }}</span></div>
 
@@ -56,6 +53,7 @@ <h3 class="modal-title" id="myModalLabel">{% translate "SIC Approval" %}</h3>
 
   <div class="modal-footer">
     {% translate 'The authorization can not be done while there is one or more documents to be requested immediately.' as has_requested_documents_disabled_str %}
+    {% translate 'Sending the authorization is impossible while the personal data are in the "Fraudster" status.' as fraudster_disabled_str %}
     {% if original_admission.type_demande == 'ADMISSION' %}
       <a
           class="btn btn-default"
@@ -86,6 +84,13 @@ <h3 class="modal-title" id="myModalLabel">{% translate "SIC Approval" %}</h3>
           data-trigger="hover"
           data-container="body"
           data-content="{{ has_requested_documents_disabled_str|force_escape }}"
+        {% elif original_admission.checklist.current.donnees_personnelles.statut == 'GEST_BLOCAGE' and original_admission.checklist.current.donnees_personnelles.extra.fraud == '1' %}
+          disabled
+          data-toggle="popover"
+          data-placement="auto top"
+          data-trigger="hover"
+          data-container="body"
+          data-content="{{ fraudster_disabled_str|force_escape }}"
         {% else %}
           {% switch "admission_decision_sic_button" %}{% else %}disabled{% endswitch %}
         {% endif %}