diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index deee90114..8bbd453fe 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -423,7 +423,7 @@ export class NewEventPage implements OnInit {
     }
   }
 
- 
+
   save_v2() {
     this.injectValidation()
     this.runValidation()
@@ -440,14 +440,17 @@ export class NewEventPage implements OnInit {
 
     this.postEvent.Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
     this.postEvent.IsAllDayEvent = this.allDayCheck;
-    this.agendaDataRepository.createEvent(this.postEvent,this.CalendarName,this.documents).subscribe((value) => {
+    this.agendaDataRepository.createEvent(this.postEvent, this.CalendarName, this.documents).subscribe((value) => {
       console.log(value)
+      loader.remove()
+      this.hhtpErrorHandle.httpsSucessMessagge('new event')
+      let data = Object.assign(this.postEvent)
+      this.modalController.dismiss(data);
     }, ((error) => {
       console.log('create event error: ', error)
+      loader.remove()
     }));
-    loader.remove()
-    this.modalController.dismiss();
-    this.hhtpErrorHandle.httpsSucessMessagge('new event')
+
   }
 
   async save() {
diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
index 07ca9a6cd..5580f587e 100644
--- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
+++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
@@ -132,6 +132,8 @@ export class AgendaDataRepositoryService {
   }
 
   addEventAttachment(id,attachmentData) {
+    console.log(attachmentData)
+    console.log('post attachment',this.utils.documentAdded(attachmentData))
     return this.agendaDataService.addEventAttachment(id,{ attachments: this.utils.documentAdded(attachmentData) });
   }
 
diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/services/Repositorys/Agenda/utils.ts
index 67024397a..9c6a031d9 100644
--- a/src/app/services/Repositorys/Agenda/utils.ts
+++ b/src/app/services/Repositorys/Agenda/utils.ts
@@ -62,14 +62,26 @@ export class Utils {
 
   documentAdded(documents:any[]) {
     console.log('added doc create event',documents)
-    return documents.map((e) => {
+    let listupdate = []
+    documents.forEach(element => {
+      let object = {
+        docId: element.docId,
+        sourceName: element.subject || element.sourceNames,
+        description: "",
+        applicationId: element.applicationId
+      }
+      
+      listupdate.push(object)
+    });
+    return listupdate
+   /*  return documents.map((e) => {
       return {
         docId: e.docId,
         sourceName: e.subject || e.sourceNames,
         description: "",
         applicationId: e.applicationId
       };
-    });
+    }); */
 
   }
 
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 848e12699..fdaf28021 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -114,6 +114,7 @@ export class EditEventPage implements OnInit {
   }
 
   ngOnInit() {
+    this.loadedEventAttachments = this.postEvent.Attachments
     console.log(this.postEvent)
     this._postEvent = this.postEvent
     this.allDayCheck = this.postEvent.IsAllDayEvent;
@@ -374,7 +375,7 @@ export class EditEventPage implements OnInit {
       await this.saveDocument()
 
       if (this.addedAttachmentsList.length > 0) {
-        this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this._postEvent.Attachments).subscribe((value) => {
+        this.agendaDataRepository.addEventAttachment(this._postEvent.EventId, this.loadedEventAttachments).subscribe((value) => {
           console.log(value)
         }, ((error) => {
           this.showLoader = false
@@ -611,7 +612,7 @@ export class EditEventPage implements OnInit {
     modal.onDidDismiss().then(async (res) => {
       if (res) {
         const data = res.data;
-        console.log(data)
+        console.log('Get Doc',data.selected)
 
         /* const ApplicationIdDocumentToSave: any = {
           SourceName: data.selected.Assunto,
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index a4b3f47a7..82561333c 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -537,13 +537,17 @@ export class NewEventPage implements OnInit {
 
     this.agendaDataRepository.createEvent(this.postEvent, this.CalendarName, this.documents).subscribe((value) => {
       console.log(value)
+      this.afterSave();
+      this.hhtpErrorHandle.httpsSucessMessagge('new event')
+      loader.remove();
     }, ((error) => {
       console.log('create event error: ', error)
+      loader.remove();
     }));
 
-    loader.remove();
-    this.afterSave();
-    this.hhtpErrorHandle.httpsSucessMessagge('new event')
+   
+   
+    
   }
 
   /* async save() {