diff --git a/src/app/form/form.component.html b/src/app/form/form.component.html index 703072ee0b7178bb43d2cf8000aec82b654cfdf9..b1f996227e32664caeac2f95db7b1a635732ea5d 100644 --- a/src/app/form/form.component.html +++ b/src/app/form/form.component.html @@ -859,11 +859,9 @@ <ng-container *ngFor="let equipment of equipmentsAndServices"> <app-checkbox-form *ngIf=" - [ - 'Prêt / don de matériels', - 'Reconditionnements de matériel', - 'Accès à des revues ou livres informatiques et numériques' - ].includes(equipment.module.id) + ['donDeMateriels', 'reconditionnementsDeMateriel', 'accesLivresInformatiques'].includes( + equipment.module.id + ) " [isChecked]="isInArray(equipment.module.id, 'equipmentsAndServices')" [text]="equipment.module.text" diff --git a/src/app/shared/enum/labels.emum.ts b/src/app/shared/enum/labels.emum.ts index c8a2030d5e221f737b19f1654c321596f92c2c60..9b17a8e80e8cc1f61a8e7f845b7f8da798b69367 100644 --- a/src/app/shared/enum/labels.emum.ts +++ b/src/app/shared/enum/labels.emum.ts @@ -3,4 +3,5 @@ export enum Labels { maisonFranceService = 'Maison france service', aidantsConnect = 'Aidants connect', fabriqueDeTerritoire = 'Fabrique de territoire', + demarcheMetropolitaine = 'Démarches Métropolitaines', } diff --git a/src/assets/form/sprite.svg b/src/assets/form/sprite.svg index a62f1536ad9ba3de6de79162e50f3a5b4463b75b..19114200052fc136dff3a4bbf5fdbdb89dfa903e 100644 --- a/src/assets/form/sprite.svg +++ b/src/assets/form/sprite.svg @@ -269,7 +269,7 @@ </defs> </symbol> -<symbol id="Accès à des revues ou livres informatiques et numériques" viewBox="0 0 35 35" xmlns="http://www.w3.org/2000/svg"> +<symbol id="accesLivresInformatiques" viewBox="0 0 35 35" xmlns="http://www.w3.org/2000/svg"> <path d="M3.68164 4.18183C3.68164 3.90568 3.9055 3.68182 4.18164 3.68182H31.6632C31.9393 3.68182 32.1632 3.90568 32.1632 4.18182V24.4545C32.1632 24.7307 31.9393 24.9546 31.6632 24.9546H4.18164C3.9055 24.9546 3.68164 24.7307 3.68164 24.4546V4.18183Z" fill="white" stroke="#4F4F4F"/> <rect x="3" y="21" width="29" height="4" fill="#4F4F4F" stroke="none"/> <rect x="15.1135" y="25.4546" width="6.36364" height="3.18182" fill="#333333" stroke="none"/> @@ -285,14 +285,14 @@ <rect x="19.0908" y="14.3182" width="4.77273" height="0.795455" rx="0.397727" stroke="none"/> </symbol> -<symbol id="Prêt / don de matériels" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"> +<symbol id="donDeMateriels" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" clip-rule="evenodd" d="M13.6364 8.18182H4.09093C3.33782 8.18182 2.72729 8.79234 2.72729 9.54546V13.6364L13.6364 13.6364V8.18182ZM2.72729 15V23.1818C2.72729 23.9349 3.33782 24.5455 4.09093 24.5455H12.2727H13.6364V15H2.72729ZM16.3637 24.5455H17.7273H25.9091C26.6622 24.5455 27.2728 23.9349 27.2728 23.1818V15H16.3637V24.5455ZM27.2728 13.6364L16.3637 13.6364V8.18182H25.9091C26.6622 8.18182 27.2728 8.79234 27.2728 9.54546V13.6364Z" stroke="none"/> <path d="M17.7272 6.81818H9.10467C7.84184 6.81818 6.81812 5.79445 6.81812 4.53162V4.53162C6.81812 2.65509 8.95378 1.57748 10.4632 2.69239L16.0489 6.81818" fill="none"/> <path d="M12.2728 6.81818H20.8953C22.1582 6.81818 23.1819 5.79445 23.1819 4.53162V4.53162C23.1819 2.65509 21.0462 1.57748 19.5368 2.69239L13.9511 6.81818" fill="none"/> <path d="M12.2727 24.5454V25.9476C12.1734 25.9717 12.0768 26.007 11.9848 26.053L10.0113 27.0398C9.72576 27.1825 9.54541 27.4744 9.54541 27.7936C9.54541 28.259 9.92273 28.6363 10.3882 28.6363H19.6117C20.0772 28.6363 20.4545 28.259 20.4545 27.7936C20.4545 27.4744 20.2741 27.1825 19.9886 27.0398L18.0152 26.053C17.9231 26.007 17.8265 25.9717 17.7272 25.9476V24.5454H12.2727Z" stroke="none" fill="#333333"/> </symbol> -<symbol id="Reconditionnements de matériel" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"> +<symbol id="reconditionnementsDeMateriel" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" clip-rule="evenodd" d="M24.6458 4.07059C23.19 3.6818 21.5723 4.05846 20.4302 5.20056C19.2881 6.34266 18.9115 7.96033 19.3002 9.41611L15.8209 12.8955L18.9064 15.981L22.3858 12.5017C23.8416 12.8904 25.4593 12.5138 26.6013 11.3717C27.7434 10.2296 28.1201 8.61195 27.7313 7.15618L25.5729 9.31462L23.0016 8.80036L22.4873 6.22906L24.6458 4.07059ZM16.8494 18.0381L13.7638 14.9525L9.21799 19.4984C7.76221 19.1096 6.14454 19.4863 5.00244 20.6283C3.86034 21.7705 3.48368 23.3882 3.87247 24.844L6.03106 22.6854L8.60236 23.1996L9.11662 25.7709L6.95807 27.9295C8.41384 28.3182 10.0315 27.9415 11.1736 26.7995C12.3157 25.6574 12.6923 24.0397 12.3035 22.5839L16.8494 18.0381Z" stroke="none" fill="#333333"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M10.2536 6.42804C10.1525 6.19203 9.96439 6.00397 9.72838 5.90282L6.49622 4.51761L5.4677 5.54612L6.85291 8.77828C6.95406 9.0143 7.14212 9.20236 7.37814 9.30351L10.6103 10.6887L10.6164 10.6826L19.0192 19.0855L20.0478 18.057L11.6297 9.63888L10.2536 6.42804Z" fill="#333333" stroke="none"/> <rect x="17.7522" y="19.8494" width="4.36364" height="11.6364" rx="1" transform="rotate(-45 17.7522 19.8494)" stroke="none"/> diff --git a/src/assets/logos/lyon.svg b/src/assets/logos/demarcheMetropolitaine.svg similarity index 100% rename from src/assets/logos/lyon.svg rename to src/assets/logos/demarcheMetropolitaine.svg