Skip to content

Commit ebf5209

Browse files
[BUGFIX] Pouvoir valider les écrans d'instructions uniquement sur la dernière page (PIX-14474)
#10391
2 parents 4e0b4b2 + 2470ba2 commit ebf5209

File tree

2 files changed

+29
-40
lines changed

2 files changed

+29
-40
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
1-
import PixCheckbox from '@1024pix/pix-ui/components/pix-checkbox';
2-
import { on } from '@ember/modifier';
3-
import { action } from '@ember/object';
4-
import Component from '@glimmer/component';
5-
import { tracked } from '@glimmer/tracking';
61
import { t } from 'ember-intl';
72

8-
export default class StepFive extends Component {
9-
@tracked checked = false;
3+
<template>
4+
<div class="instructions-content" tabindex="0">
5+
<span class="instructions-content__title">{{t "pages.certification-instructions.steps.5.text"}}</span>
6+
<ul class="instructions-content__list">
7+
<li>{{t "pages.certification-instructions.steps.5.list.1" htmlSafe=true}}</li>
8+
<li>{{t "pages.certification-instructions.steps.5.list.2" htmlSafe=true}}</li>
9+
<li>{{t "pages.certification-instructions.steps.5.list.3" htmlSafe=true}}</li>
10+
<li>{{t "pages.certification-instructions.steps.5.list.4" htmlSafe=true}}</li>
11+
<li>{{t "pages.certification-instructions.steps.5.list.5" htmlSafe=true}}</li>
12+
<li>{{t "pages.certification-instructions.steps.5.list.6" htmlSafe=true}}</li>
13+
<li>{{t "pages.certification-instructions.steps.5.list.7" htmlSafe=true}}</li>
14+
</ul>
15+
<p class="instructions-content__paragraph--light">
16+
<em>{{t "pages.certification-instructions.steps.5.pix-companion"}}</em>
17+
</p>
1018

11-
@action
12-
onChange(event) {
13-
this.checked = !!event.target.checked;
14-
this.args.enableNextButton(this.checked);
15-
}
16-
17-
<template>
18-
<div class="instructions-content" tabindex="0">
19-
<span class="instructions-content__title">{{t "pages.certification-instructions.steps.5.text"}}</span>
20-
<ul class="instructions-content__list">
21-
<li>{{t "pages.certification-instructions.steps.5.list.1" htmlSafe=true}}</li>
22-
<li>{{t "pages.certification-instructions.steps.5.list.2" htmlSafe=true}}</li>
23-
<li>{{t "pages.certification-instructions.steps.5.list.3" htmlSafe=true}}</li>
24-
<li>{{t "pages.certification-instructions.steps.5.list.4" htmlSafe=true}}</li>
25-
<li>{{t "pages.certification-instructions.steps.5.list.5" htmlSafe=true}}</li>
26-
<li>{{t "pages.certification-instructions.steps.5.list.6" htmlSafe=true}}</li>
27-
<li>{{t "pages.certification-instructions.steps.5.list.7" htmlSafe=true}}</li>
28-
</ul>
29-
<p class="instructions-content__paragraph--light">
30-
<em>{{t "pages.certification-instructions.steps.5.pix-companion"}}</em>
31-
</p>
32-
<PixCheckbox {{on "change" this.onChange}}>
33-
<:label>{{t "pages.certification-instructions.steps.5.checkbox-label"}}</:label>
34-
</PixCheckbox>
35-
</div>
36-
</template>
37-
}
19+
</div>
20+
</template>

mon-pix/app/components/certification-instructions/steps.gjs

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import PixButton from '@1024pix/pix-ui/components/pix-button';
2+
import PixCheckbox from '@1024pix/pix-ui/components/pix-checkbox';
3+
import { on } from '@ember/modifier';
24
import { action } from '@ember/object';
35
import { service } from '@ember/service';
46
import Component from '@glimmer/component';
@@ -61,6 +63,7 @@ export default class Steps extends Component {
6163
@action
6264
previousStep() {
6365
this.pageId = this.pageId - 1;
66+
this.isConfirmationCheckboxChecked = false;
6467
}
6568

6669
@action
@@ -76,6 +79,11 @@ export default class Steps extends Component {
7679
}
7780
}
7881

82+
@action
83+
onChange(event) {
84+
this.isConfirmationCheckboxChecked = !!event.target.checked;
85+
}
86+
7987
@action
8088
async submit() {
8189
await this.args.candidate.save({
@@ -85,11 +93,6 @@ export default class Steps extends Component {
8593
});
8694
}
8795

88-
@action
89-
enableNextButton(checked) {
90-
this.isConfirmationCheckboxChecked = checked;
91-
}
92-
9396
<template>
9497
<h2 {{didInsert this.focus}} tabindex="0" class="instructions-step__title">{{this.title}}
9598
<span class="screen-reader-only">{{this.vocalStepIdentifier}}</span>
@@ -108,7 +111,10 @@ export default class Steps extends Component {
108111
<StepFour />
109112
{{/if}}
110113
{{#if (eq this.pageId 5)}}
111-
<StepFive @enableNextButton={{this.enableNextButton}} />
114+
<StepFive />
115+
<PixCheckbox {{on "change" this.onChange}}>
116+
<:label>{{t "pages.certification-instructions.steps.5.checkbox-label"}}</:label>
117+
</PixCheckbox>
112118
{{/if}}
113119

114120
<footer class="instructions-footer">

0 commit comments

Comments
 (0)