From e9ef086a7e6349da97407cd273bdda9f84060750 Mon Sep 17 00:00:00 2001 From: AndreiaPena Date: Tue, 5 Nov 2024 15:20:21 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20certif:=20resize=20col?= =?UTF-8?q?umns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enrolled-candidates/index.gjs | 16 +- certif/app/styles/globals/tables.scss | 4 + .../details/certification-candidates.scss | 287 ++++++++---------- 3 files changed, 141 insertions(+), 166 deletions(-) diff --git a/certif/app/components/sessions/session-details/enrolled-candidates/index.gjs b/certif/app/components/sessions/session-details/enrolled-candidates/index.gjs index 3ef8791f1ec..3bff822c9af 100644 --- a/certif/app/components/sessions/session-details/enrolled-candidates/index.gjs +++ b/certif/app/components/sessions/session-details/enrolled-candidates/index.gjs @@ -343,7 +343,7 @@ export default class EnrolledCandidates extends Component {
{{#if (or @certificationCandidates this.candidatesInStaging)}} - +
- - - {{#if @shouldDisplayPrescriptionScoStudentRegistrationFeature}} - {{/if}} {{#unless @shouldDisplayPrescriptionScoStudentRegistrationFeature}} - {{/unless}} - {{#if this.shouldDisplayAccessibilityAdjustmentNeededFeature}} - {{/if}} diff --git a/certif/app/styles/globals/tables.scss b/certif/app/styles/globals/tables.scss index 2839eefdfd0..550626d9cda 100644 --- a/certif/app/styles/globals/tables.scss +++ b/certif/app/styles/globals/tables.scss @@ -40,6 +40,10 @@ width: 10%; } + &--medium { + width: 12%; + } + &--wide { width: 25%; } diff --git a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss index b65dd32dcad..1a213d674fe 100644 --- a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss +++ b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss @@ -1,195 +1,166 @@ -.certification-candidates-table th:last-child, td:last-child { - padding-right: 0; -} - -.table__empty { - text-align: center; - padding: 2rem 0; - box-sizing: border-box; -} - -.panel-actions { - margin-bottom: 1.25rem; - padding: 1.25rem 2.5rem 0.3rem 2.58rem; -} - -.panel-actions__header { - display: flex; - align-items: center; - flex-flow: row nowrap; - margin-bottom: 2.5rem; -} - -.panel-actions__header-title { - margin-left: 1rem; - - @extend %pix-title-s; -} +.certification-candidates-table { + td,th { + padding-left: 16px; + } -.panel-actions__header-icon { - fill: var(--pix-neutral-500); - width: 2rem; - height: 2rem; + th:last-child,td:last-child { + padding-right: 0; + } } -.panel-actions__action-row { - display: flex; - align-items: center; - padding: 1.25rem 0 1.25rem 1.25rem; - box-sizing: border-box; - flex-flow: row nowrap; - margin-bottom: 1.3rem; - border: 0.062rem solid var(--pix-neutral-100); - border-radius: 1.25rem; - background: var(--pix-neutral-20); - position: relative; -} + .table__empty { + text-align: center; + padding: 2rem 0; + box-sizing: border-box; + } -.panel-actions__action-icon { - fill: var(--pix-neutral-500); - width: 3rem; - height: 3rem; -} + .panel-actions { + margin-bottom: 1.25rem; + padding: 1.25rem 2.5rem 0.3rem 2.58rem; + } -.panel-actions__action-icon svg { - margin: 0 auto; -} + .panel-actions__header { + display: flex; + align-items: center; + flex-flow: row nowrap; + margin-bottom: 2.5rem; + } -.panel-actions__description { - display: flex; - flex-flow: column nowrap; - margin-left: 1.25rem; - width: 65%; - color: var(--pix-neutral-500); - font-size: 0.8rem; -} + .panel-actions__header-title { + margin-left: 1rem; -.panel-actions__title { - @extend %pix-title-xs; + @extend %pix-title-s; + } - color: var(--pix-neutral-800); -} + .panel-actions__header-icon { + fill: var(--pix-neutral-500); + width: 2rem; + height: 2rem; + } -.panel-actions__button { - display: flex; - align-items: center; - padding-right: 0.625rem; - margin-left: auto; - margin-right: 1.25rem; + .panel-actions__action-row { + display: flex; + align-items: center; + padding: 1.25rem 0 1.25rem 1.25rem; + box-sizing: border-box; + flex-flow: row nowrap; + margin-bottom: 1.3rem; + border: 0.062rem solid var(--pix-neutral-100); + border-radius: 1.25rem; + background: var(--pix-neutral-20); + position: relative; + } - > label, a { - min-width: 164px; + .panel-actions__action-icon { + fill: var(--pix-neutral-500); + width: 3rem; + height: 3rem; } -} -.panel-actions__warning { - display: flex; - align-items: center; -} + .panel-actions__action-icon svg { + margin: 0 auto; + } -.panel-actions__warning-icon { - fill: var(--pix-warning-500); - width: 2.2rem; - height: 2.2rem; - margin-left: var(--pix-spacing-1x); -} + .panel-actions__description { + display: flex; + flex-flow: column nowrap; + margin-left: 1.25rem; + width: 65%; + color: var(--pix-neutral-500); + font-size: 0.8rem; + } -.panel-actions-description { + .panel-actions__title { + @extend %pix-title-xs; - &__information { - margin-bottom: 0; + color: var(--pix-neutral-800); } -} -.panel-header { - display: flex; - align-items: center; - color: var(--pix-neutral-500); - padding: 20px; - - &__title { + .panel-actions__button { display: flex; - flex-grow: 1; + align-items: center; + padding-right: 0.625rem; + margin-left: auto; + margin-right: 1.25rem; - @extend %pix-title-s; + > label, a { + min-width: 164px; + } } - &__action { + .panel-actions__warning { display: flex; align-items: center; - cursor: pointer; } - &__mandatory-warning { - padding-top: 4px; - margin-left: 16px; - font-size: 0.82rem; - font-weight: normal; - color: var(--pix-neutral-500); + .panel-actions__warning-icon { + fill: var(--pix-warning-500); + width: 2.2rem; + height: 2.2rem; + margin-left: var(--pix-spacing-1x); } -} -.certification-candidates-table td, .certification-candidates-table th { - padding-left: 16px; -} - -.certification-candidates-table__column-last-name { - width: 160px; -} - -.certification-candidates-table__column-first-name { - width: 130px; -} - -.certification-candidates-table__column-birthdate { - width: 130px; -} - -.certification-candidates-table__external-id { - width: 130px; -} + .panel-actions-description { -.certification-candidates-table__column-time { - width: 50px; - box-sizing: content-box; -} - -.certification-candidates-table__column-accessibility { - width: 64px; -} - -.certification-candidates-table__payment-options { - width: 100px; - box-sizing: content-box; -} + &__information { + margin-bottom: 0; + } + } -.certification-candidates-table__selected-subscriptions { - align-items: center; - display: flex; - gap: 0.5rem; - width: 100px; - box-sizing: content-box; + .panel-header { + display: flex; + align-items: center; + color: var(--pix-neutral-500); + padding: 20px; + + &__title { + display: flex; + flex-grow: 1; + + @extend %pix-title-s; + } + + &__action { + display: flex; + align-items: center; + cursor: pointer; + } + + &__mandatory-warning { + padding-top: 4px; + margin-left: 16px; + font-size: 0.82rem; + font-weight: normal; + color: var(--pix-neutral-500); + } + } - svg { - width: 1rem; - height: 1rem; - fill: var(--pix-neutral-800); + .certification-candidates-table__selected-subscriptions { + align-items: center; + display: flex; + gap: 0.5rem; + width: 100px; + + svg { + width: 1rem; + height: 1rem; + fill: var(--pix-neutral-800); + } } -} -.certification-candidates-actions { - position: relative; - display: flex; - align-items: center; - justify-content: flex-end; - padding-right: 16px; - gap: var(--pix-spacing-2x); + .certification-candidates-actions { + position: relative; + display: flex; + align-items: center; + justify-content: flex-end; + padding-right: 16px; + gap: var(--pix-spacing-2x); - &__display-details { - margin-right: 16px; - } + &__display-details { + margin-right: 16px; + } - &__delete, &__edit { + &__delete, &__edit { display: flex; justify-content: center; From 1161f3f76c2162227481657f4dc187126478e016 Mon Sep 17 00:00:00 2001 From: AndreiaPena Date: Tue, 5 Nov 2024 15:20:38 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=A5=20certif:=20remove=20useless?= =?UTF-8?q?=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- certif/app/components/import-candidates.js | 3 ++- .../sessions/details/certification-candidates.scss | 10 ---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/certif/app/components/import-candidates.js b/certif/app/components/import-candidates.js index ba673ebb48a..4cae07744f6 100644 --- a/certif/app/components/import-candidates.js +++ b/certif/app/components/import-candidates.js @@ -22,7 +22,8 @@ export default class ImportCandidates extends Component { await this.args.reloadCertificationCandidate(); } catch (errorResponse) { const errorMessage = this._handleErrorMessage(errorResponse); - this.notifications.error(htmlSafe(errorMessage), { cssClasses: 'certification-candidates-notification' }); + + this.notifications.error(htmlSafe(errorMessage)); } finally { this.isLoading = false; } diff --git a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss index 1a213d674fe..5f97aec8489 100644 --- a/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss +++ b/certif/app/styles/pages/authenticated/sessions/details/certification-candidates.scss @@ -167,13 +167,3 @@ align-items: center; } } - -.certification-candidates-notification { - p { - margin: 0; - flex-direction: column; - } - b { - font-weight: bold; - } -}
{{#if @shouldDisplayPrescriptionScoStudentRegistrationFeature}} {{t 'pages.sessions.detail.candidates.list.without-details-description'}} @@ -353,17 +353,17 @@ export default class EnrolledCandidates extends Component {
+ {{t 'common.labels.candidate.birth-name'}} + {{t 'common.labels.candidate.firstname'}} + {{t 'common.labels.candidate.birth-date'}} + {{t 'common.labels.candidate.birth-city'}} @@ -371,15 +371,15 @@ export default class EnrolledCandidates extends Component { + {{t 'common.forms.certification-labels.email-results'}} + {{t 'common.forms.certification-labels.extratime'}} + {{t 'common.forms.certification-labels.accessibility'}}