diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/pages/agenda/edit-event/edit-event.page.scss index b11b9a1d5..35002e5a5 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.scss +++ b/src/app/pages/agenda/edit-event/edit-event.page.scss @@ -105,6 +105,7 @@ width: 100%; font-size: 15px; color:#0d89d1; + } /* SPAN */ .span-left{ diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 2e21d36b6..4e7274cae 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -378,22 +378,6 @@ export class DespachoPage implements OnInit { }); } - async distartExpedientModal2(task: any){ - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: task.serialNumber, - folderId: task.workflowInstanceDataFields.FolderID, - action: 'discart', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss(); - } - async openBookMeetingModal(task: any) { let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 73962cf15..ef9017375 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -70,25 +70,16 @@ export class DespachosPage implements OnInit { } - - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - openExpedientDetailPage(data) { this.openExpedientDetail.emit(data); } async LoadList() { - console.log('HERE'); let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); this.despachoList = new Array(); - console.log(result); - console.log('OI'); - await result.forEach( (element, index) => { @@ -112,14 +103,11 @@ export class DespachosPage implements OnInit { this.despachoList.push(task) }); - - console.log(this.despachoList); this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { - console.log(element); // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index c33e839ff..2c0073bcd 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -1,9 +1,8 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; -import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; +import { Component, Input, OnInit, } from '@angular/core'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; -import { formatDate } from '@angular/common'; -import { ModalController, NavParams } from '@ionic/angular'; +import { ModalController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; @@ -28,6 +27,7 @@ constructor( private alertService: AlertService, private router: Router, private activatedRoute: ActivatedRoute, + private location: Location, ) { this.activatedRoute.queryParams.subscribe(params => { console.log('Cria'); @@ -37,22 +37,42 @@ constructor( } else if (params['segment'] == 'assinados') { this.segment = 'assinados'; } - this.LoadList(); }); } ngOnInit() { - this.router.events.forEach((event) => { + /* this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { console.log('Atualiza'); this.LoadList(); } - }); - console.log('Init'); - this.LoadList(); + }); */ + + //this.LoadList(); } + + ngAfterContentInit(): void { + this.LoadList(); + } + + ngOnChanges(changes: import("@angular/core").SimpleChanges): void { + console.log('HERE'); + + } + + reloadCurrentPage() { + console.log('Reload'); + + window.location.reload(); + } + + refreshComponent(){ + console.log('YEASS N'); + + this.router.navigate([this.router.url]) + } segmentChanged(ev: any) { diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index c033ff438..f75893690 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -124,7 +124,6 @@ export class ExpedientePrPage implements OnInit { this.router.navigate(['/home/gabinete-digital'], navigationExtras); } break; - } }); } @@ -263,7 +262,7 @@ export class ExpedientePrPage implements OnInit { async openAddNoteModal(actionName:string) { let classs; - if( window.innerWidth <= 800){ + if( window.innerWidth < 801){ classs = 'modal modal-desktop' } else { classs = 'modal modal-desktop' diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index c608229e9..2c3a5143f 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -43,6 +43,7 @@ export class ExpedientesPrPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.LoadList(); + console.log('not run'); } }); } diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 2e29c5ccd..31f37ccf1 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -91,14 +91,10 @@ export class DespachosPage implements OnInit { } async LoadList(){ - console.log('HERE DESK'); - let result = await this.processes.GetTasksList("Despacho", false).toPromise(); //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)"); this.despachoList = new Array(); - - console.log(result); await result.forEach( (element, index) => { @@ -127,7 +123,6 @@ export class DespachosPage implements OnInit { this.despachoList = this.sortArrayISODate(this.despachoList).reverse() this.despachoList.forEach( (element, index) => { - console.log(element['FolderID']); // let aplicationId = element.workflowInstanceDataFields.SourceSecFsID; let FolderID = element['FolderID']; @@ -154,25 +149,6 @@ export class DespachosPage implements OnInit { }, 2000); } - async viewExpedientDetail(serialNumber:any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: DespachoPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - // old async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 583cca30b..861784212 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -63,6 +63,8 @@ export class DespachosOptionsPage implements OnInit { } sendExpedienteToPending(){ + console.log(this.task.SerialNumber); + this.popoverController.dismiss(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 227b4626c..66d8df8af 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -119,7 +119,7 @@ export class OptsExpedientePrPage implements OnInit { async approve(note:string, documents:any){ this.popoverController.dismiss(); let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.task.SerialNumber, "action": "Aprovar", "ActionTypeId": 100000004 , "dataFields": { @@ -182,7 +182,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService.badRequest('Processo não descartado') + this.toastService.badRequest('Processo não descartado'); } this.goBack(); } @@ -193,7 +193,7 @@ export class OptsExpedientePrPage implements OnInit { this.toastService.successMessage(); this.goBack(); } catch (error) { - this.toastService.badRequest() + this.toastService.badRequest(); } } } @@ -203,7 +203,7 @@ export class OptsExpedientePrPage implements OnInit { async sendToReview(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.task.SerialNumber, "action": "Retificar", "ActionTypeId": 99999877, "dataFields": { @@ -213,7 +213,7 @@ export class OptsExpedientePrPage implements OnInit { } try { - await this.processes.CompleteTask(body); + await this.processes.CompleteTask(body).toPromise(); this.close(); this.toastService.successMessage() } catch(error) { @@ -223,7 +223,7 @@ export class OptsExpedientePrPage implements OnInit { sendExpedienteToPending(){ this.popoverController.dismiss(); - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close(); }); @@ -285,15 +285,15 @@ export class OptsExpedientePrPage implements OnInit { } goBack() { - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes-pr": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - - // window.history.back(); - + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/expedientes-pr']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } } - } diff --git a/src/global.scss b/src/global.scss index ff578d2b0..e638bc7ce 100644 --- a/src/global.scss +++ b/src/global.scss @@ -287,6 +287,10 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- .btn-refresh{ display: none; } + .attach-title-item{ + width: 200px !important; + border: 1px solid red; + } } .hideAsideOptions{