Skip to content

Commit 57e83c3

Browse files
[FEATURE] 📝 Révision du texte à propos de pix companion dans l'espace surveillant (PIX-17042)
#11718
2 parents bbee960 + 07b818c commit 57e83c3

File tree

8 files changed

+56
-98
lines changed

8 files changed

+56
-98
lines changed

certif/app/components/session-supervising/header.hbs

+12-14
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,18 @@
5555
</div>
5656
</dl>
5757

58-
{{#if this.isPixCompanionExtensionEnabled}}
59-
<PixNotificationAlert @type="info" @withIcon={{true}}>
60-
{{t "pages.session-supervising.header.companion.message"}}
61-
<a
62-
href={{this.pixCompanionDocumentationUrl}}
63-
target="_blank"
64-
class="link session-supervising-header__companion-link"
65-
rel="noopener noreferrer"
66-
>
67-
{{t "pages.session-supervising.header.companion.link"}}
68-
<PixIcon @name="openNew" @title={{t "navigation.external-link-title"}} />
69-
</a>
70-
</PixNotificationAlert>
71-
{{/if}}
58+
<PixNotificationAlert @type="info" @withIcon={{true}}>
59+
{{t "pages.session-supervising.header.invigilator-documentation.message"}}
60+
<a
61+
href={{this.invigilatorDocumentationUrl}}
62+
target="_blank"
63+
class="link session-supervising-header__invigilator-link"
64+
rel="noopener noreferrer"
65+
>
66+
{{t "pages.session-supervising.header.invigilator-documentation.link"}}
67+
<PixIcon @name="openNew" @title={{t "navigation.external-link-title"}} />
68+
</a>
69+
</PixNotificationAlert>
7270

7371
<PixButton
7472
class="session-supervising-header__download-button"

certif/app/components/session-supervising/header.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ export default class Header extends Component {
3737
return this.router.replaceWith('login-session-supervisor');
3838
}
3939

40-
get pixCompanionDocumentationUrl() {
41-
return this.url.pixCompanionDocumentationUrl;
42-
}
43-
44-
get isPixCompanionExtensionEnabled() {
45-
return this.featureToggles.featureToggles?.isPixCompanionEnabled;
40+
get invigilatorDocumentationUrl() {
41+
return this.url.invigilatorDocumentationUrl;
4642
}
4743
}

certif/app/services/url.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ export default class Url extends Service {
7474
return 'https://form-eu.123formbuilder.com/41052/form';
7575
}
7676

77-
get pixCompanionDocumentationUrl() {
78-
return 'https://cloud.pix.fr/s/fpeEyDpYEkMeqRX';
77+
get invigilatorDocumentationUrl() {
78+
return 'https://cloud.pix.fr/s/S5LHayrjbM4Zn5f';
7979
}
8080

8181
#isFrenchSpoken() {

certif/app/styles/components/session-supervising/header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
margin-right: 8px;
6060
}
6161

62-
&__companion-link {
62+
&__invigilator-link {
6363
align-items: center;
6464
gap: var(--pix-spacing-1x);
6565

certif/tests/integration/components/session-supervising/header-test.js

+27-63
Original file line numberDiff line numberDiff line change
@@ -150,71 +150,35 @@ module('Integration | Component | SessionSupervising::Header', function (hooks)
150150
});
151151
});
152152

153-
module('when the FT_PIX_COMPANION_ENABLED feature toggle is enabled', function () {
154-
test('should display a companion information with documentation url', async function (assert) {
155-
// given
156-
class FeatureTogglesStub extends Service {
157-
featureToggles = { isPixCompanionEnabled: true };
158-
}
159-
this.owner.register('service:featureToggles', FeatureTogglesStub);
160-
const sessionForSupervising = store.createRecord('session-for-supervising', {
161-
id: '12345',
162-
date: '2020-01-01',
163-
time: '12:00:00',
164-
room: 'Salle 12',
165-
examiner: 'Star Lord',
166-
certificationCandidates: [],
167-
});
168-
this.set('sessionForSupervising', sessionForSupervising);
169-
170-
// when
171-
const screen = await renderScreen(hbs`<SessionSupervising::Header @session={{this.sessionForSupervising}} />`);
172-
173-
// then
174-
assert
175-
.dom(screen.getByText('L’extension Pix Companion est désormais obligatoire pour tous les candidats.'))
176-
.exists();
177-
assert
178-
.dom(
179-
screen.getByRole('link', {
180-
name: 'Lien vers la documentation d’installation/activation Ouverture dans une nouvelle fenêtre',
181-
}),
182-
)
183-
.hasAttribute('href', 'https://cloud.pix.fr/s/fpeEyDpYEkMeqRX');
153+
test('should display an invigilator information with documentation url', async function (assert) {
154+
// given
155+
const sessionForSupervising = store.createRecord('session-for-supervising', {
156+
id: '12345',
157+
date: '2020-01-01',
158+
time: '12:00:00',
159+
room: 'Salle 12',
160+
examiner: 'Star Lord',
161+
certificationCandidates: [],
184162
});
185-
});
186-
187-
module('when the FT_PIX_COMPANION_ENABLED feature toggle is disabled', function () {
188-
test('should not display a companion information with documentation url', async function (assert) {
189-
// given
190-
class FeatureTogglesStub extends Service {
191-
featureToggles = { isPixCompanionEnabled: false };
192-
}
193-
this.owner.register('service:featureToggles', FeatureTogglesStub);
194-
const sessionForSupervising = store.createRecord('session-for-supervising', {
195-
id: '12345',
196-
date: '2020-01-01',
197-
time: '12:00:00',
198-
room: 'Salle 12',
199-
examiner: 'Star Lord',
200-
certificationCandidates: [],
201-
});
202-
this.set('sessionForSupervising', sessionForSupervising);
163+
this.set('sessionForSupervising', sessionForSupervising);
203164

204-
// when
205-
const screen = await renderScreen(hbs`<SessionSupervising::Header @session={{this.sessionForSupervising}} />`);
165+
// when
166+
const screen = await renderScreen(hbs`<SessionSupervising::Header @session={{this.sessionForSupervising}} />`);
206167

207-
// then
208-
assert
209-
.dom(screen.queryByText('L’extension Pix Companion est désormais obligatoire pour tous les candidats.'))
210-
.doesNotExist();
211-
assert
212-
.dom(
213-
screen.queryByRole('link', {
214-
name: 'Lien vers la documentation d’installation/activation Ouverture dans une nouvelle fenêtre',
215-
}),
216-
)
217-
.doesNotExist();
218-
});
168+
// then
169+
assert
170+
.dom(
171+
screen.getByText(
172+
'Important : Les problèmes techniques liés aux questions doivent uniquement être gérés pendant le test depuis l’interface du candidat et l’Espace Surveillant (ces signalements ne pourront pas être pris en compte a posteriori).',
173+
),
174+
)
175+
.exists();
176+
assert
177+
.dom(
178+
screen.getByRole('link', {
179+
name: 'Documentation sur la gestion des signalements Ouverture dans une nouvelle fenêtre',
180+
}),
181+
)
182+
.hasAttribute('href', 'https://cloud.pix.fr/s/S5LHayrjbM4Zn5f');
219183
});
220184
});

certif/tests/unit/services/url-test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -284,16 +284,16 @@ module('Unit | Service | url', function (hooks) {
284284
});
285285
});
286286

287-
module('#pixCompanionDocumentationUrl', function () {
288-
test('should return the pix companion documentation url', function (assert) {
287+
module('#invigilatorDocumentationUrl', function () {
288+
test('should return the invigilator documentation url', function (assert) {
289289
// given
290290
const service = this.owner.lookup('service:url');
291291

292292
// when
293-
const pixCompanionDocumentationUrl = service.pixCompanionDocumentationUrl;
293+
const invigilatorDocumentationUrl = service.invigilatorDocumentationUrl;
294294

295295
// then
296-
assert.strictEqual(pixCompanionDocumentationUrl, 'https://cloud.pix.fr/s/fpeEyDpYEkMeqRX');
296+
assert.strictEqual(invigilatorDocumentationUrl, 'https://cloud.pix.fr/s/S5LHayrjbM4Zn5f');
297297
});
298298
});
299299
});

certif/translations/en.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,12 @@
556556
"exit-extra-information": "Exit the session’s invigilation {sessionId}"
557557
},
558558
"address": "Location name",
559-
"companion": {
560-
"link": "Link to installation/activation documentation",
561-
"message": "The Pix Companion extension is now mandatory for all candidates."
562-
},
563559
"information": "Warning, make sure that all the candidates have finished their exam before exiting the invigilation. To resume the invigilation of this session, you will have to enter again it’s session number and it’s password.",
564560
"invigilator": "Invigilator(s)",
561+
"invigilator-documentation": {
562+
"link": "Report management documentation",
563+
"message": "Please note: Any technical problems relating to the questions must only be managed during the test from the candidate interface and the invigilator area (these reports cannot be taken into account afterwards)."
564+
},
565565
"invigilator-kit": {
566566
"extra-information": "Download invigilator’s kit",
567567
"label": "Invigilator’s kit"

certif/translations/fr.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,12 @@
556556
"exit-extra-information": "Quitter la surveillance de la session {sessionId}"
557557
},
558558
"address": "Nom du site",
559-
"companion": {
560-
"link": "Lien vers la documentation d’installation/activation",
561-
"message": "L’extension Pix Companion est désormais obligatoire pour tous les candidats."
562-
},
563559
"information": "Attention, assurez-vous que tous les candidats aient terminé leur test avant de quitter la surveillance. Pour reprendre la surveillance de cette session, vous devrez entrer à nouveau son numéro de session et son mot de passe.",
564560
"invigilator": "Surveillant(s)",
561+
"invigilator-documentation": {
562+
"link": "Documentation sur la gestion des signalements",
563+
"message": "Important : Les problèmes techniques liés aux questions doivent uniquement être gérés pendant le test depuis l’interface du candidat et l’Espace Surveillant (ces signalements ne pourront pas être pris en compte a posteriori)."
564+
},
565565
"invigilator-kit": {
566566
"extra-information": "Télécharger le kit surveillant",
567567
"label": "Kit surveillant"

0 commit comments

Comments
 (0)