From 9024230115bd30276ed945fd96ed519ebc4215ff Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 19 Aug 2021 17:42:34 +0100 Subject: [PATCH] Fix --- .../create-process/create-process.page.ts | 4 +++ .../despacho-pr/despacho-pr.page.ts | 34 ++++++++++--------- .../despachos-pr-options.page.ts | 22 +++++++----- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 27330b355..e9d137b75 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -101,6 +101,10 @@ export class CreateProcessPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); + if (this.task.SerialNumber) { + this.task.serialNumber = this.task.SerialNumber + } + this.taskType = this.navParams.get('taskAction'); diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 0af829ddb..8dd2d231e 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from '../../../../models/dailyworktask.model'; +import { DailyWorkTask, fullTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { Event } from '../../../../models/event.model'; @@ -36,7 +36,7 @@ export class DespachoPrPage implements OnInit { attachments:any; fulltask: any; eventsList: Event[]; - serialnumber: string; + serialNumber: string; caller: string; profile: string; intervenientes: any; @@ -57,28 +57,30 @@ export class DespachoPrPage implements OnInit { ) { this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { - this.serialnumber = params["params"].SerialNumber; + this.serialNumber = params["params"].SerialNumber; } if(params["params"].caller) { this.caller = params["params"].caller; } }); + + console.log('DespachoPrPage SerialNumber', this.serialNumber) } ngOnInit() { this.profile = "mdgpr"; - console.log(this.serialnumber); + console.log(this.serialNumber); this.activateRoute.paramMap.subscribe(paramMap => { if (!paramMap.has('SerialNumber')) { return; } - /* this.serialnumber = paramMap.get('SerialNumber'); */ - this.LoadTaskDetail(this.serialnumber); - // this.LoadRelatedEvents(this.serialnumber); + /* this.serialNumber = paramMap.get('SerialNumber'); */ + this.LoadTaskDetail(this.serialNumber); + // this.LoadRelatedEvents(this.serialNumber); }); - this.LoadTaskDetail(this.serialnumber); - // this.LoadRelatedEvents(this.serialnumber); + this.LoadTaskDetail(this.serialNumber); + // this.LoadRelatedEvents(this.serialNumber); } close() { @@ -91,7 +93,7 @@ export class DespachoPrPage implements OnInit { async LoadTaskDetail(serial: string) { - this.processes.GetTask(serial).subscribe(res => { + this.processes.GetTask(serial).subscribe((res:fullTask) => { this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, @@ -179,7 +181,7 @@ export class DespachoPrPage implements OnInit { async executado(note:string, documents:any) { let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Conhecimento", "ActionTypeId": 104, "dataFields": { @@ -205,7 +207,7 @@ export class DespachoPrPage implements OnInit { async arquivar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { @@ -232,7 +234,7 @@ export class DespachoPrPage implements OnInit { async generateDiploma(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reencaminhar", "ActionTypeId": 99999839, "dataFields": { @@ -258,7 +260,7 @@ export class DespachoPrPage implements OnInit { async concluir(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Executado", "ActionTypeId": 104, "dataFields": { @@ -285,7 +287,7 @@ export class DespachoPrPage implements OnInit { async reexecutar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reexecutar", "ActionTypeId": 100000010, "dataFields": { @@ -314,7 +316,7 @@ export class DespachoPrPage implements OnInit { } sendExpedienteToPending(){ - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ this.goBack(); this.toastService.successMessage('Processo enviado para pendentes') },()=>{ diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 64963673a..1cb269a4d 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -25,7 +25,7 @@ export class DespachosPrOptionsPage implements OnInit { task: any; fulltask: any; - serialnumber: string; + serialNumber: string; profile: string constructor(private activateRoute: ActivatedRoute, @@ -45,10 +45,17 @@ export class DespachosPrOptionsPage implements OnInit { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { - this.serialnumber = params["serialNumber"]; + this.serialNumber = params["serialNumber"]; console.log(params["serialNumber"]); } }); + + if(this.task.serialNumber) { + this.serialNumber = this.task.serialNumber + } else if(this.task.SerialNumber) { + this.serialNumber = this.task.SerialNumber + } + } close () { @@ -90,7 +97,7 @@ export class DespachosPrOptionsPage implements OnInit { } sendExpedienteToPending() { - this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + this.processes.SetTaskToPending(this.serialNumber).subscribe(res=>{ console.log(res); this.close(); },()=>{ @@ -169,7 +176,7 @@ export class DespachosPrOptionsPage implements OnInit { async generateDiploma(note:string, documents:any) { let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reencaminhar", "ActionTypeId": 99999839, "dataFields": { @@ -251,7 +258,7 @@ export class DespachosPrOptionsPage implements OnInit { async arquivar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { @@ -277,7 +284,7 @@ export class DespachosPrOptionsPage implements OnInit { async executado(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Conhecimento", "ActionTypeId": 104, "dataFields": { @@ -303,7 +310,7 @@ export class DespachosPrOptionsPage implements OnInit { async reexecutar(note:string, documents:any){ let body = { - "serialNumber": this.serialnumber, + "serialNumber": this.serialNumber, "action": "Reexecutar", "ActionTypeId": 100000010, "dataFields": { @@ -327,7 +334,6 @@ export class DespachosPrOptionsPage implements OnInit { goBack() { this.location.back() - this.cancle() } cancle() {