Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PASS IAE: utilisation du nouvel encart de PASS dans les formulaires de suspension & prolongation [GEN-2121] #4856

Merged
merged 2 commits into from
Oct 3, 2024
Merged

PASS IAE: utilisation du nouvel encart de PASS dans les formulaires de suspension & prolongation [GEN-2121] #4856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72a65da
suspension: add new approval box in suspend processes
xavfernandez Sep 30, 2024
de3d07a
prolongation: add new approval box in declare_prolongation process
xavfernandez Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions itou/templates/approvals/declare_prolongation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
{% if not preview %}
{# Edit mode. #}
<div class="c-box mb-4">
{% include "approvals/includes/status.html" with common_approval=approval hiring_pending=False %}
</div>
<div class="c-box my-4">{% include "approvals/includes/prolongation_declaration_form.html" %}</div>
<div class="c-box">{% include "approvals/includes/prolongation_declaration_form.html" %}</div>
{% else %}
{# Preview mode: ask for confirmation before committing to DB. #}

Expand All @@ -36,7 +33,7 @@ <h1>
{% endfor %}

{# Show the user a preview of the prolongation. #}
<div class="card my-3">
<div class="card">
<div class="card-body">
<h5 class="h4 card-title">
Vous êtes sur le point de déclarer une prolongation de PASS IAE pour la raison suivante :
Expand Down Expand Up @@ -87,6 +84,9 @@ <h5 class="h4 card-title">
</form>
{% endif %}
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=approval only %}
</div>
</div>
</div>
</section>
Expand Down
8 changes: 4 additions & 4 deletions itou/templates/approvals/suspend.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
{% if not preview %}
{# Edit mode. #}

<div class="c-box mb-4">
{% include "approvals/includes/status.html" with common_approval=approval hiring_pending=False %}
</div>
<div class="c-form">
<form method="post" class="js-prevent-multiple-submit">

Expand Down Expand Up @@ -88,6 +85,9 @@ <h5 class="h4 mb-3 card-title">Vous êtes sur le point de suspendre ce PASS IAE

{% endif %}
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=approval only %}
</div>
</div>
</div>
</section>
Expand Down
5 changes: 4 additions & 1 deletion itou/templates/approvals/suspension_action_choice.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
<div class="c-stepper mb-3 mb-lg-5">
{% include 'approvals/includes/progress_bar.html' with ratio=40 only %}
<p>
Expand Down Expand Up @@ -46,6 +46,9 @@ <h1>
</form>
</div>
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=suspension.approval only %}
</div>
</div>
</div>
</section>
Expand Down
5 changes: 4 additions & 1 deletion itou/templates/approvals/suspension_delete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
<div class="c-stepper mb-3 mb-lg-5">
{% include 'approvals/includes/progress_bar.html' with ratio=80 only %}
<p>
Expand Down Expand Up @@ -52,6 +52,9 @@ <h1>
</form>
</div>
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=suspension.approval only %}
</div>
</div>
</div>
</section>
Expand Down
5 changes: 4 additions & 1 deletion itou/templates/approvals/suspension_update.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
<div class="c-form">
<form method="post" class="js-prevent-multiple-submit">

Expand All @@ -31,6 +31,9 @@ <h1>
</form>
</div>
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=suspension.approval only %}
</div>
</div>
</div>
</section>
Expand Down
5 changes: 4 additions & 1 deletion itou/templates/approvals/suspension_update_enddate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h1>
<section class="s-section">
<div class="s-section__container container">
<div class="row">
<div class="col-12 col-lg-8">
<div class="col-12 col-lg-8 order-2 order-lg-1">
<div class="c-stepper mb-3 mb-lg-5">
{% include 'approvals/includes/progress_bar.html' with ratio=80 only %}
<p>
Expand All @@ -39,6 +39,9 @@ <h1>
</form>
</div>
</div>
<div class="col-12 col-lg-4 order-1 order-lg-2">
{% include "approvals/includes/box.html" with approval=suspension.approval only %}
</div>
</div>
</div>
</section>
Expand Down
20 changes: 16 additions & 4 deletions itou/www/approvals_views/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@ def suspend(request, approval_id, template_name="approvals/suspend.html"):
@login_required()
def suspension_action_choice(request, suspension_id, template_name="approvals/suspension_action_choice.html"):
siae = get_current_company_or_404(request)
suspension = get_object_or_404(Suspension.objects.select_related("approval__user"), pk=suspension_id)
suspension = get_object_or_404(
Suspension.objects.select_related("approval__user").prefetch_related("approval__suspension_set"),
pk=suspension_id,
)

if not suspension.can_be_handled_by_siae(siae):
raise PermissionDenied()
Expand Down Expand Up @@ -519,7 +522,10 @@ def suspension_update(request, suspension_id, template_name="approvals/suspensio
"""

siae = get_current_company_or_404(request)
suspension = get_object_or_404(Suspension.objects.select_related("approval__user"), pk=suspension_id)
suspension = get_object_or_404(
Suspension.objects.select_related("approval__user").prefetch_related("approval__suspension_set"),
pk=suspension_id,
)

if not suspension.can_be_handled_by_siae(siae):
raise PermissionDenied()
Expand Down Expand Up @@ -551,7 +557,10 @@ def suspension_update(request, suspension_id, template_name="approvals/suspensio
@login_required()
def suspension_update_enddate(request, suspension_id, template_name="approvals/suspension_update_enddate.html"):
siae = get_current_company_or_404(request)
suspension = get_object_or_404(Suspension.objects.select_related("approval__user"), pk=suspension_id)
suspension = get_object_or_404(
Suspension.objects.select_related("approval__user").prefetch_related("approval__suspension_set"),
pk=suspension_id,
)

if not suspension.can_be_handled_by_siae(siae):
raise PermissionDenied()
Expand Down Expand Up @@ -595,7 +604,10 @@ def suspension_delete(request, suspension_id, template_name="approvals/suspensio
"""

siae = get_current_company_or_404(request)
suspension = get_object_or_404(Suspension.objects.select_related("approval__user"), pk=suspension_id)
suspension = get_object_or_404(
Suspension.objects.select_related("approval__user").prefetch_related("approval__suspension_set"),
pk=suspension_id,
)

if not suspension.can_be_handled_by_siae(siae):
raise PermissionDenied()
Expand Down
Loading