Skip to content

Commit 4b971d4

Browse files
DestinyyyyDestinyyyy
authored
chore: search step ui fix, 1-admin info ui fix (#2441)
1 parent 7d62dba commit 4b971d4

File tree

3 files changed

+61
-55
lines changed

3 files changed

+61
-55
lines changed

‎static/js/ui/AutocompleteActivity.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,12 @@ document.addEventListener('DOMContentLoaded', () => {
6363
})
6464

6565
function hideErrorMessage() {
66-
inputElement.form.querySelector('#activite-input-messages').classList.add('fr-hidden')
67-
inputElement.form.querySelector('#activite-input-messages').parentElement.classList.remove('fr-input-group--error')
66+
const el = inputElement.form.querySelector('#activite-input-messages')
67+
68+
if (el && el.parentElement) {
69+
el.classList.add('fr-hidden')
70+
el.parentElement.classList.remove('fr-input-group--error')
71+
}
6872
}
6973

7074
// Dirty hack to support press Key enter (Lib is broken)

‎templates/contrib/1-admin-infos.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h3 class="fr-mb-0">{% translate "Nom et adresse de l'établissement" %}</h3>
115115
<p class="fr-px-3w">{% translate "Champs obligatoires *" %}</p>
116116
<div class="fr-fieldset__content">
117117
<div class="fr-grid-row fr-px-2w fr-pb-1w fr-mb-2w {% if form.errors.activite %}align-items--center{% else %}align-items--end{% endif %}">
118-
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w fr-input-group {% if form.errors.nom %}fr-input-group--error{% endif %} display--flex direction--column align-self--baseline justify-content--end {% if form.errors.activite %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
118+
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w fr-input-group fr-mb-2w fr-mb-md-0 {% if form.errors.nom %}fr-input-group--error{% endif %} display--flex direction--column align-self--baseline justify-content--end {% if form.errors.activite %}fr-mt-auto{% endif %}">
119119
<label class="fr-label" for="id_nom">{% translate "Nom *" %}</label>
120120
{{ form.nom }}
121121
{% if form.errors.nom %}
@@ -140,7 +140,7 @@ <h3 class="fr-mb-0">{% translate "Nom et adresse de l'établissement" %}</h3>
140140
</div>
141141
</div>
142142
<div class="fr-grid-row fr-px-2w fr-pb-1w fr-mb-2w {% if form.errors.voie %}align-items--center{% else %}align-items--end{% endif %}">
143-
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w {% if form.errors.voie %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
143+
<div class="fr-col-12 fr-col-md-6 fr-pr-md-4w {% if form.errors.voie %}fr-mb-2w{% else %}fr-mt-auto fr-mb-2w fr-mb-md-0{% endif %}">
144144
<label class="fr-label" for="id_numero">{% translate "Numéro de la voie" %}</label>
145145
{{ form.numero }}
146146
</div>
@@ -154,7 +154,7 @@ <h3 class="fr-mb-0">{% translate "Nom et adresse de l'établissement" %}</h3>
154154
</div>
155155
</div>
156156
<div class="fr-grid-row fr-px-2w fr-mb-2w fr-mb-2w {% if form.errors.lieu_dit %}align-items--center{% else %}align-items--end{% endif %}">
157-
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-pr-md-4w {% if form.errors.code_postal %}fr-input-group--error{% endif %} {% if form.errors.lieu_dit %}fr-mb-2w{% else %}fr-mb-2 fr-mb-md-0{% endif %}">
157+
<div class="fr-col-12 fr-col-md-6 fr-input-group fr-pr-md-4w {% if form.errors.code_postal %}fr-input-group--error{% endif %} {% if form.errors.lieu_dit %}fr-mb-2w{% else %}fr-mt-auto fr-mb-2w fr-mb-md-0{% endif %}">
158158
<label class="fr-label" for="id_code_postal">{% translate "Code postal *" %}</label>
159159
{{ form.code_postal }}
160160
{% if form.errors.code_postal %}

‎templates/contrib/forms/search.html‎

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<ul class="list-group">
4545
</ul>
4646
</div>
47-
<div class="fr-mt-1w fr-messages-group {% if not form.activite.errors %}fr-hidden{% endif %}"
47+
<div class="fr-mt-1w fr-messages-group {% if not form.activite.errors and not form.what.errors %}fr-hidden{% endif %}"
4848
id="activite-input-messages">
4949
{# Voluntary putting what errors as this a common error for both fields (what and activite) #}
5050
{% if form.what.errors %}
@@ -56,57 +56,59 @@
5656
</div>
5757
</div>
5858
</div>
59-
<div class="fr-col-12 fr-col-lg-4 search-where-field fr-input-group {% if form.where.errors %}fr-input-group--error{% endif %}">
60-
<label for="where-input">
61-
{% translate "Où ?" %}<span class="asteriskField"></span>
62-
<span class="fr-hint-text">{% translate "Adresse, département ou commune" %}</span>
63-
</label>
64-
<div class="position--relative">
65-
<input id="where-input"
66-
class="autocomplete-input fr-input"
67-
type="search"
68-
dir="ltr"
69-
spellcheck="false"
70-
autocomplete="off"
71-
autocapitalize="off"
72-
data-autocomplete-departments="off"
73-
{% if "where" in request.GET %} value="{{ where|default:request.GET.where }}" {% else %} value="{{ where }}" {% endif %}
74-
name="where"
75-
placeholder="Lyon, 12 rue des prés Nantes">
76-
<ul class="list-group autocomplete-result-list rounded-only-bottom">
77-
</ul>
78-
<div class="fr-messages-group {% if not form.where.errors %}fr-hidden{% endif %}"
79-
id="where-input-messages"
80-
aria-live="polite">
81-
<p class="fr-message fr-message--error" id="where-input-message-error">
82-
{% translate "Veuillez renseigner une adresse." %}
83-
</p>
59+
<div class="fr-col-12 fr-col-lg-4 search-where-field">
60+
<div class="fr-input-group {% if form.where.errors %}fr-input-group--error{% endif %}">
61+
<label for="where-input">
62+
{% translate "Où ?" %}<span class="asteriskField"></span>
63+
<span class="fr-hint-text">{% translate "Adresse, département ou commune" %}</span>
64+
</label>
65+
<div class="position--relative">
66+
<input id="where-input"
67+
class="autocomplete-input fr-input"
68+
type="search"
69+
dir="ltr"
70+
spellcheck="false"
71+
autocomplete="off"
72+
autocapitalize="off"
73+
data-autocomplete-departments="off"
74+
{% if "where" in request.GET %} value="{{ where|default:request.GET.where }}" {% else %} value="{{ where }}" {% endif %}
75+
name="where"
76+
placeholder="Lyon, 12 rue des prés Nantes">
77+
<ul class="list-group autocomplete-result-list rounded-only-bottom">
78+
</ul>
79+
<div class="fr-messages-group {% if not form.where.errors %}fr-hidden{% endif %}"
80+
id="where-input-messages"
81+
aria-live="polite">
82+
<p class="fr-message fr-message--error" id="where-input-message-error">
83+
{% translate "Veuillez renseigner une adresse." %}
84+
</p>
85+
</div>
8486
</div>
87+
<input type="hidden"
88+
name="lat"
89+
{% if "lat" in request.GET %} value="{{ lat|default:request.GET.lat }}" {% else %} value="{{ lat }}" {% endif %}>
90+
<input type="hidden"
91+
name="lon"
92+
{% if "lon" in request.GET %} value="{{ lon|default:request.GET.lon }}" {% else %} value="{{ lon }}" {% endif %}>
93+
<input type="hidden"
94+
name="code"
95+
{% if "code" in request.GET %} value="{{ code|default:request.GET.code }}" {% else %} value="{{ code }}" {% endif %}>
96+
<input type="hidden"
97+
name="ban_id"
98+
{% if "ban_id" in request.GET %} value="{{ ban_id|default:request.GET.ban_id }}" {% else %} value="{{ ban_id }}" {% endif %}>
99+
<input type="hidden"
100+
name="postcode"
101+
{% if "postcode" in request.GET %} value="{{ postcode|default:request.GET.postcode }}" {% else %} value="{{ postcode }}" {% endif %}>
102+
<input type="hidden"
103+
name="search_type"
104+
{% if "search_type" in request.GET %} value="{{ search_type|default:request.GET.search_type }}" {% else %} value="{{ search_type }}" {% endif %}>
105+
<input type="hidden"
106+
name="street_name"
107+
{% if "street_name" in request.GET %} value="{{ street_name|default:request.GET.street_name }}" {% else %} value="{{ street_name }}" {% endif %}>
108+
<input type="hidden"
109+
name="municipality"
110+
{% if "municipality" in request.GET %} value="{{ municipality|default:request.GET.municipality }}" {% else %} value="{{ municipality }}" {% endif %}>
85111
</div>
86-
<input type="hidden"
87-
name="lat"
88-
{% if "lat" in request.GET %} value="{{ lat|default:request.GET.lat }}" {% else %} value="{{ lat }}" {% endif %}>
89-
<input type="hidden"
90-
name="lon"
91-
{% if "lon" in request.GET %} value="{{ lon|default:request.GET.lon }}" {% else %} value="{{ lon }}" {% endif %}>
92-
<input type="hidden"
93-
name="code"
94-
{% if "code" in request.GET %} value="{{ code|default:request.GET.code }}" {% else %} value="{{ code }}" {% endif %}>
95-
<input type="hidden"
96-
name="ban_id"
97-
{% if "ban_id" in request.GET %} value="{{ ban_id|default:request.GET.ban_id }}" {% else %} value="{{ ban_id }}" {% endif %}>
98-
<input type="hidden"
99-
name="postcode"
100-
{% if "postcode" in request.GET %} value="{{ postcode|default:request.GET.postcode }}" {% else %} value="{{ postcode }}" {% endif %}>
101-
<input type="hidden"
102-
name="search_type"
103-
{% if "search_type" in request.GET %} value="{{ search_type|default:request.GET.search_type }}" {% else %} value="{{ search_type }}" {% endif %}>
104-
<input type="hidden"
105-
name="street_name"
106-
{% if "street_name" in request.GET %} value="{{ street_name|default:request.GET.street_name }}" {% else %} value="{{ street_name }}" {% endif %}>
107-
<input type="hidden"
108-
name="municipality"
109-
{% if "municipality" in request.GET %} value="{{ municipality|default:request.GET.municipality }}" {% else %} value="{{ municipality }}" {% endif %}>
110112
</div>
111113
</div>
112114
<div>

0 commit comments

Comments
 (0)