diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 82e73c0e7..38fbc38b0 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -1,5 +1,9 @@ - + + + + +
Despachos Presidenciais diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss index 0a5f9d37c..48da12d72 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss @@ -1,5 +1,21 @@ @import '~src/function.scss'; -/* CONTENT */ +:host{ + margin: 0; +} + +.header-2 { + border-top-right-radius: 24px; + border-top-left-radius: 24px; +} + +ion-content, .header-2, .main-content{ + padding: 30px 20px 0 20px !important; + background-color: white; +} +.main-content { + padding-top: 0px !important; +} + .main-content{ padding: 30px 20px 0 20px !important; margin: 0; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 83b94fb5e..099d64b36 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -53,12 +53,11 @@ export class DespachosPrPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private authService: AuthService, - private navParams: NavParams, private router: Router, ) { this.loggeduser = authService.ValidatedUser; - this.profile = this.navParams.get('profile') || 'mdgpr'; + this.profile = 'mdgpr'; } @@ -68,8 +67,8 @@ export class DespachosPrPage implements OnInit { this.segment = "despachos"; this.LoadList(); this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); + console.log(res); + }); } segmentChanged(ev: any) { @@ -79,7 +78,7 @@ export class DespachosPrPage implements OnInit { goToDespachoPr(serialNumber:any){ let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, } }; this.router.navigate(['/home/gabinete-digital/despachos-pr/despacho-pr'], navigationExtras); @@ -140,12 +139,12 @@ export class DespachosPrPage implements OnInit { } - sortArrayISODate(myArray: any){ - return myArray.sort(function(a, b) { - return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); - }); - } - + sortArrayISODate(myArray: any){ + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } + doRefresh(event) { this.LoadList(); @@ -180,121 +179,120 @@ export class DespachosPrPage implements OnInit { }); } - // old - async openExpedientActionsModal(taskAction: any, task: any) { - //this.modalController.dismiss(); - let classs; - if( window.innerWidth <= 800){ - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } + // old + async openExpedientActionsModal(taskAction: any, task: any) { + //this.modalController.dismiss(); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } - const doc = this.loadedAttachments[ this.dicIndex]; + const doc = this.loadedAttachments[ this.dicIndex]; - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } + task = { + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, + } - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - profile: this.profile, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then(res=>{ - console.log(res['data']); - if(res['data']=='openDiscart'){ - console.log('open discart'); - - // this.distartExpedientModal(); + const modal = await this.modalController.create({ + component: ExpedientTaskModalPage, + componentProps: { + taskAction: taskAction, + task: task, + profile: this.profile, + }, + cssClass: classs, + }); + await modal.present(); + modal.onDidDismiss().then(res=>{ + console.log(res['data']); + if(res['data']=='openDiscart'){ + console.log('open discart'); + + // this.distartExpedientModal(); - } + } - }); - } + }); + } + + async openBookMeetingModal(task: any) { + + const doc = this.loadedAttachments[ this.dicIndex]; + + task = { + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, + } + + 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: task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + + async distartExpedientModal() { + + const doc = this.taskList[ this.dicIndex]; + + console.log(doc, this.dicIndex, this.taskList) + + const modal = await this.modalController.create({ + component: DiscartExpedientModalPage, + componentProps: { + serialNumber: doc.serialNumber, + folderId: doc.workflowInstanceDataFields.FolderID, + action: 'complete', + }, + cssClass: 'discart-expedient-modal', + backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss().then(res=>{ + if(res['data']=='close'){ + // this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); + } - async openBookMeetingModal(task: any) { - - const doc = this.loadedAttachments[ this.dicIndex]; - - task = { - serialNumber: doc.SourceId, - taskStartDate: doc.CreateDate, - isEvent: true, - workflowInstanceDataFields: { - FsId: doc.ApplicationId, - FolderID: null, - DocId: doc.SourceId, - Subject: doc.SourceName - }, - } - - 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: task, - }, - cssClass: classs, - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - - - async distartExpedientModal() { - - const doc = this.taskList[ this.dicIndex]; - - console.log(doc, this.dicIndex, this.taskList) - - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: doc.serialNumber, - folderId: doc.workflowInstanceDataFields.FolderID, - action: 'complete', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss().then(res=>{ - if(res['data']=='close'){ - // this.close(); - /* console.log('2Expedient Discard closed2'); - this.close(); - this.openMenu(); */ - } - - }); - } - - docIndex(index: number) { + docIndex(index: number) { this.dicIndex = index; } - goBack(){ this.router.navigate(['/home/gabinete-digital']); } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index 12e6ec912..79f014ac7 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -13,6 +13,7 @@ ion-content, .header-2, .main-content{ padding: 30px 20px 0 20px !important; background-color: white; } + .main-content { padding-top: 0px !important; } diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 8fb8d6c4d..7a19863d9 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -72,7 +72,7 @@
-
+
{ + + if(params['segment'] == 'validar') { + this.segment = 'validar'; + } else if (params['segment'] == 'assinados') { + this.segment = 'assinados'; + } + + this.LoadList(); + }); + this.LoadList(); } @@ -42,12 +55,12 @@ constructor( this.LoadList(); } - goToDiploma(serialNumber:any){ + goToDiploma(serialNumber:any) { let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, } - }; + } this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras); } @@ -61,7 +74,8 @@ constructor( let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = new Array(); - console.log(diplomas); + console.log('diplomas', diplomas); + switch (this.segment) { case 'validar': let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma"); @@ -86,7 +100,7 @@ constructor( } this.diplomasList.push(task); }, - (error)=>{ + (error)=> { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, @@ -105,7 +119,6 @@ constructor( this.showLoader = false; break; case 'assinados': - console.log('Assinados'); break; } @@ -140,5 +153,5 @@ constructor( goBack(){ this.router.navigate(['/home/gabinete-digital']); } - + } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0cb71da9a..906a1f26c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -340,11 +340,12 @@ export class GabineteDigitalPage implements OnInit { } } - openPedidosPage(segment:string){ + openPedidosPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { //this.openPedidoList(); - this.router.navigate(['/home/gabinete-digital/pedidos']); + let navigationExtras: NavigationExtras = { queryParams: {"deferimento": true,}}; + this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras); } else{ this.segment = segment; @@ -354,7 +355,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPage(segment:string){ + openDespachosPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDespachoList(); @@ -411,7 +412,8 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDeploma(); - this.router.navigate(['/home/gabinete-digital/diplomas']); + let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}}; + this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } else{ this.segment = segment; @@ -425,7 +427,8 @@ export class GabineteDigitalPage implements OnInit { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDeploma(); - this.router.navigate(['/home/gabinete-digital/diplomas-assinar']); + let navigationExtras: NavigationExtras = { queryParams: {"segment": 'assinados',}}; + this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras); } else{ let navigationExtras: NavigationExtras = { queryParams: {"diplomasassinar": true,}}; diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 8fe367137..981a85064 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; @@ -37,10 +37,11 @@ export class PedidosPage implements OnInit { @Output() openExpedientDetail:EventEmitter = new EventEmitter(); constructor( - private router: Router, - private processes:ProcessesService, - private modalController: ModalController, - private alertService: AlertService, + private router: Router, + private processes:ProcessesService, + private modalController: ModalController, + private alertService: AlertService, + private activatedRoute: ActivatedRoute, ) { this.profile = 'mdgpr'; } @@ -48,11 +49,21 @@ export class PedidosPage implements OnInit { ngOnInit() { //Inicializar segment this.segment = 'parecer'; + + this.activatedRoute.queryParams.subscribe(params => { + if(params['deferimento'] == 'true') { + this.segment = 'deferimento'; + } else if (params['parecer'] == 'true') { + this.segment = 'parecer'; + } + + this.LoadList(); + }); this.LoadList(); } - goBack(){ + goBack() { this.router.navigate(['/home/gabinete-digital']); } @@ -63,7 +74,7 @@ export class PedidosPage implements OnInit { goToPedido(serialNumber:any){ let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, } }; this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 00b674361..d0a4181b2 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { formatDate } from '@angular/common'; @@ -27,6 +27,7 @@ constructor( private modalController: ModalController, private alertService: AlertService, private router: Router, + private activatedRoute: ActivatedRoute, ) { this.profile = 'mdgpr'; this.segment = 'validar' @@ -35,9 +36,12 @@ constructor( ngOnInit() { //Inicializar segment this.segment = 'validar'; + + + this.LoadList(); } - + segmentChanged(ev: any) { this.LoadList(); } @@ -45,7 +49,7 @@ constructor( goToDiploma(serialNumber:any){ let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, } }; this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras);