From 0f9e822ef7fc3a45a61924549a0b21f4da6af6c4 Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Fri, 8 Jan 2021 16:39:24 +0100
Subject: [PATCH] feat(admin) : fix model
---
.../validation-attachment.component.html | 4 ++--
.../validation-attachment/validation-attachment.component.ts | 5 ++---
src/app/admin/models/demandAttachment.model.ts | 4 ++--
src/app/admin/services/admin.service.ts | 5 ++++-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/app/admin/components/validation-attachment/validation-attachment.component.html b/src/app/admin/components/validation-attachment/validation-attachment.component.html
index cd68a92cd..03e52cde1 100644
--- a/src/app/admin/components/validation-attachment/validation-attachment.component.html
+++ b/src/app/admin/components/validation-attachment/validation-attachment.component.html
@@ -7,8 +7,8 @@
</thead>
<tbody>
<tr *ngFor="let demand of demandsAttachment">
- <td>{{ demand.user.email }}</td>
- <td>{{ demande.structure.structureName }}</td>
+ <td>{{ demand.userEmail }}</td>
+ <td>{{ demand.structureId }}</td>
<td>
<button (click)="acceptDemand(demand)">Valider</button><button (click)="refuseDemand(demand)">Refuser</button>
</td>
diff --git a/src/app/admin/components/validation-attachment/validation-attachment.component.ts b/src/app/admin/components/validation-attachment/validation-attachment.component.ts
index 4211d3c0a..78fe3329b 100644
--- a/src/app/admin/components/validation-attachment/validation-attachment.component.ts
+++ b/src/app/admin/components/validation-attachment/validation-attachment.component.ts
@@ -21,13 +21,12 @@ export class ValidationAttachmentComponent implements OnInit {
public acceptDemand(demand: demandAttachment): void {
console.log('accept');
this.removeDemand(demand);
-
- this.adminService.acceptAttachmentStructure(demand.user.email, demand.structure.id);
+ this.adminService.acceptAttachmentStructure(demand.userEmail, demand.structureId);
}
public refuseDemand(demand: demandAttachment): void {
console.log('refuse');
- this.adminService.refuseAttachmentStructure(demand.user.email, demand.structure.id);
+ this.adminService.refuseAttachmentStructure(demand.userEmail, demand.structureId);
this.removeDemand(demand);
}
diff --git a/src/app/admin/models/demandAttachment.model.ts b/src/app/admin/models/demandAttachment.model.ts
index 26509d277..497b93b81 100644
--- a/src/app/admin/models/demandAttachment.model.ts
+++ b/src/app/admin/models/demandAttachment.model.ts
@@ -2,6 +2,6 @@ import { Structure } from '../../models/structure.model';
import { User } from '../../models/user.model';
export class demandAttachment {
- user: User;
- structure: Structure;
+ userEmail: string;
+ structureId: number;
}
diff --git a/src/app/admin/services/admin.service.ts b/src/app/admin/services/admin.service.ts
index dac27d9c3..f5f928647 100644
--- a/src/app/admin/services/admin.service.ts
+++ b/src/app/admin/services/admin.service.ts
@@ -9,9 +9,12 @@ export class AdminService {
// Return pendingAttachments of all profiles.
public getPendingAttachmentsStructure(): demandAttachment[] {
- return [new demandAttachment()];
+ return [{ userEmail: 'jb@test.fr', structureId: 53 }];
}
+ // Post
public acceptAttachmentStructure(mailUser, idStructure): void {}
+
+ // Post
public refuseAttachmentStructure(mailUser, idStructure): void {}
}
--
GitLab