diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 25adb24af..02cd5c392 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -76,6 +76,7 @@
+
diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 210872df6..eb26f9553 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -7,6 +7,7 @@ import { momentG } from 'src/plugin/momentG'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; @Component({ selector: 'app-diploma', @@ -190,6 +191,25 @@ export class DiplomaPage implements OnInit { }); } + async openBookMeetingModal(task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + close(){ this.modalController.dismiss(); } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index e635edf74..3e8263e15 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -201,12 +201,12 @@ export class GabineteDigitalPage implements OnInit { let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); this.count_total_pending = Object.keys(pendentes).length; - let diplomas = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); + let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - let despachosPr = diplomas.filter(data => data.workflowInstanceDataFields.Status == "Active"); + let despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho"); this.count_de_pr = Object.keys(despachosPr).length; - let diplomasValidar = diplomas.filter(data => data.workflowInstanceDataFields.Status == "Revising"); + let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index a59d42a8a..350948987 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -73,13 +73,13 @@ export class DespachosPage implements OnInit { } goToDespacho(serialNumber:any){ - let navigationExtras: NavigationExtras = { + let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, - } - }; - this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); -} + } + }; + this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); + } notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index f9d4ec769..f8b503866 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/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'; @@ -36,6 +36,7 @@ export class PendentesPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + private router: Router, ) { this.profile = 'mdgpr'; } @@ -121,16 +122,43 @@ 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.viewExpedientDetail(serialNumber); + 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({