From cd49d6038ffe6a0d10458c904e5ca68d638413a3 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 17:55:26 +0100
Subject: [PATCH 1/7] fix(structure) : format date last modified
---
.../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 2b5060897..b48c46e74 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
@@ -48,7 +48,7 @@
</div>
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'calendar'"></app-svg-icon>
- <p>Mise-à-jour le {{ structure.derniereModification | date: 'shortDate' }}</p>
+ <p>Mise-à-jour le {{ structure.derniereModification | date: 'mediumDate' }}</p>
</div>
</div>
</div>
--
GitLab
From 6dcf8f463796ae8cd702f5bbca538f49ef400d01 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 17:57:14 +0100
Subject: [PATCH 2/7] fix(header) : update title + menu item
---
src/app/header/header.component.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index 045aa764b..600d0e766 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -3,13 +3,13 @@
<div fxLayout="row">
<!-- <img class="logo-grand-lyon" src="/assets/logos/ram_logo.svg" alt /> -->
<div fxLayout="column" fxLayoutAlign="center">
- <p>Réseau des Acteurs de la Médiation</p>
+ <p>Réseau des Acteurs de la Médiation Numérique</p>
<p>de la Métropole de Lyon</p>
</div>
</div>
</div>
<div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw">
- <a routerLink="/home" [routerLinkActive]="'active'" i18n>Acteurs de la médiation</a>
+ <a routerLink="/home" [routerLinkActive]="'active'" i18n>Acteurs de la médiation numérique</a>
<!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a>
<a routerLink="/projects" [routerLinkActive]="'active'" i18n>Projets</a> -->
<a routerLink="/about" [routerLinkActive]="'active'" i18n>Qui sommes-nous ?</a>
--
GitLab
From 5eb6e7bd3933b3b5ba2ea06868bec6923674189f Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 18:03:17 +0100
Subject: [PATCH 3/7] fix(structure) : fix condition hide/show about Services
info
---
.../structure-details.component.html | 12 +++++++++---
.../structure-details/structure-details.component.ts | 7 +++++++
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 b48c46e74..6b414ef68 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
@@ -73,17 +73,23 @@
</div>
</div>
<!-- Services -->
- <div fxLayout="column" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
+ <div
+ *ngIf="isBaseSkills() || isAccessRights()"
+ fxLayout="column"
+ class="structrue-details-block"
+ fxLayoutAlign="baseline baseline"
+ fxLayoutGap="20px"
+ >
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
<app-svg-icon [type]="'ico'" [icon]="'services'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Services</h2>
</div>
<div fxLayout="row" class="w-100">
- <div fxFlex="50%" *ngIf="baseSkills && baseSkills[0] !== undefined">
+ <div fxFlex="50%" *ngIf="isBaseSkills()">
<h3 class="subtitle">Compétences de base</h3>
<p *ngFor="let skill of baseSkills">{{ skill.text }}</p>
</div>
- <div fxFlex="50%" *ngIf="accessRights && accessRights[0] !== undefined">
+ <div fxFlex="50%" *ngIf="isAccessRights()">
<h3 class="subtitle">Accès au droits</h3>
<p *ngFor="let rights of accessRights">{{ rights.text }}</p>
</div>
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 99d8e119c..62f8c4ae0 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
@@ -83,4 +83,11 @@ export class StructureDetailsComponent implements OnInit {
public keepOriginalOrder = (a, b) => a.key;
public toNumbers = (arr) => arr.map(Number);
+
+ public isBaseSkills(): boolean {
+ return this.baseSkills && this.baseSkills[0] !== undefined;
+ }
+ public isAccessRights(): boolean {
+ return this.accessRights && this.accessRights[0] !== undefined;
+ }
}
--
GitLab
From 54ea26a538461009b8db71b91cc909af593cb386 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 18:12:13 +0100
Subject: [PATCH 4/7] fix(checkbox) : checkbox on first line + add padding
between each checkbox
---
.../components/modal-filter/modal-filter.component.scss | 2 +-
src/styles.scss | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.scss b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
index 96e21d4c8..e33b41fe5 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.scss
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
@@ -72,7 +72,7 @@
}
}
.ligneFiltre {
- padding: 0 5px;
+ padding: 5px;
}
h4 {
@include cn-bold-14;
diff --git a/src/styles.scss b/src/styles.scss
index 2d6db92a4..5cd277a87 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -88,7 +88,6 @@ a {
}
}
label {
- align-items: center;
grid-template-columns: min-content auto;
display: inline-grid;
cursor: pointer;
--
GitLab
From 8967b27546c656576311bcb4cf33a26063c7ff24 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 18:16:26 +0100
Subject: [PATCH 5/7] fix(search) : Same space between inputSearch-BtnSearch
and 3 btnSelect
---
.../structure-list/components/search/search.component.html | 4 ++--
.../structure-list/components/search/search.component.scss | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/structure-list/components/search/search.component.html b/src/app/structure-list/components/search/search.component.html
index 35639e453..197c25733 100644
--- a/src/app/structure-list/components/search/search.component.html
+++ b/src/app/structure-list/components/search/search.component.html
@@ -6,7 +6,7 @@
<form
[formGroup]="searchForm"
fxLayout="row"
- fxLayoutGap="1.5vw"
+ fxLayoutGap="16px"
fxLayoutAlign=" center"
(ngSubmit)="applyFilter(searchForm.value.searchTerm)"
>
@@ -20,7 +20,7 @@
</form>
</div>
<div (clickOutside)="closeModal()">
- <div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center">
+ <div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
<button
class="btn-filter"
type="button"
diff --git a/src/app/structure-list/components/search/search.component.scss b/src/app/structure-list/components/search/search.component.scss
index 1c2a86a42..af7bfa1ad 100644
--- a/src/app/structure-list/components/search/search.component.scss
+++ b/src/app/structure-list/components/search/search.component.scss
@@ -39,7 +39,7 @@
button {
background: $white;
height: 40px;
- width: 190px;
+ width: 100%;
border: 1px solid $grey-4;
padding: 3px 16px 3px 16px;
outline: none;
--
GitLab
From a3baa15ea2956e471230cd487c7b2df0336d5a6a Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Wed, 18 Nov 2020 18:27:21 +0100
Subject: [PATCH 6/7] Fix(structure) : fix distance structure design
---
.../structure-list/components/card/card.component.html | 10 ++++------
.../structure-list/components/card/card.component.scss | 2 ++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html
index 4848aad29..8bedea0fb 100644
--- a/src/app/structure-list/components/card/card.component.html
+++ b/src/app/structure-list/components/card/card.component.html
@@ -1,14 +1,11 @@
<div class="structure" fxLayout="column" (click)="cardClicked()" (mouseover)="cardHover()">
- <span class="nomStructure">{{ structure.nomDeVotreStructure }}</span>
-
- <div class="headerStructure" fxLayout="row" fxLayoutAlign="space-between center">
- <span class="typeStructure">{{ structure.typeDeStructure }}</span>
-
+ <div class="headerStructure" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
+ <span class="nomStructure">{{ structure.nomDeVotreStructure }}</span>
<div
*ngIf="structure.distance"
class="distanceStructure"
fxLayout="row"
- fxLayoutAlign="center center"
+ fxLayoutAlign="end center"
fxLayoutGap="20px"
>
<div fxLayout="row" fxLayoutAlign="center center">
@@ -19,6 +16,7 @@
</div>
</div>
</div>
+ <span class="typeStructure">{{ structure.typeDeStructure }}</span>
<br />
<app-structure-opening-status [structure]="structure"></app-structure-opening-status>
</div>
diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss
index aefdd8ed8..47ca330e6 100644
--- a/src/app/structure-list/components/card/card.component.scss
+++ b/src/app/structure-list/components/card/card.component.scss
@@ -31,10 +31,12 @@
color: $grey-1;
@include cn-bold-20;
padding-bottom: 5px;
+ width: 100%;
}
.distanceStructure {
@include cn-regular-16;
color: $grey-1;
+ width: 50%;
}
&:last-child {
border-bottom: none;
--
GitLab
From 9722eacdf038792c247531a99c068e59f03fed1f Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Mon, 23 Nov 2020 10:47:14 +0100
Subject: [PATCH 7/7] remove useless method
---
.../components/structure-details/structure-details.component.ts | 2 --
1 file changed, 2 deletions(-)
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 3b697a7bf..825eb64bd 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
@@ -82,8 +82,6 @@ export class StructureDetailsComponent implements OnInit {
public keepOriginalOrder = (a, b) => a.key;
- public toNumbers = (arr) => arr.map(Number);
-
public isBaseSkills(): boolean {
return this.baseSkills && this.baseSkills[0] !== undefined;
}
--
GitLab