save

src/app/pages/events/events.page.html

@@ -97,7 +97,7 @@
         <div class="content">
           <ion-list>
             <ion-item class="cursor-pointer" lines="none" *ngFor = "let task of expedientList"
-            (click)="viewExpedientDetail(task.serialNumber)">
+            (click)="goToExpediente(task.serialNumber)">
             <div class="item-exp d-flex">
               <div class="schedule-date">
                 <div class="time-end">{{task.taskStartDate | date: 'dd-MM-yy'}}</div>

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

@@ -320,6 +320,15 @@ export class EventsPage implements OnInit {
     });
   }
 
+  goToExpediente(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "serialNumber": serialNumber,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+  }
+
   async viewExpedientDetail(serialNumber:any) {
     let classs;
     if( window.innerWidth <= 800){

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -1,18 +1,12 @@
 <ion-header class="ion-no-border">
-  <app-btn-modal-dismiss></app-btn-modal-dismiss>
   <div class="title">
-    <ion-label >Correspondência</ion-label>
+    <div class="thetitle"><ion-label >Expediente</ion-label></div>
+    <div class="theicon">
+      <button class="btn-no-color" (click)="doRefresh()">
+        <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
+      </button>
+    </div>
   </div>
-  <ion-toolbar>
-    <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button value="expedientes">
-        Expedientes
-      </ion-segment-button>
-      <ion-segment-button value="pendentes">
-        Pendentes
-      </ion-segment-button>
-    </ion-segment>
-  </ion-toolbar>
 </ion-header>
 <ion-content>
   <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -24,40 +18,13 @@
       </ion-refresher-content>
     </ion-refresher>
   
-  <div class="width-100" [ngSwitch]="segment" *ngIf="taskslist">
+  <div class="width-100" *ngIf="taskslist">
-    <ion-list *ngSwitchCase="'expedientes'">
+    <ion-list>
       <ion-item 
-          class="expediente ion-no-padding"  
+          class="expediente ion-no-padding cursor-pointer"  
           *ngFor = "let task of taskslist"
-          (click)="viewExpedientDetail(task.SerialNumber)"
+          (click)="goToExpediente(task.SerialNumber)"
           >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-            <div class="item width-100">
-              <div class="exp-top-detail">
-                <div class="exp-date">
-                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                </div>
-                <div class="exp-remetente">
-                  <ion-label>{{task.Remetente}}</ion-label>
-                </div>
-                <div class="exp-icon">
-                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                  <label></label>
-                </div>
-              </div>
-              <div class="exp-bottom-detail">
-                <ion-label>{{ task.Folio }}</ion-label>
-              </div>
-            </div>
-          </ion-item>
-    </ion-list>
-    <ion-list *ngSwitchCase="'pendentes'">
-      <ion-item 
-          class="expediente ion-no-padding"  
-          *ngFor = "let task of taskslist"
-          (click)="viewExpedientDetail(task.SerialNumber)"
-          >
-          <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
             <div class="item width-100">
               <div class="exp-top-detail">
                 <div class="exp-date">

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -1,5 +1,5 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -7,7 +7,8 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
 import { LoadingService } from 'src/app/services/loading.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page';
+import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
+import { AlertService } from 'src/app/services/alert.service';
 
 @Component({
   selector: 'app-expediente',
@@ -17,19 +18,23 @@ import { ExpedienteDetailPage } from './expediente-detail/expediente-detail.page
 export class ExpedientePage implements OnInit {
 
   segment:string;
-  profile:string;
+  //profile:string;
 
   @ViewChild(CalendarComponent) myCal: CalendarComponent;
 
   taskslist:DailyWorkTask[];
   serialNumber:string;
 
+  @Input() profile:string;
+  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
-    private navParams: NavParams,
+    private alertService: AlertService,
+    private router: Router, 
     ) { 
-      this.profile = this.navParams.get('profile');
+      this.profile = 'mdgpr';
     }
 
   ngOnInit() {
@@ -40,56 +45,40 @@ export class ExpedientePage implements OnInit {
 
   segmentChanged(){
     console.log(this.segment);
+    
     this.LoadList();
   }
 
+  notImplemented(){
+    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
+  }
+
+  openExpedientDetailPage(data){
+    console.log(data);
+    this.openExpedientDetail.emit(data);
+  }
+
   LoadList(){
-    switch(this.segment){
+    this.processes.GetTasksList("Expediente", false).subscribe(result => {
-      case "expedientes":
+      console.log(result);
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
+      this.taskslist = new Array();
-          console.log(result);
+      let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
-          this.taskslist = new Array();
+      res.forEach(element => {
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
+        let task: DailyWorkTask = {
-          res.forEach(element => {
+          "SerialNumber": element.serialNumber,
-            let task: DailyWorkTask = {
+          "Folio": element.workflowInstanceDataFields.Subject,
-              "SerialNumber": element.serialNumber,
+          "Senders": element.originator.email,
-              "Folio": element.workflowInstanceDataFields.Subject,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-              "Senders": element.originator.email,
+          "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+          "DocumentsQty": 0,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
+          "WorkflowName": element.workflowDisplayName,
-              "DocumentsQty": 0,
+          "activityInstanceName": element.activityInstanceName,
-              "WorkflowName": element.workflowDisplayName,
+        }
-              "activityInstanceName": element.activityInstanceName,
+        this.taskslist.push(task);
-            }
+      });
-            this.taskslist.push(task);
+      console.log(this.taskslist);
-          });
+    });
-          console.log(this.taskslist);
-        });
-        break;
-      case "pendentes":
-        this.processes.GetTasksList("Expediente", false).subscribe(result => {
-          console.log(result);
-          this.taskslist = new Array();
-          let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
-          res.forEach(element => {
-            let task: DailyWorkTask = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.originator.email,
-              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-            }
-            this.taskslist.push(task);
-          });
-          console.log(this.taskslist);
-        });
-        break;
-    }
   }
 
   doRefresh(event) {
@@ -100,17 +89,25 @@ export class ExpedientePage implements OnInit {
     }, 2000);
   }
 
+  goToExpediente(serialNumber:any){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+          "serialNumber": serialNumber,
+      }
+    };
+    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+  }
+
   async viewExpedientDetail(serialNumber:any) {
-
+    console.log(this.profile);
-
     const modal = await this.modalController.create({
       component: ExpedienteDetailPage,
       componentProps:{
+        enterAnimation: "",
         serialNumber: serialNumber,
         profile: this.profile,
       },
       cssClass: 'modal modal-desktop',
-      backdropDismiss: false
     });
     await modal.present();
     modal.onDidDismiss().then((res)=>{