save

src/app/shared/agenda/event-list/event-list.page.html

@@ -4,7 +4,7 @@
       <label>Eventos para Aprovação</label>
     </div>
   <ion-toolbar>
-    <ion-segment [(ngModel)]="profile">
+    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
         Meu calendário
       </ion-segment-button>
@@ -22,14 +22,14 @@
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content" [ngSwitch]="profile" *ngIf="eventsMDGPRList">
+  <div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
     <!--  <div class="header-content width-100"> -->
-      
-   <!-- </div> --> 
+
+   <!-- </div> -->
      <ion-list class="width-100" *ngSwitchCase="'MDGPR'" >
-       <ion-item 
-         class="item ion-no-padding width-100 cursor-pointer" 
-         *ngFor="let event of eventsMDGPRList" 
+       <ion-item
+         class="item ion-no-padding width-100 cursor-pointer"
+         *ngFor="let event of eventsMDGPRList"
          (click)="openApproveModal(event.serialNumber, event)">
          <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
              <div class="approve-event-time">

src/app/shared/agenda/event-list/event-list.page.ts

@@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
 import { NavigationEnd, Router } from '@angular/router';
+import { AuthService } from 'src/app/services/auth.service';
+import { User } from 'src/app/models/user.model';
 
 @Component({
   selector: 'app-event-list',
@@ -21,6 +23,8 @@ export class EventListPage implements OnInit {
   eventBody: EventBody;
   categories: string[];
   serialnumber:string;
+  loggeduser: User;
+  segment:string;
 
   @Input() profile:string;
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
@@ -31,22 +35,19 @@ export class EventListPage implements OnInit {
     private processes:ProcessesService,
     private modalController: ModalController,
     private router: Router,
-    ) { }
+    private userAuth: AuthService,
+    ) {
+      this.loggeduser = userAuth.ValidatedUser;
+    }
 
     ngOnInit() {
 
-      /* console.log(this.profile); */
-
-      if(this.profile == "mdgpr") {
-        this.profile = 'MDGPR'
-      } else {
-        this.profile = 'PR'
-      }
+      this.segment = this.loggeduser.Profile;
 
       this.LoadToApproveEvents();
-      
+
       const pathname = window.location.pathname
-      
+
       this.router.events.forEach((event) => {
         if(event instanceof NavigationEnd && event.url == pathname) {
           this.LoadToApproveEvents();
@@ -54,18 +55,26 @@ export class EventListPage implements OnInit {
       });
     }
 
-    LoadToApproveEvents() {
-      this.showLoader = true;
-      
-      this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{
-        this.showLoader = false;
-        this.eventsPRList = res;
-      });
-      this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
-        this.showLoader = false;
-        this.eventsMDGPRList = res;
-      });
+    segmentChanged(ev: any) {
+      this.LoadToApproveEvents();
     }
+
+    async LoadToApproveEvents() {
+      this.showLoader = true;
+      console.log(this.segment);
+      if(this.segment == 'MDGPR'){
+        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
+        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
+        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, data) {
 
       let a =this.eventsMDGPRList.filter((elem)=>{
@@ -73,9 +82,9 @@ export class EventListPage implements OnInit {
         return eventSerialNumber == elem.serialNumber
       });
 
-      this.approveEventDismiss.emit({ 
+      this.approveEventDismiss.emit({
         "serialNumber": eventSerialNumber,
-        "action": "Aprovar", 
+        "action": "Aprovar",
         "saveData": data
       });
     }