Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feature/guh-home-form
Browse files Browse the repository at this point in the history
  • Loading branch information
@pyDez
pyDez committed Sep 30, 2024
2 parents 47bc4fa + be78eca commit a544a64
Show file tree
Hide file tree
Showing 13 changed files with 211 additions and 188 deletions.
1 change: 1 addition & 0 deletions envergo/static/images/haie_form.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions envergo/static/images/haie_form_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions envergo/static/sass/project.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1853,6 +1853,37 @@ main.demonstrateur_2150 {
}
}

#evaluation-eligibility {
background-color: var(--grey-975-100);

> div {
display: flex;
margin-top: 1rem;

div {
margin-right: 1rem;
}
}

.items-list {
line-height: 1.25rem;
margin-bottom: 0;

li:last-child {
padding-bottom: 0;
}
}
}

.green-check {
color: var(--success-425-625);
}

#moulinette-title {
max-width: 700px;
margin: 1.5rem auto;
}

#moulinette-submit-button {
min-width: 8em;
}
118 changes: 64 additions & 54 deletions envergo/templates/amenagement/moulinette/form.html
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,73 @@
{% load utils %}

{% if display_title %}<h1 class="fr-h2 centered">Simulez votre projet en phase amont !</h1>{% endif %}

<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url "moulinette_result" %}"
id="moulinette-form">
{% csrf_token %}

{% include '_form_header.html' with form=form %}

<div id="form-section-coords" class="form-section">

{{ form.lng.as_hidden }}
{{ form.lat.as_hidden }}

{% include '_field_snippet.html' with field=form.address %}

<div class="fr-input-group fr-input-group-map">
<label class="step">
Double-cliquez ou déplacez le marqueur sur la carte pour ajuster
l'emplacement du projet.
</label>
<figure class="fr-content-media">
<div id="map-container" class="ratio-16x9 fr-mt-1w fr-mb-2w fr-raw-link">
<div class="ratio-content">
<div class="leaflet-container">
<div id="map"></div>
</div>
{% if display_title %}
<h1 id="moulinette-title" class="fr-h2 centered">Simulez votre projet en phase amont !</h1>
{% endif %}

<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="moulinette" class="moulinette">
<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url "moulinette_result" %}"
id="moulinette-form">
{% csrf_token %}

{% include '_form_header.html' with form=form %}

<div id="form-section-coords" class="form-section">

{{ form.lng.as_hidden }}
{{ form.lat.as_hidden }}

{% include '_field_snippet.html' with field=form.address %}

<div class="fr-input-group fr-input-group-map">
<label class="step">
Double-cliquez ou déplacez le marqueur sur la carte pour ajuster
l'emplacement du projet.
</label>
<figure class="fr-content-media">
<div id="map-container" class="ratio-16x9 fr-mt-1w fr-mb-2w fr-raw-link">
<div class="ratio-content">
<div class="leaflet-container">
<div id="map"></div>
</div>
</div>
</div>
</figure>

{% if form.lat.errors or form.lng.errors %}
<p class="fr-error-text">
↑
Les coordonnées saisies sont incorrectes
↑
</p>

{% endif %}
</div>
</div>
</figure>

{% if form.lat.errors or form.lng.errors %}
<p class="fr-error-text">
↑
Les coordonnées saisies sont incorrectes
↑
</p>
<div id="form-section-surface" class="form-section">
<div class="fr-mb-3w">
<label class="step">Complétez les informations décrivant le projet</label>
</div>
<p class="hint-header">
<span class="fr-icon-info-fill" aria-hidden="true"></span>
Surfaces à prendre en compte : bâti, voirie, espaces verts, remblais et bassins — impacts définitifs et
temporaires (travaux).
</p>
{% include '_field_snippet.html' with field=form.created_surface %}
{% include '_field_snippet.html' with field=form.final_surface %}
</div>

{% endif %}
</div>
</div>
{% include 'amenagement/moulinette/_form_footer.html' %}
</form>

{% include 'amenagement/moulinette/_form_help_sidebars.html' %}

<div id="form-section-surface" class="form-section">
<div class="fr-mb-3w">
<label class="step">Complétez les informations décrivant le projet</label>
</div>
<p class="hint-header">
<span class="fr-icon-info-fill" aria-hidden="true"></span>
Surfaces à prendre en compte : bâti, voirie, espaces verts, remblais et bassins — impacts définitifs et temporaires (travaux).
</p>
{% include '_field_snippet.html' with field=form.created_surface %}
{% include '_field_snippet.html' with field=form.final_surface %}
</div>

{% include 'amenagement/moulinette/_form_footer.html' %}
</form>

{% include 'amenagement/moulinette/_form_help_sidebars.html' %}
</div>
8 changes: 1 addition & 7 deletions envergo/templates/amenagement/pages/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,7 @@ <h2>
</section>

<section id="simulateur" class="fr-pt-8w fr-pb-5w">
<div class="fr-container">
<div id="moulinette-grid">
<div id="moulinette-col">
<div id="moulinette" class="moulinette">{% show_moulinette_form %}</div>
</div>
</div>
</div>
<div class="fr-container">{% show_moulinette_form %}</div>
</section>

{% endblock %}
Expand Down
51 changes: 45 additions & 6 deletions envergo/templates/evaluations/eval_request_wizard_home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
<h1>Demander un avis réglementaire sur un projet</h1>

<p class="fr-text--lead fr-mb-3w">
Vous êtes instructeur dans un service d'urbanisme ?
L'avis réglementaire EnvErgo vous permet de déterminer si un projet de
construction ou d'aménagement est soumis à une réglementation
environnementale.
Vous travaillez en service instruction urbanisme ?
L'avis EnvErgo vous permet de déterminer si un projet de construction ou d'aménagement est soumis à une
réglementation environnementale.
</p>

