diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 9814a6372..bf7ad1f2d 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -520,10 +520,9 @@ export class AgendaPage implements OnInit {
             // loop
             this.CalendarStore.pushEvent(response, 'md');
 
-            this.listToPresent = this.CalendarStore.eventSource
             this.trasnformData(response, 'md');
 
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             this.myCal.update();
             this.myCal.loadEvents();
@@ -548,10 +547,8 @@ export class AgendaPage implements OnInit {
           // calendar
           this.CalendarStore.pushEvent(response, 'pr');
 
-          this.listToPresent = this.CalendarStore.eventSource
 
-
-          this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
           this.myCal.update();
@@ -579,10 +576,8 @@ export class AgendaPage implements OnInit {
             this.CalendarStore.removeRange(startTime, endTime, 'pr')
             this.CalendarStore.pushEvent(response, 'pr');
 
-            this.listToPresent = this.CalendarStore.eventSource
 
-
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             // 
 
@@ -615,10 +610,9 @@ export class AgendaPage implements OnInit {
               this.CalendarStore.pushEvent(response, 'md');
   
               
-              this.listToPresent = this.CalendarStore.eventSource
               this.trasnformData(response, 'md');
   
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
   
               // 
               this.myCal.update();
@@ -642,10 +636,7 @@ export class AgendaPage implements OnInit {
             // calendar
             this.CalendarStore.pushEvent(response, 'pr');
   
-            this.listToPresent = this.CalendarStore.eventSource
-  
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
   
             // 
             this.myCal.update();
@@ -680,9 +671,7 @@ export class AgendaPage implements OnInit {
           // loop
           this.CalendarStore.pushEvent(eventsList, 'md');
 
-          this.listToPresent = this.CalendarStore.eventSource
-
-          this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
           this.myCal.update();
@@ -715,10 +704,8 @@ export class AgendaPage implements OnInit {
 
 
           this.CalendarStore.pushEvent(eventsList, 'pr');
-          this.listToPresent = this.CalendarStore.eventSource
 
-
-          this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+          this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           // 
 
@@ -757,9 +744,7 @@ export class AgendaPage implements OnInit {
             // loop
             this.CalendarStore.pushEvent(eventsList, 'pr');
   
-            this.listToPresent = this.CalendarStore.eventSource
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             
             // console.log('this.TimelineMDList', this.TimelineMDList);
 
@@ -793,13 +778,9 @@ export class AgendaPage implements OnInit {
   
             // loop
             this.CalendarStore.pushEvent(eventsList, 'md');
+          
   
-            this.listToPresent = this.CalendarStore.eventSource           
-  
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            // console.log(this.CalendarStore.eventSource)
-            // console.log('this.TimelineMDList', this.TimelineMDList)
-
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
             this.myCal.update();
             this.myCal.loadEvents();
@@ -843,10 +824,7 @@ export class AgendaPage implements OnInit {
             this.CalendarStore.pushEvent(eventsList, 'pr');
             this.listToPresent = this.CalendarStore.eventSource
 
-            
-  
-  
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             // console.log('this.TimelinePRList', this.TimelinePRList)
             // 
   
@@ -1030,22 +1008,22 @@ export class AgendaPage implements OnInit {
         case "Combinado":
 
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if (this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') {
 
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if (this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
           } else {
             
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
 
           }
@@ -1054,17 +1032,17 @@ export class AgendaPage implements OnInit {
         case "Pessoal":
           //Inicializa o array eventSource
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           }
           else if(this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
           } else {
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
           }
           break;
@@ -1072,17 +1050,17 @@ export class AgendaPage implements OnInit {
         case "Oficial":
 
           if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, {segment: this.segment, selectedDate: this.eventSelectedDate})
 
           } else if(this.loggeduser.Profile == 'PR') {
-            this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+            this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
           } else {
             if(this.profile == "pr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             } else if (this.profile == "mdgpr") {
-              this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+              this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
             }
           }
           break;
@@ -1172,13 +1150,13 @@ export class AgendaPage implements OnInit {
     if (this.profile == "mdgpr") {
       this.profile = "pr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
 
     }
     else {
       this.profile = "mdgpr";
       this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
-      this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
+      this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
     }
 
   }
@@ -1260,9 +1238,16 @@ export class AgendaPage implements OnInit {
       this.postEvent = data.event;
 
       this.mobileComponent.showEditEvent = true;
+    } else if(data.type == 'delete') {
+
     }
 
     this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+
+    setTimeout(()=>{
+      this.onCurrentChanged(this.eventSelectedDate)
+    }, 500)
+    
   }
 
 
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index d01f444dd..ae151e20b 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -193,8 +193,6 @@ export class ViewEventPage implements OnInit {
         });
       } else {
 
-        
-
         if(this.CalendarId) {
           this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => {
             this.toastService.successMessage('Evento apagado');