From 012a5f0f17dbc28d5d57d8f80c4fd8746ad353ca Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 26 Feb 2021 11:36:52 +0100
Subject: [PATCH 1/2] fix: filter chevron margin + add structure link width
---
src/app/structure-list/components/search/search.component.html | 2 +-
src/app/structure-list/components/search/search.component.scss | 1 -
src/assets/scss/_buttons.scss | 2 +-
src/styles.scss | 3 +++
4 files changed, 5 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 5294bc019..6e7814eb8 100644
--- a/src/app/structure-list/components/search/search.component.html
+++ b/src/app/structure-list/components/search/search.component.html
@@ -91,7 +91,7 @@
</div>
</div>
<div class="footerSearchSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center">
- <div class="checkbox">
+ <div class="checkbox no-width">
<div class="checkboxItem">
<label>
<input
diff --git a/src/app/structure-list/components/search/search.component.scss b/src/app/structure-list/components/search/search.component.scss
index 657eeeffe..ec415e896 100644
--- a/src/app/structure-list/components/search/search.component.scss
+++ b/src/app/structure-list/components/search/search.component.scss
@@ -118,7 +118,6 @@
}
a {
@include hyperlink;
- width: 100%;
text-align: right;
}
diff --git a/src/assets/scss/_buttons.scss b/src/assets/scss/_buttons.scss
index e17ec875c..3c972d529 100644
--- a/src/assets/scss/_buttons.scss
+++ b/src/assets/scss/_buttons.scss
@@ -7,7 +7,7 @@
height: 40px;
width: 190px;
border: 1px solid $grey-4;
- padding: 3px 16px 3px 16px;
+ padding: 3px 8px 3px 16px;
outline: none;
border-radius: 4px;
cursor: pointer;
diff --git a/src/styles.scss b/src/styles.scss
index 747d5da15..1b7004107 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -159,6 +159,9 @@ button {
-ms-transform: rotate(45deg);
}
}
+ &.no-width {
+ width: unset;
+ }
}
// Layout
--
GitLab
From 05a578b79e3194e78b8ec6536a038c1775a3615d Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Fri, 26 Feb 2021 14:36:39 +0100
Subject: [PATCH 2/2] fix: bug on admin validation
---
.../claim-structure.component.ts | 16 ++++++++-----
src/app/admin/services/admin.service.ts | 24 +++++++++++++++----
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/app/admin/components/claim-structure/claim-structure.component.ts b/src/app/admin/components/claim-structure/claim-structure.component.ts
index e6e8f1338..28e1701d0 100644
--- a/src/app/admin/components/claim-structure/claim-structure.component.ts
+++ b/src/app/admin/components/claim-structure/claim-structure.component.ts
@@ -17,14 +17,18 @@ export class ClaimStructureComponent implements OnInit {
}
public acceptDemand(demand: DemandAttachment): void {
- this.adminService.acceptStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
- this.demandsAttachment = data;
- });
+ this.adminService
+ .acceptStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+ .subscribe((data) => {
+ this.demandsAttachment = data;
+ });
}
public refuseDemand(demand: DemandAttachment): void {
- this.adminService.refuseStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
- this.demandsAttachment = data;
- });
+ this.adminService
+ .refuseStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+ .subscribe((data) => {
+ this.demandsAttachment = data;
+ });
}
}
diff --git a/src/app/admin/services/admin.service.ts b/src/app/admin/services/admin.service.ts
index 0167109c5..cdea9a41b 100644
--- a/src/app/admin/services/admin.service.ts
+++ b/src/app/admin/services/admin.service.ts
@@ -15,11 +15,27 @@ export class AdminService {
return this.http.get<DemandAttachment[]>(`${this.baseUrl}/pendingStructures`);
}
- public acceptStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
- return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, { userEmail, structureId });
+ public acceptStructureClaim(
+ userEmail: string,
+ structureId: number,
+ structureName: string
+ ): Observable<DemandAttachment[]> {
+ return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, {
+ userEmail,
+ structureId,
+ structureName,
+ });
}
- public refuseStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
- return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, { userEmail, structureId });
+ public refuseStructureClaim(
+ userEmail: string,
+ structureId: number,
+ structureName: string
+ ): Observable<DemandAttachment[]> {
+ return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, {
+ userEmail,
+ structureId,
+ structureName,
+ });
}
}
--
GitLab