From dacebfd6c8b1ccdba3aba66d0b65da20d499ea9a Mon Sep 17 00:00:00 2001 From: Pierre Ecarlat <pecarlat@grandlyon.com> Date: Wed, 27 Mar 2024 09:10:47 +0100 Subject: [PATCH] Make collapsed default to true and changed text in orientation --- .../personal-offer-accompaniment.component.html | 2 +- .../personal-offer-training-type.component.html | 2 +- .../training-type-picker/training-type-picker.component.html | 2 +- .../training-type-picker/training-type-picker.component.ts | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html index e7b46ff2d..e51fc8bc8 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html +++ b/src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.html @@ -1,7 +1,7 @@ <form *ngIf="personalOfferForm" [formGroup]="personalOfferForm"> <div class="title"> <p class="overtitle">{{ structureName }}</p> - <h3>Quelles aides aux démarches en ligne proposez-vous ?</h3> + <h3>Quelles aides aux démarches en ligne proposez-vous dans cette structure ?</h3> <p>Facultatif - Plusieurs choix possibles</p> </div> diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html index fef2754c7..a8a261b1e 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html +++ b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html @@ -1,7 +1,7 @@ <form *ngIf="personalOfferForm" [formGroup]="personalOfferForm"> <div class="title"> <p class="overtitle">{{ structureName }}</p> - <h3>Quels accompagnements au numérique proposez-vous ?</h3> + <h3>Quels accompagnements au numérique proposez-vous dans cette structure ?</h3> <p>Facultatif</p> </div> <app-training-type-picker diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.html b/src/app/shared/components/training-type-picker/training-type-picker.component.html index 1b031728b..03741b86b 100644 --- a/src/app/shared/components/training-type-picker/training-type-picker.component.html +++ b/src/app/shared/components/training-type-picker/training-type-picker.component.html @@ -1,5 +1,5 @@ <div class="trainingContainer"> - <app-collapse *ngFor="let category of categories" [expanded]="isCategorieExpanded(category.id)"> + <app-collapse *ngFor="let category of categories" [expanded]="true"> <app-collapse-header> <div class="collapseHeader"> <app-checkbox diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.ts b/src/app/shared/components/training-type-picker/training-type-picker.component.ts index 373ab003d..3ff3d20af 100644 --- a/src/app/shared/components/training-type-picker/training-type-picker.component.ts +++ b/src/app/shared/components/training-type-picker/training-type-picker.component.ts @@ -47,11 +47,6 @@ export class TrainingTypePickerComponent implements OnInit, OnChanges { }); } - public isCategorieExpanded(id: string): boolean { - const index = this.selectedChoices.findIndex((category) => category.id === id); - return this.selectedChoices[index].modules.length !== 0; - } - public isModulePicked(categorie: Category, module: Module): boolean { const index = this.selectedChoices.findIndex((_categorie) => _categorie.id === categorie.id); if (index === -1) return false; -- GitLab