Skip to content

Commit 298cbfd

Browse files
DestinyyyyDestinyyyy
authored
chore: hide child from deleted root questions in the frontend and backend (#2410)
1 parent 9ab6f5e commit 298cbfd

File tree

4 files changed

+59
-52
lines changed

4 files changed

+59
-52
lines changed

‎.talismanrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fileignoreconfig:
1414
- filename: .isort.cfg
1515
checksum: 888e09b1fe8ead28a4561b05842cd852be1ca8a3b86264aa48469514f93cfdd2
1616
- filename: templates/contrib/6-accueil.html
17-
checksum: ff33a16b84affad2023c03bea2fea487abcf6d6aaa314652a8a97b5bc4b43c5e
17+
checksum: 6a2b50478a202eb35bf49d50ff156110eeed68287d545626753b7343bd3e3074
1818
- filename: locale/en/LC_MESSAGES/django.po
1919
checksum: 47299c43a90e25532c8dc508aae0e1b6103bfabbfb35bf86da08a046f8b8e86d
2020
- filename: templates/contrib/0-start.html

‎erp/forms.py‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -216,17 +216,27 @@ def __init__(self, *args, **kwargs):
216216

217217
class ContribAccessibilitePollingStationForm(ContribAccessibiliteForm):
218218
fields_to_remove = (
219-
"entree_dispositif_appel",
220-
"entree_balise_sonore",
221-
"entree_aide_humaine",
222-
"accueil_cheminement_plain_pied",
223-
"accueil_retrecissement",
224-
"accueil_personnels",
225-
"accueil_audiodescription_presence",
226-
"accueil_equipements_malentendants_presence",
227-
"labels",
228-
"labels_familles_handicap",
229-
"labels_autre",
219+
"entree_dispositif_appel", # Root
220+
"entree_dispositif_appel_type", # Child
221+
"entree_balise_sonore", # Root
222+
"entree_aide_humaine", # Root
223+
"accueil_cheminement_plain_pied", # Root
224+
"accueil_cheminement_nombre_marches", # Child
225+
"accueil_cheminement_sens_marches", # Child
226+
"accueil_cheminement_reperage_marches", # Child
227+
"accueil_cheminement_main_courante", # Child
228+
"accueil_cheminement_rampe", # Child
229+
"accueil_cheminement_ascenseur", # Child
230+
"accueil_cheminement_ascenseur_pmr", # Child
231+
"accueil_retrecissement", # Root
232+
"accueil_personnels", # Root
233+
"accueil_audiodescription_presence", # Root
234+
"accueil_audiodescription", # Child
235+
"accueil_equipements_malentendants_presence", # Child
236+
"accueil_equipements_malentendants", # Child
237+
"labels", # Root
238+
"labels_familles_handicap", # Root
239+
"labels_autre", # Root
230240
)
231241
conditionals_to_add = get_conditional_fields_in("polling_station")
232242
conditionals_to_remove = get_conditional_fields_not_in("polling_station")

‎templates/contrib/5-entree.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
{% include "fields/boolradio.html" with field=form.entree_marches_rampe inline=True key="entree_marches_rampe" %}
9696
</div>
9797
</div>
98-
{# todo: bug with entree_balise_sonore and entree_aide_humaine that are blanks #}
9998
{% if form.entree_balise_sonore %}
10099
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
101100
{% include "fields/boolradio.html" with field=form.entree_balise_sonore inline=True key="entree_balise_sonore" %}

‎templates/contrib/6-accueil.html‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,41 +40,39 @@
4040
{% include "fields/boolradio.html" with field=form.accueil_urne_accessibilite inline=True key="accueil_urne_accessibilite" %}
4141
</div>
4242
{% endif %}
43-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
44-
{% if form.accueil_cheminement_plain_pied %}
43+
{% if form.accueil_cheminement_plain_pied %}
44+
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
4545
{% include "fields/boolradio.html" with field=form.accueil_cheminement_plain_pied inline=True key="accueil_cheminement_plain_pied" %}
46-
{% endif %}
47-
<div class="contrib-inputs-section">
48-
{% if form.accueil_cheminement_plain_pied %}<hr class="fr-hr" />{% endif %}
49-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_ascenseur inline=True key="accueil_cheminement_ascenseur" %}
50-
</div>
51-
<div class="contrib-inputs-section">
52-
<hr class="fr-hr" />
53-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_ascenseur_pmr inline=True key="accueil_cheminement_ascenseur_pmr" %}
54-
</div>
55-
<div class="contrib-inputs-section">
56-
<hr class="fr-hr" />
57-
{% include "fields/textarea.html" with field=form.accueil_cheminement_nombre_marches key="accueil_cheminement_nombre_marches" %}
58-
</div>
59-
{% if form.accueil_retrecissement %}
46+
<div class="contrib-inputs-section">
47+
<hr class="fr-hr" />
48+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_ascenseur inline=True key="accueil_cheminement_ascenseur" %}
49+
</div>
50+
<div class="contrib-inputs-section">
51+
<hr class="fr-hr" />
52+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_ascenseur_pmr inline=True key="accueil_cheminement_ascenseur_pmr" %}
53+
</div>
54+
<div class="contrib-inputs-section">
55+
<hr class="fr-hr" />
56+
{% include "fields/textarea.html" with field=form.accueil_cheminement_nombre_marches key="accueil_cheminement_nombre_marches" %}
57+
</div>
6058
<div class="contrib-inputs-section">
6159
<hr class="fr-hr" />
6260
{% include "fields/boolradio.html" with field=form.accueil_retrecissement inline=True key="accueil_retrecissement" %}
6361
</div>
64-
{% endif %}
65-
</div>
66-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
67-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_sens_marches inline=True key="accueil_cheminement_sens_marches" %}
68-
</div>
69-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
70-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_reperage_marches inline=True key="accueil_cheminement_reperage_marches" %}
71-
</div>
72-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
73-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_main_courante inline=True key="accueil_cheminement_main_courante" %}
74-
</div>
75-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
76-
{% include "fields/boolradio.html" with field=form.accueil_cheminement_rampe inline=True key="accueil_cheminement_rampe" %}
77-
</div>
62+
<div class="contrib-inputs-section">
63+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_sens_marches inline=True key="accueil_cheminement_sens_marches" %}
64+
</div>
65+
<div class="contrib-inputs-section">
66+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_reperage_marches inline=True key="accueil_cheminement_reperage_marches" %}
67+
</div>
68+
<div class="contrib-inputs-section">
69+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_main_courante inline=True key="accueil_cheminement_main_courante" %}
70+
</div>
71+
<div class="contrib-inputs-section">
72+
{% include "fields/boolradio.html" with field=form.accueil_cheminement_rampe inline=True key="accueil_cheminement_rampe" %}
73+
</div>
74+
</div>
75+
{% endif %}
7876
{% if form.accueil_personnels %}
7977
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
8078
{% include "fields/boolradio.html" with field=form.accueil_personnels inline=True key="accueil_personnels" %}
@@ -90,16 +88,16 @@
9088
</div>
9189
{% endif %}
9290
</div>
93-
{% endif %}
94-
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
95-
{% if form.accueil_equipements_malentendants_presence %}
96-
{% include "fields/boolradio.html" with field=form.accueil_equipements_malentendants_presence inline=True key="accueil_equipements_malentendants_presence" %}
97-
{% endif %}
98-
<div class="contrib-inputs-section">
99-
{% if form.accueil_equipements_malentendants_presence %}<hr class="fr-hr" />{% endif %}
100-
{% include "fields/checkbox.html" with field=form.accueil_equipements_malentendants inline=False %}
91+
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
92+
{% if form.accueil_equipements_malentendants_presence %}
93+
{% include "fields/boolradio.html" with field=form.accueil_equipements_malentendants_presence inline=True key="accueil_equipements_malentendants_presence" %}
94+
<div class="contrib-inputs-section">
95+
{% if form.accueil_equipements_malentendants_presence %}<hr class="fr-hr" />{% endif %}
96+
{% include "fields/checkbox.html" with field=form.accueil_equipements_malentendants inline=False %}
97+
</div>
98+
{% endif %}
10199
</div>
102-
</div>
100+
{% endif %}
103101
<div class="contrib-inputs-section fr-py-3w fr-px-4w">
104102
{% include "fields/boolradio.html" with field=form.sanitaires_presence inline=True %}
105103
<div class="contrib-inputs-section ">

0 commit comments

Comments
 (0)