save

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

@@ -460,6 +460,8 @@ export class AgendaPage implements OnInit {
             this.eventService.getAllMdEvents( momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59') ).then(
 
               (response:any) => {
+                console.log(response);
+
 
                 // calendar
                 this.calendarService.removeRange(startTime, endTime, 'md')

src/app/pages/events/events.page.ts

@@ -295,7 +295,6 @@ export class EventsPage implements OnInit {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
           console.log(result);
-
           this.expedienteStorage.reset(result)
         });
         break;

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

@@ -1,14 +1,8 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-<ion-content>
+
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
+<ion-header class="ion-no-border header-2">
-    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-     <ion-refresher-content>
-    </ion-refresher-content>
-  </ion-refresher>
-  <div class="main-content d-flex height-100" [ngSwitch]="segment">
-    <div class="content d-flex flex-column">
   <div class="header-content">
     <div class="header-icon-left">
       <button class="btn-no-color cursor-pointer" (click)="goBack()">
@@ -28,9 +22,20 @@
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
-      <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-    </div>
 
+</div>
+</ion-header>
+
+<ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
+     <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+  <div class="main-content d-flex height-100" >
+
+    <div class="content d-flex flex-column">
+    <div [ngSwitch]="segment">
       <ion-list *ngSwitchCase="'MDGPR'">
         <div *ngIf="eventaprovacaostore.listmd" class="overflow-y-auto height-100">
             <ion-item-sliding>
@@ -52,6 +57,7 @@
             </ion-item-sliding>
         </div>
       </ion-list>
+
       <ion-list *ngSwitchCase="'PR'">
         <div *ngIf="eventaprovacaostore.listpr" class="overflow-y-auto height-100">
           <ion-item-sliding>
@@ -74,4 +80,5 @@
       </ion-list>
     </div>
   </div>
+  </div>
 </ion-content>

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

@@ -1,11 +1,17 @@
 @import '~src/function.scss';
+.header-2 {
+  border-top-right-radius: 24px;
+  border-top-left-radius: 24px;
+}
+.header-2{
+  padding: 30px 20px 0 20px !important;
+  background-color: white;
+}
 .main-content{
   background-color: #fff !important;
-  border-top-left-radius: 25px;
-  border-top-right-radius: 25px;
 }
 .content{
-  padding: 30px 20px 0 20px !important;
+  padding: 0px 20px 0 20px !important;
   /* margin: 0 auto; */
   float: left;
   overflow: auto;

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

@@ -45,7 +45,7 @@ export class EventListPage implements OnInit {
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && event.url.startsWith(pathname)) {
         if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
-          this.doRefresh()
+          this.refreshing()
         } else {
           this.LoadToApproveEvents()
         }
@@ -76,12 +76,16 @@ export class EventListPage implements OnInit {
       let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
       this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
       this.eventaprovacaostore.resetmd(this.eventsMDGPRList);
+      console.log(this.eventsMDGPRList);
+
     }
     else if(this.segment == 'PR'){
       let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
       this.eventaprovacaostore.resetpr(this.eventsPRList);
+      console.log(this.eventsMDGPRList);
+
     }
     this.showLoader = false;
     this.skeletonLoader = false
@@ -124,10 +128,11 @@ export class EventListPage implements OnInit {
     }, 1000);
   }
 
-  doRefresh() {
+  doRefresh(event) {
 
     setTimeout(() => {
       this.LoadToApproveEvents();
+      event.target.complete();
     }, 1000);
   }