From fd608d3ba01d83a27dc5a0b5edde465ed5889dd1 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Mon, 30 May 2022 15:12:52 +0200 Subject: [PATCH 1/4] fix(carto): label orders and label typo --- src/app/shared/enum/typeStructure.enum.ts | 2 +- .../structure-details/structure-details.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/enum/typeStructure.enum.ts b/src/app/shared/enum/typeStructure.enum.ts index f2924fa8d..a024b8b2a 100644 --- a/src/app/shared/enum/typeStructure.enum.ts +++ b/src/app/shared/enum/typeStructure.enum.ts @@ -9,7 +9,7 @@ export enum typeStructureEnum { // En attente de suppression remplacer par CAF CARSAT, Pole Emploi et CCAS grandOrganismePublic = 'Grand organisme public (CAF, CARSAT, Pôle emploi...)', - mdm = 'Maison de la métropole', + mdm = 'Maison de la Métropole', mairie = 'Mairie', CAF = 'CAF', CCAS = 'CCAS', diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index 863703186..7776614f9 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -250,7 +250,7 @@ </div> <div fxLayout="column"> <div fxLayout="row wrap" fxLayoutGap="24px"> - <div *ngFor="let accompagnement of structure.proceduresAccompaniment"> + <div *ngFor="let accompagnement of structure.proceduresAccompaniment.sort()"> <app-logo-card *ngIf="accompagnement != 'autres'" [name]="accompagnement"></app-logo-card> </div> </div> -- GitLab From 63ab053427a46feeaebab96023913d8890807c83 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Mon, 30 May 2022 15:13:17 +0200 Subject: [PATCH 2/4] chore(release): 1.17.1 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a705de6..ad2c7d6a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.17.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.0...v1.17.1) (2022-05-30) + + +### Bug Fixes + +* **carto:** label orders and label typo ([fd608d3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/fd608d3ba01d83a27dc5a0b5edde465ed5889dd1)) + ## [1.17.0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.3...v1.17.0) (2022-05-30) diff --git a/package-lock.json b/package-lock.json index 199f1a8d4..01ea1dbaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pamn", - "version": "1.17.0", + "version": "1.17.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e3d34969a..bbee3985e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pamn", - "version": "1.17.0", + "version": "1.17.1", "scripts": { "ng": "ng", "start": "ng serve --configuration=fr --proxy-config proxy.conf.json", -- GitLab From 92ec4abb078b0abc3ea65d20a3c6852c776e71d9 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Mon, 30 May 2022 15:16:53 +0200 Subject: [PATCH 3/4] fix(carto): update demarches labels --- src/app/shared/enum/demarches.enum.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/enum/demarches.enum.ts b/src/app/shared/enum/demarches.enum.ts index 34ed9bd9e..c363ec9b4 100644 --- a/src/app/shared/enum/demarches.enum.ts +++ b/src/app/shared/enum/demarches.enum.ts @@ -1,7 +1,7 @@ export enum Demarches { - accompagnantCaf = 'Caf', - carsat = 'Carsat', - cpam = 'Cpam', + accompagnantCaf = 'CAF', + carsat = 'CARSAT', + cpam = 'CPAM', espacePublicNumeriqueepn = 'Espace public Numérique', impots = 'Impôts', logement = 'Logements', -- GitLab From 043588de235b3fdb71287a55c95ec2e4aec7afec Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Mon, 30 May 2022 15:19:29 +0200 Subject: [PATCH 4/4] chore(release): 1.17.2 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad2c7d6a6..69c7de370 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.17.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.1...v1.17.2) (2022-05-30) + + +### Bug Fixes + +* **carto:** update demarches labels ([92ec4ab](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/92ec4abb078b0abc3ea65d20a3c6852c776e71d9)) + ### [1.17.1](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.0...v1.17.1) (2022-05-30) diff --git a/package-lock.json b/package-lock.json index 01ea1dbaa..0a0413487 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pamn", - "version": "1.17.1", + "version": "1.17.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bbee3985e..00a155194 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pamn", - "version": "1.17.1", + "version": "1.17.2", "scripts": { "ng": "ng", "start": "ng serve --configuration=fr --proxy-config proxy.conf.json", -- GitLab