Skip to content

Commit

Permalink
Fix OS-597: En tant que gestionnaire CDD, je souhaite avoir une entré…
Browse files Browse the repository at this point in the history 
…e de checklist "Projet de recherche", afin de me permettre d'analyser le dossier du candidat doctorant
  • Loading branch information
@Gagaro
Gagaro committed Oct 17, 2024
1 parent e66138d commit c3ef2d0
Show file tree
Hide file tree
Showing 7 changed files with 308 additions and 116 deletions.
18 changes: 17 additions & 1 deletion ddd/admission/doctorat/preparation/domain/model/statut_checklist.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,23 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt

onglet_projet_recherche = ConfigurationOngletChecklist(
identifiant=OngletsChecklist.projet_recherche,
statuts=[],
statuts=[
ConfigurationStatutChecklist(
identifiant='A_TRAITER',
libelle=_('To be processed'),
statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
),
ConfigurationStatutChecklist(
identifiant='A_COMPLETER',
libelle=_('To be completed'),
statut=ChoixStatutChecklist.GEST_BLOCAGE,
),
ConfigurationStatutChecklist(
identifiant='VALIDE',
libelle=_('Validated'),
statut=ChoixStatutChecklist.GEST_REUSSITE,
),
],
)

onglet_decision_facultaire = ConfigurationOngletChecklist(
Expand Down
9 changes: 3 additions & 6 deletions locale/en/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2478,13 +2478,13 @@ msgstr ""
msgid "Doctorate free additional approval conditions"
msgstr ""

msgid "Doctorate working list"
msgid "Doctorate thesis field"
msgstr ""

msgid "Doctorate working lists"
msgid "Doctorate working list"
msgstr ""

msgid "Doctorate thesis field"
msgid "Doctorate working lists"
msgstr ""

msgid "Document"
Expand Down Expand Up @@ -8035,9 +8035,6 @@ msgstr ""
msgid "Work contract should be set when funding type is set to work contract"
msgstr ""

msgid "Work in progress"
msgstr ""

msgid "Work contract type"
msgstr ""

Expand Down
9 changes: 3 additions & 6 deletions locale/fr_BE/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2702,15 +2702,15 @@ msgstr "Condition complémentaire d'acceptation libre doctorale"
msgid "Doctorate free additional approval conditions"
msgstr "Conditions complémentaires d'acceptation libres doctorales"

msgid "Doctorate thesis field"
msgstr "Domaine de la thèse de doctorat"

msgid "Doctorate working list"
msgstr "Liste de travail doctorale"

msgid "Doctorate working lists"
msgstr "Listes de travail doctorales"

msgid "Doctorate thesis field"
msgstr "Domaine de la thèse de doctorat"

msgid "Document"
msgstr "Document"

Expand Down Expand Up @@ -8915,9 +8915,6 @@ msgstr ""
"Le contrat de travail doit être renseigné quand le type de financement est "
"un contrat de travail"

msgid "Work in progress"
msgstr "En cours de réalisation"

msgid "Work contract type"
msgstr "Type de contrat de travail"

Expand Down
8 changes: 7 additions & 1 deletion templates/admission/doctorate/checklist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,16 @@

{% with initial=original_admission.checklist.initial.projet_recherche current=original_admission.checklist.current.projet_recherche next_url=next_base_url|add:'projet_recherche' %}
<div role="tabpanel" class="tab-pane" id="projet_recherche">
<p>{% translate 'Work in progress' %}</p>
<div class="form-group btn-group status-group" role="group">
{% translate initial.libelle as initial_state_label %}
{% checklist_state_button tab='projet_recherche' label=initial_state_label icon='user' state=initial.statut class='muted' %}
{% checklist_state_button tab='projet_recherche' label=_("To be completed") icon='circle-stop' state='GEST_BLOCAGE' class='danger' %}
{% checklist_state_button tab='projet_recherche' label=_("Validated") icon='check' state='GEST_REUSSITE' class='success' %}
</div>

{% bootstrap_form comment_forms.choix_formation %}
{% include "admission/doctorate/includes/checklist/projet_recherche_detail.html" %}

<div class="info-part">
</div>
</div>
Expand Down
208 changes: 107 additions & 101 deletions templates/admission/doctorate/details/includes/supervision_member_entry.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,129 +56,135 @@
</em>
</div>

{% has_perm 'admission.set_reference_promoter' as can_set_reference_promoter %}
{% if can_set_reference_promoter and type == 'PROMOTER' and member.matricule and member.uuid != supervision.promoteur_reference and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<form method="post" action="{{ set_reference_promoter_url }}">
{% csrf_token %}
<button type="submit" class="btn btn-default" name="set_reference_promoter">
<i class="fas fa-angles-up"></i>
{% trans "Designate as lead supervisor" %}
</button>
</form>
{% endif %}

{% has_perm 'admission.edit_external_supervision_member' as can_edit_external_supervision_member %}
{% if can_edit_external_supervision_member and member.est_externe and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<button
type="button"
class="btn btn-default pull-right"
data-toggle="collapse"
data-target="#edit_external_member_form-{{ member.uuid }}"
>
<i class="fas fa-pencil"></i>
{% trans "Edit" %}
</button>
{% endif %}

{% has_perm 'admission.remove_supervision_member' as can_remove_supervision_member %}
{% if can_remove_supervision_member and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<a href="{{ remove_url }}" class="btn btn-danger pull-right">
<i class="fas fa-trash-alt"></i>
{% trans "Remove" %}
</a>
{% endif %}

{# Action buttons #}
{% has_perm 'admission.approve_proposition_by_pdf' as can_approve_proposition_by_pdf %}
{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' %}
{% if type != 'PROMOTER' or member.est_externe %}
{% if not hide_actions %}
{% has_perm 'admission.set_reference_promoter' as can_set_reference_promoter %}
{% if can_set_reference_promoter and type == 'PROMOTER' and member.matricule and member.uuid != supervision.promoteur_reference and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<form method="post" action="{{ set_reference_promoter_url }}">
{% csrf_token %}
<button type="submit" class="btn btn-default" name="set_reference_promoter">
<i class="fas fa-angles-up"></i>
{% trans "Designate as lead supervisor" %}
</button>
</form>
{% endif %}

{% has_perm 'admission.edit_external_supervision_member' as can_edit_external_supervision_member %}
{% if can_edit_external_supervision_member and member.est_externe and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<button
type="button"
class="btn btn-default pull-right"
data-toggle="collapse"
data-target="#approve-by-pdf-{{ member.uuid }}"
data-target="#edit_external_member_form-{{ member.uuid }}"
>
<i class="fas fa-file-circle-check"></i>
{% trans "Approve by PDF" %}
<i class="fas fa-pencil"></i>
{% trans "Edit" %}
</button>
{% endif %}
{% endif %}

{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' and not member.matricule and admission.statut == "EN_BROUILLON" %}
<button
class="btn btn-default pull-right"
data-toggle="collapse"
data-target="#resend-invite-{{ member.uuid }}"
>
<i class="fas fa-envelope-open-text"></i>
{% trans "Resend invitation" %}
</button>
{% endif %}


{# Action buttons #}
<div class="panel-group" style="flex-basis: 100%;">

{% has_perm 'admission.remove_supervision_member' as can_remove_supervision_member %}
{% if can_remove_supervision_member and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
<a href="{{ remove_url }}" class="btn btn-danger pull-right">
<i class="fas fa-trash-alt"></i>
{% trans "Remove" %}
</a>
{% endif %}

{# Action buttons #}
{% has_perm 'admission.approve_proposition_by_pdf' as can_approve_proposition_by_pdf %}
{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' %}
{% if type != 'PROMOTER' or member.est_externe %}
{% panel _("Approve by PDF") id="approve-by-pdf-"|add:member.uuid additional_class="collapse" %}
<form action="{% url 'admission:doctorate:update:approve-by-pdf' uuid=admission.uuid %}" method="post">
<button
class="btn btn-default pull-right"
data-toggle="collapse"
data-target="#approve-by-pdf-{{ member.uuid }}"
>
<i class="fas fa-file-circle-check"></i>
{% trans "Approve by PDF" %}
</button>
{% endif %}
{% endif %}

{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' and not member.matricule and admission.statut == "EN_BROUILLON" %}
<button
class="btn btn-default pull-right"
data-toggle="collapse"
data-target="#resend-invite-{{ member.uuid }}"
>
<i class="fas fa-envelope-open-text"></i>
{% trans "Resend invitation" %}
</button>
{% endif %}


{# Action buttons #}
<div class="panel-group" style="flex-basis: 100%;">
{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' %}
{% if type != 'PROMOTER' or member.est_externe %}
{% panel _("Approve by PDF") id="approve-by-pdf-"|add:member.uuid additional_class="collapse" %}
<form action="{% url 'admission:doctorate:update:approve-by-pdf' uuid=admission.uuid %}" method="post">
{% csrf_token %}
{{ approve_by_pdf_form.pdf }}
<input type="hidden" name="uuid_membre" value="{{ member.uuid }}" />
<button type="submit" class="btn btn-primary pull-right">
{% blocktrans with first_name=member.prenom last_name=member.nom trimmed %}
Approve on behalf of {{ first_name }} {{ last_name }}
{% endblocktrans %}
</button>
</form>
{% endpanel %}
{% endif %}
{% endif %}

{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' and not member.matricule and admission.statut == "EN_BROUILLON" %}
{% panel _("Resend invitation") id="resend-invite-"|add:member.uuid additional_class="collapse" %}
<form action="{% url 'admission:doctorate:update:resend-invite' uuid=admission.uuid uuid_membre=member.uuid %}" method="post">
{% csrf_token %}
{{ approve_by_pdf_form.pdf }}
<input type="hidden" name="uuid_membre" value="{{ member.uuid }}" />
<button type="submit" class="btn btn-primary pull-right">
{% blocktrans with first_name=member.prenom last_name=member.nom trimmed %}
Approve on behalf of {{ first_name }} {{ last_name }}
{% endblocktrans %}
{% trans "Confirm" %}
</button>
</form>
{% endpanel %}
{% endif %}
{% endif %}

{% if can_approve_proposition_by_pdf and signature.statut == 'INVITED' and not member.matricule and admission.statut == "EN_BROUILLON" %}
{% panel _("Resend invitation") id="resend-invite-"|add:member.uuid additional_class="collapse" %}
<form action="{% url 'admission:doctorate:update:resend-invite' uuid=admission.uuid uuid_membre=member.uuid %}" method="post">

{% if can_edit_external_supervision_member and member.est_externe and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
{% url 'admission:doctorate:update:edit-external-member' uuid=admission.uuid uuid_membre=member.uuid as edit_external_member_url %}
<form method="post" action="{{ edit_external_member_url }}" id="edit_external_member_form-{{ member.uuid }}" class="collapse">
{% csrf_token %}
<input type="hidden" name="uuid_membre" value="{{ member.uuid }}" />
<button type="submit" class="btn btn-primary pull-right">
{% trans "Confirm" %}
</button>
</form>
{% endpanel %}
{% endif %}

{% if can_edit_external_supervision_member and member.est_externe and admission.statut != "EN_ATTENTE_DE_SIGNATURE" %}
{% url 'admission:doctorate:update:edit-external-member' uuid=admission.uuid uuid_membre=member.uuid as edit_external_member_url %}
<form method="post" action="{{ edit_external_member_url }}" id="edit_external_member_form-{{ member.uuid }}" class="collapse">
{% csrf_token %}
{% edit_external_member_form member as edit_external_member_form %}
<div class="">
<div class="panel panel-default col-md-6">
<div class="panel-body">
{% bootstrap_form edit_external_member_form %}
<button type="submit" class="btn btn-primary pull-right" name="edit_external_member_form">
{% trans "Save" context 'admission' %}
</button>
{% edit_external_member_form member as edit_external_member_form %}
<div class="">
<div class="panel panel-default col-md-6">
<div class="panel-body">
{% bootstrap_form edit_external_member_form %}
<button type="submit" class="btn btn-primary pull-right" name="edit_external_member_form">
{% trans "Save" context 'admission' %}
</button>
</div>
</div>
</div>
</div>
</form>
{% endif %}

{% if signature.motif_refus and signature.statut == 'DECLINED' %}
<blockquote><strong>{% trans "Grounds for denied" %}</strong>
{{ signature.motif_refus|linebreaks }}</blockquote>
</form>
{% endif %}
{% endif %}

{% if signature.commentaire_externe %}
<blockquote><strong>{% trans "Comment to the candidate:" %}</strong>
{{ signature.commentaire_externe|linebreaks }}</blockquote>
{% if hide_actions %}
<div class="panel-group" style="flex-basis: 100%;">
{% endif %}

{% if member.matricule == user.person.global_id and signature.commentaire_interne %}
<blockquote><strong>{% trans "Internal comment:" %}</strong>
{{ signature.commentaire_interne|linebreaks }}</blockquote>
{% endif %}
</div>
{% if signature.motif_refus and signature.statut == 'DECLINED' %}
<blockquote><strong>{% trans "Grounds for denied" %}</strong>
{{ signature.motif_refus|linebreaks }}</blockquote>
{% endif %}

{% if signature.commentaire_externe %}
<blockquote><strong>{% trans "Comment to the candidate:" %}</strong>
{{ signature.commentaire_externe|linebreaks }}</blockquote>
{% endif %}

{% if member.matricule == user.person.global_id and signature.commentaire_interne %}
<blockquote><strong>{% trans "Internal comment:" %}</strong>
{{ signature.commentaire_interne|linebreaks }}</blockquote>
{% endif %}
</div>
</div>

{% if signature.pdf and signature.statut == 'APPROVED' %}
Expand Down
Loading

0 comments on commit c3ef2d0

Please sign in to comment.