From 8316ab45ab50a08e0dfe451eaace4ad4885ce82c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 19 May 2021 15:36:03 +0100
Subject: [PATCH 1/2] Improve edit event to approve

---
 .../edit-event-to-approve/edit-event.page.html         |  2 +-
 .../edit-event-to-approve/edit-event.page.ts           | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 006791024..f0dd92225 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -196,7 +196,7 @@
                     <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
                     <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
                     <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
-                    <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document.Id)" >
+                    <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document)" >
                       <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                     </span>
         
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index af8c6f3f6..c8692ca82 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -257,7 +257,7 @@ export class EditEventToApproveComponent implements OnInit {
 
 
     this.loadedAttachments.forEach((document:any)=>{
-      if(document['action'] == 'add'){
+      if(document['action'] == 'add') {
         delete document.action
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{});
       } else if(document['action'] == 'delete') {
@@ -266,8 +266,10 @@ export class EditEventToApproveComponent implements OnInit {
       }
 
     })
-    
-    alert('save')
+
+
+    this.modalController.dismiss();
+
   }
 
   async openAttendees() {
@@ -345,7 +347,7 @@ export class EditEventToApproveComponent implements OnInit {
 
   deleteAttachment(attachment: Attachment) {
 
-    this.attachmentsService.deleteEventAttachmentById(attachment.Id).subscribe( res=>{})
+    attachment['action'] == 'delete'
 
   }
 

From 35d2eb458041707e74c9941b887b76c3916378d5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 19 May 2021 16:11:22 +0100
Subject: [PATCH 2/2] Imporve edit event to aprrove

---
 .../edit-event-to-approve/edit-event.page.html             | 7 +++----
 .../edit-event-to-approve/edit-event.page.ts               | 7 ++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index f0dd92225..c2f48c252 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -188,18 +188,17 @@
           </div>
           
           <div class="d-flex container-div width-100"  > 
-            <ion-list class="width-100 ">
-              <ion-item class="width-100"   *ngFor="let document of loadedAttachments">
+            <ion-list class="width-100 "> 
+              <ion-item class="width-100"   *ngFor="let document of loadedAttachments; let i = index">
                 <ion-label class="width-100 d-block list" *ngIf="document.action != 'delete' ">
                   <p class="d-flex ion-justify-content-between"> 
                     <span class="attach-title-item">{{document.SourceName}}</span> 
                     <span class="app-name" *ngIf="document.ApplicationId  == 8"> Correspondencia </span>
                     <span class="app-name" *ngIf="document.ApplicationId == 386"> AccoesPresidenciais </span>
                     <span class="app-name" *ngIf="document.ApplicationId == 361 "> ArquivoDespachoElect </span>
-                    <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document)" >
+                    <span class="close-button text-black cursor-pointer" (click)="deleteAttachment(document, i)" >
                       <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                     </span>
-        
                   </p> 
                   <p><span class="span-left">{{document.Stakeholders}}</span><span class="span-right"> {{document.CreateDate | date: 'dd-MM-yy'}} </span></p>
                 </ion-label>
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
index c8692ca82..75dee98cb 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts
@@ -262,7 +262,7 @@ export class EditEventToApproveComponent implements OnInit {
         this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{});
       } else if(document['action'] == 'delete') {
         delete document.action
-        this.attachmentsService.deleteEventAttachmentById(document).subscribe( res=>{})
+        this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{})
       }
 
     })
@@ -345,9 +345,10 @@ export class EditEventToApproveComponent implements OnInit {
     console.log('this.loadedAttachments', this.loadedAttachments, result)
   }
 
-  deleteAttachment(attachment: Attachment) {
+  deleteAttachment(attachment: Attachment, index) {
 
-    attachment['action'] == 'delete'
+    console.log('index', index)
+    this.loadedAttachments[index]['action'] = 'delete'
 
   }