<ul class="fr-badge-group fr-mb-3w">
Expand All @@ -34,15 +33,55 @@ <h1>Demander un avis réglementaire sur un projet</h1>
</li>
</ul>

<section class="fr-mb-5w alt">
<div id="evaluation-eligibility" class="fr-container fr-py-3w">
<h2 class="fr-h4">Quand demander un avis réglementaire ?</h2>
<hr>
<div>
<div>
<span class="green-check">✔</span>
</div>
<div>
Tout projet qui aménage <strong>plus de 1 000 m²</strong>
</div>
</div>
<div>
<div>
<span class="green-check">✔</span>
</div>
<div>Un lotissement, un bâtiment agricole, l'extension d'un bâtiment de bureaux...</div>
</div>
<div>
<div>
<span class="green-check">✔</span>
</div>
<div>
Tout projet qui vous <strong>pose question</strong>
</div>
</div>
<div>
<div>❌</div>
<div>
<strong>À l’exception</strong> des projets qui concernent uniquement :
</div>
</div>
<ul class="items-list fr-ml-4w fr-my-O">
<li>une mare ou un plan d’eau</li>
<li>une déchetterie</li>
<li>une station d’épuration</li>
<li>une route, une piste cyclable</li>
</ul>
</div>
</section>
<p>
<a class=" fr-btn fr-fi-arrow-right-line fr-btn--icon-left"
href="{% url 'request_eval_wizard_reset' %}">Commencer la demande</a>
<br />
<small><i>Durée : 1 min 30</i></small>
</p>

<div class="alt hero-alt fr-py-3w fr-mb-5w">
<h2 class="fr-h3">Pourquoi demander un avis réglementaire ?</h2>
<div class="alt fr-p-3w fr-mb-5w">
<h2 class="fr-h4">Pourquoi demander un avis réglementaire ?</h2>
<ul class="roomy">
<li>
<strong>Le projet est examiné par un chargé d’études EnvErgo</strong>, au sein du Ministère de la Transition Écologique
Expand Down
9 changes: 0 additions & 9 deletions envergo/templates/haie/moulinette/_form_header.html
View file

This file was deleted.

61 changes: 39 additions & 22 deletions envergo/templates/haie/moulinette/form.html
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,47 @@
{% load utils %}

{% include 'haie/moulinette/_form_header.html' %}
{% if display_title %}
<h2 id="moulinette-title" class="centered">Commencez à décrire votre projet de travaux sur haies</h2>
{% endif %}
<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="moulinette" class="moulinette">
{% if display_title %}
<p class="fr-text--lead">
Ce simulateur vous permet de connaître instantanément les autorisations à obtenir de l’administration, les
procédures et les délais.
Il est anonyme et sans création de compte.
Département : Indre (36)
</p>
<p class="fr-text--light">Tous les champs sont obligatoires.</p>
{% endif %}
<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url 'moulinette_result' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
id="moulinette-form">
{% csrf_token %}

<form class="fr-mb-3w"
method="post"
novalidate
autocomplete="off"
action="{% url 'moulinette_result' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
id="moulinette-form">
{% csrf_token %}
{% include '_form_header.html' with form=form %}

{% include '_form_header.html' with form=form %}
<!-- Include current query parameters as hidden fields to keep Triage inputs -->
{% for key, value in request.GET.items %}<input type="hidden" name="{{ key }}" value="{{ value }}" />{% endfor %}

<!-- Include current query parameters as hidden fields to keep Triage inputs -->
{% for key, value in request.GET.items %}<input type="hidden" name="{{ key }}" value="{{ value }}" />{% endfor %}
<!-- TODO remove: temporary fix waiting for ticket GUHv1.3 -->
<input type="hidden" name="department" value="36" />
<input type="hidden" name="element" value="haie" />
<input type="hidden" name="travaux" value="arrachage" />

<!-- TODO remove: temporary fix waiting for ticket GUHv1.3 -->
<input type="hidden" name="department" value="36" />
<input type="hidden" name="element" value="haie" />
<input type="hidden" name="travaux" value="arrachage" />
<div class="form-section">
{% include '_radio_snippet.html' with field=form.profil %}
{% include '_radio_snippet.html' with field=form.motif %}
{% include '_radio_snippet.html' with field=form.reimplantation %}
</div>

<div class="form-section">
{% include '_radio_snippet.html' with field=form.profil %}
{% include '_radio_snippet.html' with field=form.motif %}
{% include '_radio_snippet.html' with field=form.reimplantation %}
</div>
{% include 'haie/moulinette/_form_footer.html' %}
</form>

{% include 'haie/moulinette/_form_footer.html' %}
</form>
</div>
</div>
</div>
10 changes: 7 additions & 3 deletions envergo/templates/haie/moulinette/triage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
<div id="moulinette-grid">
<div id="moulinette-col" class="fr-col">
<div id="triage">

<h2 id="moulinette-title" class="centered">Commencez à décrire votre projet de travaux sur haies</h2>
<p class="fr-text--lead">
Ce simulateur vous permet de connaître instantanément les autorisations à obtenir de l’administration, les procédures et les délais.
Il est anonyme et sans création de compte.
Département : Indre (36)
</p>
<p class="fr-text--light">Tous les champs sont obligatoires.</p>
<form class="fr-mb-3w" method="post" novalidate>

{% csrf_token %}
{{ form.department.as_hidden }}
{% include 'haie/moulinette/_form_header.html' with display_title=True %}

{% include '_radio_snippet.html' with field=form.element %}
{% include '_radio_snippet.html' with field=form.travaux %}

Expand Down
Loading

0 comments on commit a544a64

Please sign in to comment.