From 885c85b97e77a54b061fd68a29c469218ab425d1 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Mon, 23 Nov 2020 11:08:43 +0100
Subject: [PATCH 1/2] =?UTF-8?q?fix(other)=20:=20Fix=20design=20'Autres'=20?=
=?UTF-8?q?in=20'D=C3=A9marches'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../structure-details.component.html | 13 ++++++++++---
.../structure-details.component.ts | 6 ++++++
2 files changed, 16 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 c81d453cb..66b1cfefe 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
@@ -66,10 +66,17 @@
<app-svg-icon [type]="'ico'" [icon]="'demarches'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Démarches</h2>
</div>
- <div fxLayout="row wrap" fxLayoutGap="24px">
- <div *ngFor="let accompagnement of structure.accompagnementDesDemarches">
- <app-logo-card [name]="accompagnement"></app-logo-card>
+ <div fxLayout="column">
+ <div fxLayout="row wrap" fxLayoutGap="24px">
+ <div *ngFor="let accompagnement of structure.accompagnementDesDemarches">
+ <app-logo-card [name]="accompagnement"></app-logo-card>
+ </div>
</div>
+ <p *ngIf="isOtherSection">
+ Tout ce qui est en lien avec la création d'entreprise ex : consultation de sites de références (BPI, Je créé
+ dans ma région, ...), inscription à des newsletters, aide pour trouver des sites (CMA, CCI, Urssaf,...),
+ recherches d'infos sur moteur de recherche...
+ </p>
</div>
</div>
<!-- Services -->
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 995d148ac..691f95295 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
@@ -22,6 +22,7 @@ export class StructureDetailsComponent implements OnInit {
public baseSkills: Module[];
public accessRights: Module[];
public printMode = false;
+ public isOtherSection = false;
constructor(route: ActivatedRoute, private printService: PrintService, private searchService: SearchService) {
route.url.subscribe((url) => {
@@ -46,6 +47,11 @@ export class StructureDetailsComponent implements OnInit {
this.printService.onDataReady();
}
});
+ const index = this.structure.accompagnementDesDemarches.indexOf('Autres');
+ if (index > -1) {
+ this.structure.accompagnementDesDemarches.splice(index, 1);
+ this.isOtherSection = true;
+ }
}
public close(): void {
--
GitLab
From 2312468628a28328fea2ce2563e11cae874a9054 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Mon, 23 Nov 2020 11:42:26 +0100
Subject: [PATCH 2/2] fix(structureDetails) : Add new button to close details
---
.../structure-details.component.html | 8 +++--
.../structure-details.component.scss | 4 ++-
src/assets/scss/_icons.scss | 31 +++++++++++++++++++
3 files changed, 39 insertions(+), 4 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 66b1cfefe..39b0b3a52 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
@@ -1,10 +1,12 @@
<div class="structrue-details-container" *ngIf="structure">
<!-- Header info -->
+ <div fxLayout="row" fxLayoutAlign="end center">
+ <div (click)="close()" class="ico-close-details"></div>
+ </div>
<div fxLayout="row" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
- <em class="ic-arrow-left clickable hide-on-print" (click)="close()"></em>
<div fxLayout="column" fxLayoutGap="10px" fxFlex="100%">
- <div fxLayout="row" fxLayoutAlign="space-between">
- <div fxLayout="column center">
+ <div fxLayout="row" fxLayoutAlign="space-between start">
+ <div fxLayout="column">
<h2 class="bold">{{ structure.nomDeVotreStructure }}</h2>
<h3>{{ structure.typeDeStructure }}</h3>
</div>
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 df8f21598..17dde0436 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
@@ -13,13 +13,14 @@
max-width: 980px;
width: 100%;
height: calc(100vh - #{$header-height} - #{$footer-height});
- padding: 18px 24px;
+ padding: 10px 24px;
overflow: auto;
}
.structrue-details-block {
border-bottom: 1px dashed $grey-2;
padding-bottom: 24px;
+ padding-right: 68px;
.subtitle {
text-transform: uppercase;
@include cn-bold-16;
@@ -37,6 +38,7 @@
}
h2 {
+ margin-top: 0;
margin-bottom: 5px;
@include cn-regular-24;
}
diff --git a/src/assets/scss/_icons.scss b/src/assets/scss/_icons.scss
index adcc85c0d..cb0071742 100644
--- a/src/assets/scss/_icons.scss
+++ b/src/assets/scss/_icons.scss
@@ -575,3 +575,34 @@
border-top-right-radius: 3px;
top: 9px;
}
+
+.ico-close-details {
+ width: 40px;
+ height: 40px;
+ border-radius: 40px;
+ background-color: $black;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ &:active {
+ opacity: 0.8;
+ }
+
+ &:before,
+ &:after {
+ content: '';
+ width: 23px;
+ height: 2px;
+ background-color: $white;
+ position: absolute;
+ border-radius: 1px;
+ }
+
+ &:before {
+ transform: rotate(45deg);
+ }
+ &:after {
+ transform: rotate(-45deg);
+ }
+}
--
GitLab