From 48d65cb815da0130208b86ddb6ae341ea310abe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marl=C3=A8ne=20SIMONDANT?= <msimondant@grandlyon.com>
Date: Wed, 14 Dec 2022 14:03:15 +0000
Subject: [PATCH] feat(rdvs): Add icon on structure panel to take an
appointment (hidden)
---
.../components/card/card.component.scss | 10 ++++++++
.../structure-details.component.html | 11 ++++++---
src/assets/ico/sprite.svg | 23 +++++++++++++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index 39b7f48e6..b1df19ac4 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -17,6 +17,7 @@
color: $grey-3;
@include lato-regular-16;
font-style: italic;
+ padding-top: 5px;
}
.typeStructureOrientation {
margin-bottom: 8px;
@@ -26,6 +27,9 @@
text-decoration: underline;
}
}
+ .structure-name-container {
+ align-items: center;
+ }
.structure-name {
@include lato-bold-18;
color: $grey-1;
@@ -35,6 +39,12 @@
color: $primary-color;
}
}
+ .rdv {
+ padding-left: 1rem;
+ ::ng-deep div {
+ height: 22px;
+ }
+ }
.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 d544e0753..cd02c9172 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 - 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> -->
<!-- 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
@@ -74,7 +79,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 6396908ba..dc969cf09 100644
--- a/src/assets/ico/sprite.svg
+++ b/src/assets/ico/sprite.svg
@@ -693,6 +693,29 @@
<path d="M15.5 6.5L6.5 15.5" stroke="#BDBDBD" stroke-width="1.5" stroke-linecap="round" />
</symbol>
+ <symbol id="tagReset" width="26" height="26" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path d="M7.04307 8H7V14H13V13.9569L7.04307 8Z" fill="#696969" />
+ <path
+ d="M10.3738 21.6869C11.5497 22.8501 13.0573 23.6202 14.6889 23.8913C16.3206 24.1623 17.9962 23.9209 19.485 23.2004C20.9738 22.4798 22.2027 21.3155 23.0025 19.8676C23.8023 18.4198 24.1336 16.7597 23.9509 15.1158C23.7683 13.4719 23.0805 11.925 21.9824 10.6881C20.8843 9.45121 19.4297 8.58509 17.819 8.20897C16.2083 7.83285 14.5207 7.96523 12.9883 8.58789C11.456 9.21054 10.1543 10.2929 9.26242 11.6859"
+ 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 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">
+ <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