From e18c93606c14a41ba0da4a407d7ec94c492f8089 Mon Sep 17 00:00:00 2001
From: Yoan VALLET <ext.sopra.yvallet@grandlyon.com>
Date: Tue, 8 Mar 2022 16:17:38 +0100
Subject: [PATCH 1/9] fix(pwa): add icon for ios
---
src/assets/icons/apple-touch-icon.png | Bin 0 -> 3088 bytes
src/index.html | 3 +++
2 files changed, 3 insertions(+)
create mode 100644 src/assets/icons/apple-touch-icon.png
diff --git a/src/assets/icons/apple-touch-icon.png b/src/assets/icons/apple-touch-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ea999122d9909a379c8d105f4dbbe54022d870
GIT binary patch
literal 3088
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
literal 0
HcmV?d00001
diff --git a/src/index.html b/src/index.html
index 78caed151..774bab5be 100644
--- a/src/index.html
+++ b/src/index.html
@@ -43,6 +43,9 @@
<!-- Favicon -->
<link rel="icon" type="image/x-icon" href="favicon.ico" />
+ <!-- PWA -->
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/icons/apple-touch-icon.png" />
+
<!-- CSS & scripts -->
<link rel="stylesheet" href="https://openlayers.org/en/v4.6.5/css/ol.css" type="text/css" />
<link
--
GitLab
From ad5e3bf7e824c5e0cde1cafa1019035a51aecb07 Mon Sep 17 00:00:00 2001
From: Etienne LOUPIAS <eloupias@grandlyon.com>
Date: Fri, 11 Mar 2022 08:07:04 +0000
Subject: [PATCH 2/9] fix(carto): issue #11 responsive structure details
---
.../structure-details/structure-details.component.scss | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index 2b5a439e1..083fba5be 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -18,17 +18,15 @@ a {
left: 0;
max-width: 980px;
width: 100%;
+ box-sizing: border-box;
height: calc(100vh - #{$header-height} - #{$footer-height});
padding: 0px 24px;
overflow: auto;
@media #{$tablet} {
+ height: calc(100vh - #{$header-height});
.printButton {
display: none !important;
}
-
- .ico-close {
- margin-left: 16px;
- }
}
.printButton {
margin-right: 75px;
--
GitLab
From a13de9a2d184fac6569564a4953b5aeb6a100b04 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Fri, 11 Mar 2022 08:34:56 +0000
Subject: [PATCH 3/9] fix(carto): maker not setting in some case fix(carto):
bug fix when multiple markers were selected
---
src/app/map/components/map.component.ts | 49 ++++++++++++++++++-------
src/app/map/services/map.service.ts | 6 +--
2 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/app/map/components/map.component.ts b/src/app/map/components/map.component.ts
index 35f1387f2..1758fe273 100644
--- a/src/app/map/components/map.component.ts
+++ b/src/app/map/components/map.component.ts
@@ -106,7 +106,7 @@ export class MapComponent implements OnChanges {
);
}
}
- // Handle map marker selection
+ // Handle map marker if none selected
if (changes.selectedMarkerId && this.map) {
this.map.closePopup();
if (changes.selectedMarkerId.currentValue === undefined) {
@@ -115,14 +115,15 @@ export class MapComponent implements OnChanges {
this.getMarkerTypeByStructureId(changes.selectedMarkerId.previousValue)
);
this.map.setView(this.mapOptions.center, this.mapOptions.zoom);
- } else {
- this.mapService.setSelectedMarker(
- changes.selectedMarkerId.currentValue,
- this.getMarkerTypeByStructureId(changes.selectedMarkerId.currentValue)
- );
- this.centerLeafletMapOnMarker(changes.selectedMarkerId.currentValue);
}
}
+ // Handle map marker if one is set with url or selected
+ if (this.mapService.getMarker(this.selectedMarkerId)) {
+ this.mapService.setSelectedMarker(this.selectedMarkerId, this.getMarkerTypeByStructureId(this.selectedMarkerId));
+ this.centerLeafletMapOnMarker(this.selectedMarkerId);
+ }
+
+ this.closePreviousMarker(changes);
if (changes.structuresToPrint) {
if (changes.structuresToPrint.currentValue < changes.structuresToPrint.previousValue) {
@@ -205,7 +206,7 @@ export class MapComponent implements OnChanges {
}
private getStructuresPositions(structureList: Structure[]): void {
- structureList.forEach((structure: Structure) => {
+ for (const structure of structureList) {
this.mapService
.createMarker(
structure.getLat(),
@@ -219,7 +220,8 @@ export class MapComponent implements OnChanges {
.on('popupopen', () => {
this.currentStructure = structure;
});
- });
+ }
+
// Reset location if active to prevent graphical issue
if (this.locate) {
this.lc.stop();
@@ -329,11 +331,13 @@ export class MapComponent implements OnChanges {
}
private centerLeafletMapOnMarker(markerId: string): void {
- const marker = this.mapService.getMarker(markerId);
- const latLngs = [marker.getLatLng()];
- const markerBounds = latLngBounds(latLngs);
- // paddingTopLeft is used for centering marker because of structure details pane
- this.map.fitBounds(markerBounds, { paddingTopLeft: [300, 0] });
+ if (this.mapService.getMarker(markerId)) {
+ const marker = this.mapService.getMarker(markerId);
+ const latLngs = [marker.getLatLng()];
+ const markerBounds = latLngBounds(latLngs);
+ // paddingTopLeft is used for centering marker because of structure details pane
+ this.map.fitBounds(markerBounds, { paddingTopLeft: [300, 0] });
+ }
}
private initMetropoleLayer(): void {
@@ -347,4 +351,21 @@ export class MapComponent implements OnChanges {
)
);
}
+
+ /**
+ * Close previous markers
+ * - if strucure is closed
+ * - if a new marker is selected
+ */
+ private closePreviousMarker(changes: SimpleChanges): void {
+ if (
+ (changes.selectedMarkerId?.currentValue === undefined && changes.selectedMarkerId?.previousValue) ||
+ changes.selectedMarkerId?.currentValue !== changes.selectedMarkerId?.previousValue
+ ) {
+ this.mapService.setUnactiveMarker(
+ changes.selectedMarkerId.previousValue,
+ this.getMarkerTypeByStructureId(changes.selectedMarkerId.previousValue)
+ );
+ }
+ }
}
diff --git a/src/app/map/services/map.service.ts b/src/app/map/services/map.service.ts
index c65d92585..75cd373b1 100644
--- a/src/app/map/services/map.service.ts
+++ b/src/app/map/services/map.service.ts
@@ -122,9 +122,7 @@ export class MapService {
public setUnactiveMarker(id: string, type: MarkerType = MarkerType.structure): void {
// To skip mouseleave when user emit click on structure list
- if (!this.isMarkerActive) {
- this.getMarker(id).setIcon(this.getMarkerIcon(type));
- }
+ this.getMarker(id)?.setIcon(this.getMarkerIcon(type));
this.isMarkerActive = false;
}
@@ -144,7 +142,7 @@ export class MapService {
*/
public setSelectedMarker(id: string, type: MarkerType = MarkerType.structure): void {
if (id) {
- this.getMarker(id).setIcon(this.getActiveMarkerIcon(type));
+ this.getMarker(id)?.setIcon(this.getActiveMarkerIcon(type));
this.isMarkerActive = true;
}
}
--
GitLab
From 0b5c9130bbb6d9f0a096820d29137b5c0fc0d03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marl=C3=A8ne=20SIMONDANT?= <msimondant@grandlyon.com>
Date: Wed, 16 Mar 2022 13:47:32 +0000
Subject: [PATCH 4/9] feat/US91-fix-linebreak-display
---
.../structure-details/structure-details.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3e30ac664..863703186 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
@@ -229,7 +229,7 @@
</div>
<div *ngIf="structure.exceptionalClosures" class="bold-info">
<h3 class="subtitle">Précisions sur les horaires</h3>
- <p>{{ structure.exceptionalClosures }}</p>
+ <p class="description">{{ structure.exceptionalClosures }}</p>
</div>
<div *ngIf="structure.remoteAccompaniment" class="bold-info">
<h3>Cette structure propose un accompagnement à distance.</h3>
--
GitLab
From 897a215b2bada359b8ee587902a8a313e7960829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marl=C3=A8ne=20SIMONDANT?= <msimondant@grandlyon.com>
Date: Thu, 17 Mar 2022 08:47:17 +0000
Subject: [PATCH 5/9] fix(structure-details): display workshops again in
structure details
---
.../structure-details.component.ts | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.ts b/src/app/structure-list/components/structure-details/structure-details.component.ts
index cae5b0b60..5ccbc64f4 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.ts
+++ b/src/app/structure-list/components/structure-details/structure-details.component.ts
@@ -94,6 +94,7 @@ export class StructureDetailsComponent implements OnInit {
this.socialAndProfessionalsReferentiel = referentiel;
}
});
+ this.setServiceCategories();
if (this.printMode) {
this.printService.onDataReady();
}
@@ -249,6 +250,24 @@ export class StructureDetailsComponent implements OnInit {
}
}
+ public setServiceCategories(): void {
+ this.baseSkills = this.structure.baseSkills.map((skill) =>
+ _.find(this.baseSkillssReferentiel.modules, { id: skill })
+ );
+ this.accessRights = this.structure.accessRight.map((rights) =>
+ _.find(this.accessRightsReferentiel.modules, { id: rights })
+ );
+ this.parentingHelp = this.structure.parentingHelp.map((help) =>
+ _.find(this.parentingHelpsReferentiel.modules, { id: help })
+ );
+ this.socialAndProfessional = this.structure.socialAndProfessional.map((skill) =>
+ _.find(this.socialAndProfessionalsReferentiel.modules, { id: skill })
+ );
+ this.digitalCultureSecurity = this.structure.digitalCultureSecurity.map((skill) =>
+ _.find(this.digitalCultureSecuritysReferentiel.modules, { id: skill })
+ );
+ }
+
public keepOriginalOrder = (a, b) => a.key;
public isBaseSkills(): boolean {
--
GitLab
From 4d79383c2703396c9fa0c48bebed8b40ee1543c0 Mon Sep 17 00:00:00 2001
From: Hugo NOUTS <hnouts@grandlyon.com>
Date: Thu, 17 Mar 2022 14:50:05 +0000
Subject: [PATCH 6/9] =?UTF-8?q?fix(structures):=20Impossible=20de=20rentre?=
=?UTF-8?q?r=20des=20adresses=20sans=20num=C3=A9ro?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../address-autocomplete/address-autocomplete.component.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
index a1115c3ac..45710320a 100644
--- a/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
+++ b/src/app/shared/components/address-autocomplete/address-autocomplete.component.ts
@@ -57,9 +57,13 @@ export class AddressAutocompleteComponent implements OnInit {
public selectedResult(hit: any): void {
const address = new Address();
address.numero = hit.properties.housenumber ? hit.properties.housenumber : null;
- address.street = hit.properties.street;
address.commune = hit.properties.city;
address.coordinates = hit.geometry.coordinates;
+ if (hit.properties.street) {
+ address.street = hit.properties.street;
+ } else {
+ address.street = hit.properties.name;
+ }
const value = this.parseHitToAddress(hit);
// Set input value
this.searchAddress.nativeElement.value = value;
--
GitLab
From 41f6d76839755d8e0d725ccb1e0fa6eb84258071 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 17 Mar 2022 18:13:54 +0100
Subject: [PATCH 7/9] fix(carto): issue on category name after migration
---
src/app/structure-list/models/category.model.ts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/structure-list/models/category.model.ts b/src/app/structure-list/models/category.model.ts
index b130dc133..6dc08cf79 100644
--- a/src/app/structure-list/models/category.model.ts
+++ b/src/app/structure-list/models/category.model.ts
@@ -16,22 +16,22 @@ export class Category {
}
public isBaseSkills(): boolean {
- return this.name === 'Les compétences de base';
+ return this.id === 'baseSkills';
}
public isRigthtsAccess(): boolean {
- return this.name === 'Accès aux droits';
+ return this.id === 'accessRight';
}
public isParentingHelp(): boolean {
- return this.name === 'Aide à la parentalité';
+ return this.id === 'parentingHelp';
}
public isDigitalCultureSecurity(): boolean {
- return this.name === 'Culture et sécurité numérique';
+ return this.id === 'digitalCultureSecurity';
}
public isSocialAndProfessional(): boolean {
- return this.name === 'Insertion sociale et professionnelle';
+ return this.id === 'socialAndProfessional';
}
}
--
GitLab
From e6187fbcb01085fbe26b8e117f353fc0027d7574 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 18 Mar 2022 10:35:29 +0100
Subject: [PATCH 8/9] chore(release): 1.16.0
---
CHANGELOG.md | 12 ++++++++++++
package-lock.json | 2 +-
package.json | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4aed4b02..26164cc72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
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.16.0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.15.0...v1.16.0) (2022-03-18)
+
+
+### Bug Fixes
+
+* **carto:** issue [#11](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/issues/11) responsive structure details ([ad5e3bf](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/ad5e3bf7e824c5e0cde1cafa1019035a51aecb07))
+* **carto:** issue on category name after migration ([41f6d76](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/41f6d76839755d8e0d725ccb1e0fa6eb84258071))
+* **carto:** maker not setting in some case ([a13de9a](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/a13de9a2d184fac6569564a4953b5aeb6a100b04))
+* **pwa:** add icon for ios ([e18c936](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/e18c93606c14a41ba0da4a407d7ec94c492f8089))
+* **structure-details:** display workshops again in structure details ([897a215](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/897a215b2bada359b8ee587902a8a313e7960829))
+* **structures:** Impossible de rentrer des adresses sans numéro ([4d79383](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/4d79383c2703396c9fa0c48bebed8b40ee1543c0))
+
## [1.15.0](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.14.0...v1.15.0) (2022-03-08)
diff --git a/package-lock.json b/package-lock.json
index fd2d00ca8..ab163b0bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "pamn",
- "version": "1.15.0",
+ "version": "1.16.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 541783c6e..73da33c24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "pamn",
- "version": "1.15.0",
+ "version": "1.16.0",
"scripts": {
"ng": "ng",
"start": "ng serve --configuration=fr --proxy-config proxy.conf.json",
--
GitLab
From 5c9a74ad2916b986a7626ffb8726db3260d8990a Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 18 Mar 2022 11:27:37 +0100
Subject: [PATCH 9/9] feat(cicd): temp remove of mr jobs
---
.gitlab-ci.yml | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b40915a21..11f699b5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -102,7 +102,6 @@ deploy_rec:
environment:
name: rec
url: https://resin-rec.grandlyon.com
-
# code_analysis:
# image: skilldlabs/sonar-scanner:3.4.0
# services:
@@ -124,15 +123,15 @@ deploy_rec:
# -Dsonar.projectKey=${SONAR_PROJECT_KEY}
# -Dsonar.login=${SONAR_TOKEN}
-mr:
- variables:
- DOCKER_TLS_CERTDIR: ''
- DOCKER_HOST: tcp://docker:2375/
- DOCKER_DRIVER: overlay2
- image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
- stage: build
- only:
- - merge_requests
- script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" --build-arg conf=dev .
+# mr:
+# variables:
+# DOCKER_TLS_CERTDIR: ''
+# DOCKER_HOST: tcp://docker:2375/
+# DOCKER_DRIVER: overlay2
+# image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:18.09
+# stage: build
+# only:
+# - merge_requests
+# script:
+# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+# - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" --build-arg conf=dev .
--
GitLab