diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index ef6818ff2..04811f220 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -19,40 +19,40 @@ -
-
- - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Senders}} +
+
+ {{task.WorkflowName}} +
+
+ + +
-
- {{task.Senders}} -
-
- {{task.WorkflowName}} -
-
- - +
+ {{ task.Folio }}
-
- {{ task.Folio }} -
-
-
-
- + + + +
-
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 596932b5d..95ac65ec2 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -1,5 +1,5 @@ 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'; @@ -34,6 +34,7 @@ export class PendentesPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + private router: Router, ) { this.profile = 'mdgpr'; } @@ -122,14 +123,46 @@ export class PendentesPage implements OnInit { async viewTaskDetails(serialNumber:string, workflowName:string) { console.log(this.profile); if(workflowName == 'Despacho'){ - this.openDespacho(serialNumber); + this.goToDespacho(serialNumber); } else if(workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento'){ - this.openPedido(serialNumber); + this.goToPedido(serialNumber); + } + else if(workflowName == 'Expediente'){ + this.goToExpediente(serialNumber); } } + + goToDespacho(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); + } + + goToPedido(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); + } + + goToExpediente(serialNumber:any){ + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + }; + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + } + + async openDespacho(serialNumber:string){ const modal = await this.modalController.create({