Melhorias na opção Back do EventDetails. Melhorias na actualização de dados da Agenda.

src/app/pages/agenda/agenda.page.ts

@@ -27,6 +27,8 @@ export class AgendaPage implements OnInit {
   };
 
   selectedDate: Date;
+  rangeStartDate: Date;
+  rangeEndDate: Date;
 
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
@@ -52,11 +54,16 @@ export class AgendaPage implements OnInit {
 
   ngOnInit() {
     //Inicializar segment
-    this.segment = "Combinada";
-
     this.router.events.forEach((event) => {
-      if(event instanceof NavigationEnd && event.url == this.router.url) {
-        /* this.loading(); */
+      if(event instanceof NavigationEnd && event.url == "/home/agenda") {
+        if (this.segment == null)
+        {
+          this.segment = "Combinada";
+        }
+        else
+        {
+          this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
+        }
       }
     });
   }
@@ -75,11 +82,14 @@ export class AgendaPage implements OnInit {
   }
   //Show information of the event
   async onEventSelected(ev: { event: Event}){
-    this.router.navigate(["/home/events", ev.event.EventId]);
+    this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
   }
 
   onRangeChanged (ev: { startTime: Date, endTime: Date }) {
-    this.loadRangeEvents(ev.startTime, ev.endTime);
+    this.rangeStartDate = ev.startTime;
+    this.rangeEndDate = ev.endTime;
+
+    this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
   };
 
   async openCalModal() {
@@ -88,14 +98,31 @@ export class AgendaPage implements OnInit {
       cssClass: 'cal-modal',
       backdropDismiss: false
     });
+
     await modal.present();
-    modal.onDidDismiss();
+
+    modal.onDidDismiss().then((data) => {
+      let postEvent: Event = data['data'];
+      if (postEvent.Subject != null)
+      {
+        this.eventSource.push({
+          title: postEvent.Subject,
+          startTime: new Date(postEvent.StartDate),
+          endTime: new Date(postEvent.EndDate),
+          allDay: false,
+          event: postEvent
+        });
+        this.myCal.update();
+        this.myCal.loadEvents();
+      }
+    });
     /* this.loading(); */
   }
   
   
   async loadRangeEvents(startTime: Date, endTime: Date){
     this.showLoader = true;
+
     switch (this.segment)
     {
       case "Combinada":
@@ -112,8 +139,9 @@ export class AgendaPage implements OnInit {
               allDay: false,
               event: element
             });
-            this.loading();
           });
+          this.myCal.update();
+          this.myCal.loadEvents();
           this.showLoader = false;
         }
       );
@@ -133,8 +161,9 @@ export class AgendaPage implements OnInit {
                 allDay: false,
                 event: element
               });
-              this.loading();
             });
+            this.myCal.update();
+            this.myCal.loadEvents();
             this.showLoader = false;
           }
         );
@@ -154,8 +183,9 @@ export class AgendaPage implements OnInit {
                 allDay: false,
                 event: element
               });
-              this.loading();
             });
+            this.myCal.update();
+            this.myCal.loadEvents();
             this.showLoader = false;
           }
         );
@@ -163,25 +193,14 @@ export class AgendaPage implements OnInit {
     } 
   }
 
-  RefreshEvents(ev: { startTime: Date, endTime: Date }){
-    this.loadRangeEvents(ev.startTime, ev.endTime);
-  }
-  
-  loading(){
-    this.myCal.loadEvents();
-  } 
-
-  doRefresh(ev){
-    this.loading();
+  doRefresh(ev: any){
+    this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
 
     setTimeout(() => {
       ev.target.complete();
-    }, 2000);
+    }, 250);
   }
   showAlert(){
     this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
   }
-
-  
-
 }