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 e6e8f1338949af736a38bdc97e159870bd54c018..28e1701d0d63a3ecc84731ba756d734d90d6732c 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 0167109c5db0f424f33bfff31dcae7ae38086541..cdea9a41bafe956e74a11c854f61b50bf173bec9 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, + }); } } diff --git a/src/app/structure-list/components/search/search.component.html b/src/app/structure-list/components/search/search.component.html index 5294bc01946780b19cc205741efe82869243ec0b..6e7814eb8a09356094c370be6534435163028c5e 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 657eeeffebacdf3e224e973e42a0044e3630e76e..ec415e8960e6076b0c573254c2cb15fb2e0423e4 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 e17ec875cd592b90d0a853044e9e0c36a1e6224e..3c972d529bd2e937982fb9d71c53e1893fd92483 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 747d5da15a984bd5b107acc00ceaaeabe882de53..1b700410763a8f5081ce70ea690a0d1e1d74485d 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -159,6 +159,9 @@ button { -ms-transform: rotate(45deg); } } + &.no-width { + width: unset; + } } // Layout