Skip to content

Refactor: remove a useless loop #949

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

Open
thibault wants to merge 1 commit into
base: main
Choose a base branch
from
+78 −86
Open

Refactor: remove a useless loop #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 8 deletions envergo/petitions/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,15 +896,11 @@ def get_context_data(self, **kwargs):
context["google_maps_url"] = get_google_maps_centered_url(hedge_data)

regulation_slug = self.kwargs.get("regulation")
if regulation_slug:
try:
current_regulation = context["moulinette"].regulations.get(
regulation=regulation_slug
)
except Regulation.DoesNotExist:
raise Http404()
regulation = context["moulinette"].get_regulation(regulation_slug)
if regulation is None:
raise Http404()

context["current_regulation"] = current_regulation
context["regulation"] = regulation
return context

def get_form_class(self):
Expand Down
152 changes: 74 additions & 78 deletions envergo/templates/haie/petitions/instructor_view_regulation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,95 +6,91 @@

{% load static %}

{% block title %}Instruction du dossier – {{ current_regulation.title }}{% endblock %}
{% block title %}Instruction du dossier – {{ regulation.title }}{% endblock %}

{% block project_view_title %}<h1>{{ current_regulation.title }}</h1>{% endblock %}
{% block project_view_title %}<h1>{{ regulation.title }}</h1>{% endblock %}

{% block project_content %}

<div class="project-inner-content">
{% for regulation in moulinette.regulations %}
{% if regulation.slug == current_regulation.slug %}
<section class="fr-my-3w" id="moulinette-regulation-result">

{% if regulation.has_instruction_guidelines_template %}
<section class="instruction-infos fr-callout fr-callout--blue-cumulus">
<h2 class="fr-h5">Indications pour l'instruction</h2>
{% instructor_view_part "instruction_guidelines" regulation petition_project moulinette %}
<p class="fr-mb-1w">Pour partager le dossier et demander un avis :</p>
<button class="fr-btn fr-mt-0 fr-btn--secondary fr-btn--icon-left fr-icon-user-add-line invitation-token-modal-button"
data-fr-opened="false"
aria-controls="invitation-token-modal">Inviter une personne à consulter le dossier</button>
</section>
{% endif %}

<section class="fr-mb-4w">
<h2 class="fr-mt-4w">Informations saisies par le demandeur</h2>
{% include "haie/petitions/_regulation_form.html" %}
</section>

{% if regulation.has_key_elements_template %}
<section id="section-plantation-evaluation">
<h2 class="fr-h4">Éléments clés</h2>
{% instructor_view_part "key_elements" regulation petition_project moulinette %}
</section>
{% endif %}

<section class="fr-mb-6w">
<h2 class="fr-mt-3w fr-h4">Formulaire complet et pièces jointes</h2>

<a class="fr-btn fr-icon-arrow-right-line fr-btn--icon-right"
href="{% url 'petition_project_instructor_dossier_complet_view' petition_project.reference %}">Voir le dossier complet</a>
<section class="fr-my-3w" id="moulinette-regulation-result">
Copy link
Collaborator Author

@thibault thibault Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

J'ai simplement supprimé les deux lignes {% for … %} {% if regulation.slug… %}. Le reste du diff est simplement la mise à jour de l'identation du template.


{% if regulation.has_instruction_guidelines_template %}
<section class="instruction-infos fr-callout fr-callout--blue-cumulus">
<h2 class="fr-h5">Indications pour l'instruction</h2>
{% instructor_view_part "instruction_guidelines" regulation petition_project moulinette %}
<p class="fr-mb-1w">Pour partager le dossier et demander un avis :</p>
<button class="fr-btn fr-mt-0 fr-btn--secondary fr-btn--icon-left fr-icon-user-add-line invitation-token-modal-button"
data-fr-opened="false"
aria-controls="invitation-token-modal">Inviter une personne à consulter le dossier</button>
</section>
{% endif %}

</section>
<section class="fr-mb-4w">
<h2 class="fr-mt-4w">Informations saisies par le demandeur</h2>
{% include "haie/petitions/_regulation_form.html" %}
</section>

<section>
<div class="title-with-link-container">
<h2 class="fr-mr-8w">Réponse du simulateur</h2>
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right fr-mb-3w"
href="{% url 'petition_project' petition_project.reference %}">Voir la réponse complète</a>
</div>
{% if regulation.has_key_elements_template %}
<section id="section-plantation-evaluation">
<h2 class="fr-h4">Éléments clés</h2>
{% instructor_view_part "key_elements" regulation petition_project moulinette %}
</section>
{% endif %}

