make improvements

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -18,46 +18,51 @@
 </ion-header>
 
 <ion-content>
-  <div [ngSwitch]="segment">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+     <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+  <div [ngSwitch]="segment"> 
     <ion-list *ngSwitchCase="'MDGPR'">
       <div *ngIf="eventsMDGPRList">
-      <ion-list>
-        <ion-item-sliding>
-          <ion-item class="Rectangle" lines="none" 
-            *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
-            <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
-              <div class="approve-event-time">
-                <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+        <ion-list>
+          <ion-item-sliding>
+            <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
+                <div class="approve-event-time">
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p>{{event.workflowInstanceDataFields.Location}}</p>
+                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                </div>
               </div>
-              <div class="approve-event-detail">
-                <p>{{event.workflowInstanceDataFields.Location}}</p>
-                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
-              </div>
-            </div>
-          </ion-item>
-        </ion-item-sliding>
-      </ion-list>
-    </div>
-
+            </ion-item>
+          </ion-item-sliding>
+        </ion-list>
+      </div>
     </ion-list>
     <ion-list *ngSwitchCase="'PR'">
-      <ion-item-sliding *ngIf="eventsPRList">
-        <ion-item class="Rectangle" lines="none" 
-            *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
-            <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
-              <div class="approve-event-time">
-                <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+      <div *ngIf="eventsPRList">
+        <ion-item-sliding>
+          <ion-item class="Rectangle" lines="none" 
+              *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber)">
+              <div class="content-{{event.workflowInstanceDataFields.Agenda}}">
+                <div class="approve-event-time">
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                </div>
+                <div class="approve-event-detail">
+                  <p>{{event.workflowInstanceDataFields.Location}}</p>
+                  <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
+                </div>
               </div>
-              <div class="approve-event-detail">
-                <p>{{event.workflowInstanceDataFields.Location}}</p>
-                <h3>{{event.workflowInstanceDataFields.Subject}}</h3>
-              </div>
-            </div>
-          </ion-item>
-      </ion-item-sliding>
+            </ion-item>
+        </ion-item-sliding>
+      </div>
     </ion-list>
   </div>
-
 </ion-content>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -5,6 +5,7 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
 import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+import { NavigationEnd, Router } from '@angular/router';
 
 @Component({
   selector: 'app-event-list',
@@ -13,6 +14,7 @@ import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-
 })
 export class EventListPage implements OnInit {
   segment:string;
+  showLoader: boolean;
   eventsPRList: any;
   eventsMDGPRList: any;
   eventPerson: EventPerson;
@@ -24,71 +26,29 @@ export class EventListPage implements OnInit {
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
+    private router: Router,
     ) { }
 
   ngOnInit() {
-    this.LoadToApproveEvents(); 
-
     this.segment = "MDGPR";
-    this.eventBody = {
-      BodyType: 'string',
-      Text: 'string',
-    }
-    this.eventPerson = {
-      EmailAddress: 'tiago.kayaya@hotmail.com',
-      Name: 'Tiago',
-      IsRequired: false,
-    }
-
-    this.eventsPRList = [
-      {
-        EventId: '1',
-        Subject: 'Reunião do Conselho de Ministros',
-        Body: this.eventBody,
-        Location: 'Luanda',
-        CalendarId: 'string',
-        CalendarName: 'Oficial',
-        StartDate: new Date,
-        EndDate: new Date,
-        EventType: 'Reunião',
-        Attendees: null,
-        IsMeeting: true,
-        IsRecurring: false,
-        AppointmentState: 2,
-        TimeZone: '',
-        Organizer: '',
-        Categories: null,
-        HasAttachments: false,
-      },
-      {
-        EventId: '1',
-        Subject: 'Viagem',
-        Body: this.eventBody,
-        Location: 'Luanda',
-        CalendarId: 'string',
-        CalendarName: 'Pessoal',
-        StartDate: new Date,
-        EndDate: new Date,
-        EventType: 'Reunião',
-        Attendees: null,
-        IsMeeting: true,
-        IsRecurring: false,
-        AppointmentState: 2,
-        TimeZone: '',
-        Organizer: '',
-        Categories: null,
-        HasAttachments: false,
-      },
-  ]
-    
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadToApproveEvents();
+      }
+    });
   }
 
   LoadToApproveEvents(){
+    this.showLoader = true;
+    console.log(this.showLoader);
+    
     this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
+      this.showLoader = false;
       this.eventsPRList = res;
     });
     this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
-      this.eventsMDGPRList = res; 
+      this.showLoader = false;
+      this.eventsMDGPRList = res;
     });
   }
   async openApproveModal(eventSerialNumber){
@@ -105,5 +65,13 @@ export class EventListPage implements OnInit {
 
     modal.onDidDismiss();
   }
+  doRefresh(event) {
+    this.LoadToApproveEvents();
+    console.log('refresh');
+    setTimeout(() => {
+       event.target.complete();
+     }, 2000);
+  }
+
 
 }