From ebb2a8d61aecf6db2458cf99f5d7fa571ab810bd Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Tue, 8 Nov 2022 11:57:17 +0100
Subject: [PATCH 1/6] Add icon when the structure has a CNFS ID
---
.../components/card/card.component.html | 9 ++++++++-
.../components/card/card.component.scss | 6 ++++++
.../structure-details.component.html | 11 ++++++++---
src/assets/ico/sprite.svg | 18 ++++++++++++++++++
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index 9528348e9..2ab23a520 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -10,7 +10,14 @@
<div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="structure.getTypeStructureIcon()" [iconClass]="'icon-52'"></app-svg-icon>
<div fxLayout="column" fxLayoutAlign="end">
- <span class="structure-name" [ngClass]="{ notClaimed: !isClaimed }">{{ structure.structureName }}</span>
+ <div fxLayout="row">
+ <span class="structure-name" [ngClass]="{ notClaimed: !isClaimed }">
+ {{ structure.structureName }}
+ </span>
+ <span *ngIf="structure.idCNFS" class="rdv">
+ <app-svg-icon [type]="'ico'" [icon]="'rdv'" [iconColor]="'black'"></app-svg-icon>
+ </span>
+ </div>
<span class="typeStructure">{{ structure.getLabelTypeStructure() }}</span>
</div>
</div>
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index 0613c3804..c57258a58 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -33,6 +33,12 @@
color: $primary-color;
}
}
+ .rdv {
+ padding-left: 1.2rem;
+ ::ng-deep svg {
+ height: 1.25em;
+ }
+ }
.distanceStructure {
@include lato-regular-16;
color: $grey-3;
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 9d718a764..a9e8c7196 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
@@ -31,10 +31,15 @@
></app-svg-icon>
<div class="iconTitle">Voir le conseiller numérique</div>
</div-->
+ <!-- Prendre rdv -->
+ <div *ngIf="structure.idCNFS" class="clickableDiv" role="button" tabindex="0">
+ <app-svg-icon class="icon" [type]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'"></app-svg-icon>
+ <div class="iconTitle">Prendre rdv</div>
+ </div>
<!-- Voir le site -->
<div *ngIf="structure.website" class="clickableDiv" role="button" (click)="goToWebsite()" tabindex="0">
<app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'"></app-svg-icon>
- <div class="iconTitle">Voir le site</div>
+ <div class="iconTitle">Site internet</div>
</div>
<!-- Voir la plaquette - Hidden until functionnality is developed -->
<!--div class="clickableDiv" role="button" tabindex="0">
@@ -49,7 +54,7 @@
<!-- Signaler une erreur -->
<div class="clickableDiv" role="button" (click)="displayModalError()" tabindex="0">
<app-svg-icon class="icon" [type]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'"></app-svg-icon>
- <div class="iconTitle">Signaler une erreur</div>
+ <div class="iconTitle">Une erreur ?</div>
</div>
<!-- Je travaille ici -->
<div
@@ -71,7 +76,7 @@
tabindex="0"
>
<app-svg-icon class="icon" [type]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'"></app-svg-icon>
- <div class="iconTitle">Modifier cette structure</div>
+ <div class="iconTitle">Modifier</div>
</div>
</div>
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index 172727b4e..cff51548a 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -693,6 +693,24 @@
stroke="#696969" stroke-width="1.5" />
</symbol>
+ <symbol id="rdv" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path style="fill:#ffffff" id="path2"
+ d="m 0.75,5 h 16 v 9 c 0,1.6569 -1.3431,3 -3,3 h -10 c -1.65685,0 -3,-1.3431 -3,-3 z" />
+ <path style="stroke:#333333;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round" id="path4"
+ d="M 6.05078,11.1664 8.3256,13.1605 11.9002,8.7734" />
+ <rect style="stroke:#333333;stroke-width:1.5" id="rect6" rx="1" height="15" width="16" y="2" x="0.75" />
+ <path style="fill:#333333" id="path8"
+ d="m 0.75,3 c 0,-0.55228 0.44772,-1 1,-1 h 14 c 0.5523,0 1,0.44772 1,1 v 2 h -16 z" />
+ <rect style="fill:#333333" id="rect10" rx="0.5" height="3" width="1" y="0" x="3.75" />
+ <rect style="fill:#333333" id="rect12" rx="0.5" height="3" width="1" y="0" x="12.75" />
+ </symbol>
+
+ <symbol id="rdvDetail" width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path
+ d="M10.8092 9.33333V4M21.4759 9.33333V4M9.47591 14.6667H22.8092M6.80924 28H25.4759C26.9487 28 28.1426 26.8061 28.1426 25.3333V9.33333C28.1426 7.86057 26.9487 6.66667 25.4759 6.66667H6.80924C5.33649 6.66667 4.14258 7.86057 4.14258 9.33333V25.3333C4.14258 26.8061 5.33649 28 6.80924 28Z"
+ stroke="#333333" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" />
+ </symbol>
+
<symbol id="closeModal" width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M27.0279 11.9135C27.5486 11.3928 28.2873 11.2873 28.6778 11.6778C29.0683 12.0683 28.9628 12.807 28.4421 13.3277L13.3572 28.4127C12.8365 28.9334 12.0978 29.0389 11.7072 28.6484C11.3167 28.2578 11.4222 27.5192 11.9429 26.9985L27.0279 11.9135Z"
--
GitLab
From bb43b13818a04d99d57da69331971a97532f5b37 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Tue, 8 Nov 2022 16:46:57 +0100
Subject: [PATCH 2/6] icon height
---
src/app/shared/components/svg-icon/svg-icon.component.scss | 4 ++++
src/app/structure-list/components/card/card.component.html | 2 +-
src/app/structure-list/components/card/card.component.scss | 3 ---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.scss b/src/app/shared/components/svg-icon/svg-icon.component.scss
index 5630b1b40..c1fe9efef 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -17,6 +17,10 @@
height: 16px;
width: 16px;
}
+ &.icon-20 {
+ height: 20px;
+ width: 20px;
+ }
&.icon-26 {
height: 26px;
width: 26px;
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index 2ab23a520..a9040319d 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -15,7 +15,7 @@
{{ structure.structureName }}
</span>
<span *ngIf="structure.idCNFS" class="rdv">
- <app-svg-icon [type]="'ico'" [icon]="'rdv'" [iconColor]="'black'"></app-svg-icon>
+ <app-svg-icon [type]="'ico'" [icon]="'rdv'" [iconColor]="'black'" [iconClass]="'icon-20'"></app-svg-icon>
</span>
</div>
<span class="typeStructure">{{ structure.getLabelTypeStructure() }}</span>
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index c57258a58..51c813533 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -35,9 +35,6 @@
}
.rdv {
padding-left: 1.2rem;
- ::ng-deep svg {
- height: 1.25em;
- }
}
.distanceStructure {
@include lato-regular-16;
--
GitLab
From f65d2830c11bdc22f48d27d9899b0501e714df5e Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Wed, 9 Nov 2022 16:51:16 +0100
Subject: [PATCH 3/6] retours review
---
.../components/svg-icon/svg-icon.component.scss | 6 +++---
.../components/card/card.component.html | 4 ++--
.../components/card/card.component.scss | 7 +++++--
src/assets/ico/sprite.svg | 16 +++++++---------
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/src/app/shared/components/svg-icon/svg-icon.component.scss b/src/app/shared/components/svg-icon/svg-icon.component.scss
index c1fe9efef..706fc4921 100644
--- a/src/app/shared/components/svg-icon/svg-icon.component.scss
+++ b/src/app/shared/components/svg-icon/svg-icon.component.scss
@@ -17,9 +17,9 @@
height: 16px;
width: 16px;
}
- &.icon-20 {
- height: 20px;
- width: 20px;
+ &.icon-22 {
+ height: 22px;
+ width: 22px;
}
&.icon-26 {
height: 26px;
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index a9040319d..75fc3fb55 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -10,12 +10,12 @@
<div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="structure.getTypeStructureIcon()" [iconClass]="'icon-52'"></app-svg-icon>
<div fxLayout="column" fxLayoutAlign="end">
- <div fxLayout="row">
+ <div fxLayout="row" class="structure-name-container">
<span class="structure-name" [ngClass]="{ notClaimed: !isClaimed }">
{{ structure.structureName }}
</span>
<span *ngIf="structure.idCNFS" class="rdv">
- <app-svg-icon [type]="'ico'" [icon]="'rdv'" [iconColor]="'black'" [iconClass]="'icon-20'"></app-svg-icon>
+ <app-svg-icon [type]="'ico'" [icon]="'rdv'" [iconColor]="'black'" [iconClass]="'icon-22'"></app-svg-icon>
</span>
</div>
<span class="typeStructure">{{ structure.getLabelTypeStructure() }}</span>
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index 51c813533..9678d4675 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -17,16 +17,19 @@
color: $grey-3;
@include lato-regular-16;
font-style: italic;
+ padding-top: 5px;
}
&:hover {
.structure-name {
text-decoration: underline;
}
}
+ .structure-name-container {
+ align-items: center;
+ }
.structure-name {
@include lato-bold-18;
color: $grey-1;
- padding-bottom: 5px;
width: 100%;
&.notClaimed {
@@ -34,7 +37,7 @@
}
}
.rdv {
- padding-left: 1.2rem;
+ padding-left: 1rem;
}
.distanceStructure {
@include lato-regular-16;
diff --git a/src/assets/ico/sprite.svg b/src/assets/ico/sprite.svg
index cff51548a..586f28740 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -694,15 +694,13 @@
</symbol>
<symbol id="rdv" width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path style="fill:#ffffff" id="path2"
- d="m 0.75,5 h 16 v 9 c 0,1.6569 -1.3431,3 -3,3 h -10 c -1.65685,0 -3,-1.3431 -3,-3 z" />
- <path style="stroke:#333333;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round" id="path4"
- d="M 6.05078,11.1664 8.3256,13.1605 11.9002,8.7734" />
- <rect style="stroke:#333333;stroke-width:1.5" id="rect6" rx="1" height="15" width="16" y="2" x="0.75" />
- <path style="fill:#333333" id="path8"
- d="m 0.75,3 c 0,-0.55228 0.44772,-1 1,-1 h 14 c 0.5523,0 1,0.44772 1,1 v 2 h -16 z" />
- <rect style="fill:#333333" id="rect10" rx="0.5" height="3" width="1" y="0" x="3.75" />
- <rect style="fill:#333333" id="rect12" rx="0.5" height="3" width="1" y="0" x="12.75" />
+ <path d="M3 7H19V16C19 17.6569 17.6569 19 16 19H6C4.34315 19 3 17.6569 3 16V7Z" fill="white" />
+ <path d="M8.30078 13.1664L10.5756 15.1605L14.1502 10.7734" stroke="#333333" stroke-width="1.5"
+ stroke-linecap="round" stroke-linejoin="round" />
+ <rect x="3" y="4" width="16" height="15" rx="1" stroke="#333333" stroke-width="1.5" />
+ <path d="M3 5C3 4.44772 3.44772 4 4 4H18C18.5523 4 19 4.44772 19 5V7H3V5Z" fill="#333333" />
+ <rect x="6" y="2" width="1" height="3" rx="0.5" fill="#333333" />
+ <rect x="15" y="2" width="1" height="3" rx="0.5" fill="#333333" />
</symbol>
<symbol id="rdvDetail" width="33" height="32" viewBox="0 0 33 32" fill="none" xmlns="http://www.w3.org/2000/svg">
--
GitLab
From 1292fef259f5fae9385b1f4d165e8320121d4908 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Wed, 9 Nov 2022 16:54:34 +0100
Subject: [PATCH 4/6] remove width that can cause style pb with short structure
names that have rdv
---
src/app/structure-list/components/card/card.component.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index 9678d4675..59fb1d24a 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -30,7 +30,6 @@
.structure-name {
@include lato-bold-18;
color: $grey-1;
- width: 100%;
&.notClaimed {
color: $primary-color;
--
GitLab
From 7546832435a64b61991a226fe254ee0adeacea37 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Mon, 14 Nov 2022 11:35:40 +0100
Subject: [PATCH 5/6] force app- svg-icon's div height
---
src/app/structure-list/components/card/card.component.scss | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index 59fb1d24a..20026b89d 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -37,6 +37,9 @@
}
.rdv {
padding-left: 1rem;
+ ::ng-deep div {
+ height: 22px;
+ }
}
.distanceStructure {
@include lato-regular-16;
--
GitLab
From 01dcf90ca75dcd162eb1ab7433b8f07c0e0bd40d Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Wed, 14 Dec 2022 14:30:53 +0100
Subject: [PATCH 6/6] hide button while rdvs is not ready
---
.../structure-details/structure-details.component.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 a9e8c7196..6fe07ba48 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
@@ -31,11 +31,11 @@
></app-svg-icon>
<div class="iconTitle">Voir le conseiller numérique</div>
</div-->
- <!-- Prendre rdv -->
- <div *ngIf="structure.idCNFS" class="clickableDiv" role="button" tabindex="0">
+ <!-- Prendre rdv - Hidden until RDVS functionnality is developed -->
+ <!-- <div *ngIf="structure.idCNFS" class="clickableDiv" role="button" tabindex="0">
<app-svg-icon class="icon" [type]="'ico'" [icon]="'rdvDetail'" [iconClass]="'icon-32'"></app-svg-icon>
<div class="iconTitle">Prendre rdv</div>
- </div>
+ </div> -->
<!-- Voir le site -->
<div *ngIf="structure.website" class="clickableDiv" role="button" (click)="goToWebsite()" tabindex="0">
<app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'"></app-svg-icon>
--
GitLab