<section class="fr-mb-6w">
<h2 class="fr-mt-3w fr-h4">Formulaire complet et pièces jointes</h2>

<a class="fr-btn fr-icon-arrow-right-line fr-btn--icon-right"
href="{% url 'petition_project_instructor_dossier_complet_view' petition_project.reference %}">Voir le dossier complet</a>

</section>

<section>
<div class="title-with-link-container">
<h2 class="fr-mr-8w">Réponse du simulateur</h2>
<a class="fr-link fr-icon-arrow-right-line fr-link--icon-right fr-mb-3w"
href="{% url 'petition_project' petition_project.reference %}">Voir la réponse complète</a>
</div>

<p class="fr-mb-3w">
<em>Avant de déposer son dossier et de remplir le formulaire complet,
le demandeur a réalisé une simulation en localisant et décrivant les haies à détruire.
Voici la réponse du simulateur qui lui a été affichée pour la réglementation « {{ regulation.title }} » :</em>
</p>
<div class="fr-ml-5w">{% include 'haie/moulinette/_result_regulation.html' with regulation=regulation %}</div>

{% if regulation.has_instructor_result_details_template %}
<h3 class="fr-h4">Détails du résultat de la simulation</h3>
{% instructor_view_part "instructor_result_details" regulation petition_project moulinette %}
{% endif %}

{% regulation_has_condition_to_display plantation_evaluation regulation as has_condition_to_display %}
{% if has_condition_to_display %}
<section id="section-plantation-evaluation">
<h3>Acceptabilité de la plantation</h3>
<p class="fr-mb-3w">
<em>Avant de déposer son dossier et de remplir le formulaire complet,
le demandeur a réalisé une simulation en localisant et décrivant les haies à détruire.
Voici la réponse du simulateur qui lui a été affichée pour la réglementation « {{ regulation.title }} » :</em>
<em>Le demandeur a également localisé et décrit les haies à planter en compensation de la destruction.
Le simulateur vérifie une liste de conditions d'acceptabilité de la plantation proposée.
Voici ce qui a été affiché au demandeur pour la réglementation « {{ regulation.title }} » :</em>
</p>
<div class="fr-ml-5w">{% include 'haie/moulinette/_result_regulation.html' with regulation=regulation %}</div>

{% if regulation.has_instructor_result_details_template %}
<h3 class="fr-h4">Détails du résultat de la simulation</h3>
{% instructor_view_part "instructor_result_details" regulation petition_project moulinette %}
{% endif %}

{% regulation_has_condition_to_display plantation_evaluation regulation as has_condition_to_display %}
{% if has_condition_to_display %}
<section id="section-plantation-evaluation">
<h3>Acceptabilité de la plantation</h3>
<p class="fr-mb-3w">
<em>Le demandeur a également localisé et décrit les haies à planter en compensation de la destruction.
Le simulateur vérifie une liste de conditions d'acceptabilité de la plantation proposée.
Voici ce qui a été affiché au demandeur pour la réglementation « {{ regulation.title }} » :</em>
</p>
<div id="hedge-conditions" class="fr-ml-5w">
{% regulation_plantation_conditions plantation_evaluation regulation %}
</div>
</section>
{% endif %}

{% if regulation.has_plantation_condition_details_template and regulation.result != "non_soumis" %}
<section class="fr-mb-5w">
<h4>Précisions sur le calcul d'acceptabilité de la plantation</h4>
{% for criterion in regulation.criteria.all %}
{% instructor_view_part "plantation_condition_details" regulation petition_project moulinette criterion %}
{% endfor %}
</section>
{% endif %}

<div id="hedge-conditions" class="fr-ml-5w">
{% regulation_plantation_conditions plantation_evaluation regulation %}
</div>
</section>
</section>
{% endif %}
{% endfor %}
{% endif %}

{% if regulation.has_plantation_condition_details_template and regulation.result != "non_soumis" %}
<section class="fr-mb-5w">
<h4>Précisions sur le calcul d'acceptabilité de la plantation</h4>
{% for criterion in regulation.criteria.all %}
{% instructor_view_part "plantation_condition_details" regulation petition_project moulinette criterion %}
{% endfor %}
</section>
{% endif %}

</section>
</section>
</div>
{% endblock %}

Expand Down
Loading