From 6f32ee8659c17790b762cafd3c2f34263e2cf522 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 24 Feb 2021 18:53:37 +0100
Subject: [PATCH] fix: add admin structureName + bug fix on sturcutredetails
---
.../claim-structure/claim-structure.component.html | 2 +-
src/app/admin/models/demandAttachment.model.ts | 1 +
.../structure-details/structure-details.component.html | 9 +++++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/app/admin/components/claim-structure/claim-structure.component.html b/src/app/admin/components/claim-structure/claim-structure.component.html
index b272cebed..aa0adbc58 100644
--- a/src/app/admin/components/claim-structure/claim-structure.component.html
+++ b/src/app/admin/components/claim-structure/claim-structure.component.html
@@ -8,7 +8,7 @@
<tbody>
<tr *ngFor="let demand of demandsAttachment">
<td>{{ demand.userEmail }}</td>
- <td>{{ demand.structureId }}</td>
+ <td>{{ demand.structureName }}</td>
<td>
<button (click)="acceptDemand(demand)">Valider</button><button (click)="refuseDemand(demand)">Refuser</button>
</td>
diff --git a/src/app/admin/models/demandAttachment.model.ts b/src/app/admin/models/demandAttachment.model.ts
index b19d1f375..f7b9ae4b4 100644
--- a/src/app/admin/models/demandAttachment.model.ts
+++ b/src/app/admin/models/demandAttachment.model.ts
@@ -1,4 +1,5 @@
export class DemandAttachment {
userEmail: string;
structureId: number;
+ structureName: string;
}
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 803f77bdf..f0393fbff 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
@@ -102,7 +102,12 @@
</div>
</div>
<div fxLayout="column" fxFlex="50%">
- <div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
+ <div
+ *ngIf="structure.contactMail && structure.contactMail !== 'unknown@unknown.com'"
+ fxLayout="row"
+ fxLayoutAlign="none center"
+ fxLayoutGap="13px"
+ >
<app-svg-icon [type]="'ico'" [icon]="'email'"></app-svg-icon>
<p>{{ structure.contactMail }}</p>
</div>
@@ -186,7 +191,7 @@
>
<p class="no-margin">{{ getAccessLabel(acces) }}</p>
</div>
- <p class="no-margin">Accessibles aux personnes à mobilité réduite</p>
+ <p *ngIf="structure.pmrAccess" class="no-margin">Accessibles aux personnes à mobilité réduite</p>
</div>
<div *ngFor="let public of structure.publics" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<p class="no-margin">{{ getPublicLabel(public) }}</p>
--
GitLab