save

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

@@ -19,7 +19,7 @@
           <label>Eventos para Aprovação</label>
         </div>
       <ion-toolbar>
-        <ion-segment [(ngModel)]="segment">
+        <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
           <ion-segment-button value="MDGPR">
             Meu calendário
           </ion-segment-button>
@@ -33,9 +33,9 @@
     <ion-list *ngSwitchCase="'MDGPR'">
       <div *ngIf="eventsMDGPRList" class="overflow-y-auto height-100">
           <ion-item-sliding>
-            <ion-item class="Rectangle cursor-pointer" lines="none" 
+            <ion-item class="Rectangle cursor-pointer" lines="none"
               *ngFor="let event of eventsMDGPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
-              
+
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
@@ -54,7 +54,7 @@
     <ion-list *ngSwitchCase="'PR'">
       <div *ngIf="eventsPRList" class="overflow-y-auto height-100">
         <ion-item-sliding>
-          <ion-item class="Rectangle cursor-pointer" lines="none" 
+          <ion-item class="Rectangle cursor-pointer" lines="none"
               *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">

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

@@ -52,17 +52,24 @@ export class EventListPage implements OnInit {
 
   }
 
-  LoadToApproveEvents(){
+  segmentChanged(ev: any) {
-    this.showLoader = true;
+    this.LoadToApproveEvents();
+  }
 
-    this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
+  async LoadToApproveEvents(){
-      this.showLoader = false;
+    this.showLoader = true;
-      this.eventsPRList = res;
+    console.log(this.segment);
-    });
+    if(this.segment == 'MDGPR'){
-    this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
+      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-      this.showLoader = false;
+      let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-      this.eventsMDGPRList = res;
+      this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
-    });
+    }
+    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.showLoader = false;
   }
 
   async openApproveModal(eventSerialNumber, event){

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -29,7 +29,7 @@ export class EventsToApprovePage implements OnInit {
     private modalController: ModalController,
     private router: Router,
     private userAuth: AuthService,
-    ) 
+    )
     {
       this.loggeduser = userAuth.ValidatedUser;
      }
@@ -37,11 +37,11 @@ export class EventsToApprovePage implements OnInit {
   ngOnInit() {
     this.segment = this.loggeduser.Profile;
     console.log(this.segment);
-    
+
     this.LoadToApproveEvents();
 
     const pathname = window.location.pathname
-    
+
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == pathname) {
         this.LoadToApproveEvents();
@@ -56,15 +56,17 @@ export class EventsToApprovePage implements OnInit {
 
   async LoadToApproveEvents() {
     this.showLoader = true;
-
+    console.log(this.segment);
-    let prEvents = await this.processes.GetToApprovedEvents('PR','false').toPromise();
+    if(this.segment == 'MDGPR'){
-    this.eventsPRList = prEvents;
+      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-    console.log(this.eventsPRList);
+      let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-    
+      this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
-    let mdEvents =  await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
+    }
-    this.eventsMDGPRList = mdEvents;
+    else if(this.segment == 'PR'){
-    console.log(this.eventsMDGPRList);
+      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.showLoader = false;
   }
 
@@ -100,7 +102,7 @@ export class EventsToApprovePage implements OnInit {
     await modal.present();
     modal.onDidDismiss().then((res) => {
       console.log(res['data']);
-      
+
       this.LoadToApproveEvents();
     });
   } */