diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index dde835def..aa3272b4f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -5,7 +5,7 @@ {{modalTitle[taskType]}}
- +
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index dbb72b4b1..e724f7e13 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -62,7 +62,7 @@ export class DarParecerPage implements OnInit { console.log(body); try { - await this.processes.CompleteTask(body).toPromise() + await this.processes.CompleteTask(body).toPromise(); this.modalController.dismiss(); this.successMessage() } catch (error) { diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index dba6a266a..83ab31cef 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -75,6 +75,9 @@ export class DelegarPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } + goBack() { + window.history.back() + } cancelTask(){ this.modalController.dismiss(null); } @@ -100,7 +103,7 @@ export class DelegarPage implements OnInit { (error)=>{ this.badRequest() }); - this.close(); + this.goBack(); } } 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 c3023a98e..594bd2bb8 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -84,22 +84,7 @@ export class DespachoPage implements OnInit { } goBack() { - - // this.activatedRoute.queryParams.subscribe(params => { - // if(params["from"] == 'pendentes') { - // this.router.navigate(['/home/gabinete-digital/pendentes']); - // } else { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "despachos": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); - // } - // }); - window.history.back() - } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 440d392ae..ff8c63d82 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -2,41 +2,6 @@ -
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index cba216bda..bd37a2a32 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -227,20 +227,19 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - console.log(body); if(body == 'descartar'){ if(res['data']== 'Yes'){ let otherbody = { "serialNumber": this.task.SerialNumber, "action": "Passivo", - "ActionTypeId": 94, + "ActionTypeId": 99999877, "dataFields": { "Note": "", } } - try { + try { await this.processes.CompleteTask(otherbody).toPromise() this.successMessage() } catch (error) { @@ -255,7 +254,7 @@ export class ExpedienteDetailPage implements OnInit { else{ if(res['data']== 'Yes'){ try { - await this.processes.CompleteTask(body).toPromise() + //await this.processes.CompleteTask(body).toPromise() this.successMessage() } catch (error) { this.badRequest() 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 83cf79df5..bed0e421d 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 @@ -313,21 +313,20 @@ export class ExpedientePrPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - console.log(body); if(body == 'descartar'){ if(res['data']== 'Yes'){ let otherbody = { - "serialNumber": body.serialNumber, + "serialNumber": this.task.SerialNumber, "action": "Passivo", - "ActionTypeId": 94, + "ActionTypeId": 99999877, "dataFields": { "Note": "", } } try { - await this.processes.CompleteTask(otherbody).toPromise() + await this.processes.CompleteTask(otherbody).toPromise(); this.successMessage() } catch (error) { this.badRequest() @@ -343,7 +342,7 @@ export class ExpedientePrPage implements OnInit { if(res['data']== 'Yes'){ try { - await this.processes.CompleteTask(body).toPromise() + //await this.processes.CompleteTask(body).toPromise() this.successMessage() this.goBack(); } catch (error) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index d2de06148..4802585c9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -107,7 +107,6 @@
-
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 6734a2cad..31376a64a 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -41,7 +41,6 @@ export class PedidoPage implements OnInit { fulltask: any; eventsList: Event[]; serialnumber: string; - profile: string; intervenientes: any; cc: any; loggeduser: User; @@ -61,15 +60,11 @@ export class PedidoPage implements OnInit { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; - // console.log(params["serialNumber"]); } }); } ngOnInit() { - this.profile = "mdgpr"; - // console.log(this.serialnumber); - this.LoadTaskDetail(this.serialnumber); } @@ -255,7 +250,6 @@ export class PedidoPage implements OnInit { componentProps: { taskAction: taskAction, task: this.fulltask, - profile: this.profile, }, cssClass: classs, }); @@ -286,13 +280,11 @@ export class PedidoPage implements OnInit { } async viewEventDetail(eventId: any) { - console.log(this.profile); const modal = await this.modalController.create({ component: ViewEventPage, componentProps: { eventId: eventId, - profile: this.profile, }, cssClass: 'modal modal-desktop', backdropDismiss: false @@ -370,6 +362,7 @@ export class PedidoPage implements OnInit { await modal.present(); modal.onDidDismiss(); } + async openAddNoteModal(actionName:string) { let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index abe625250..b313655e8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -32,7 +32,6 @@ export class PedidosPage implements OnInit { taskType: string; serialNumber:string; - @Input() profile:string; @Input() segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -43,7 +42,6 @@ export class PedidosPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, ) { - this.profile = 'mdgpr'; } ngOnInit() { @@ -176,28 +174,11 @@ export class PedidosPage implements OnInit { } async viewPedidoDetail(serialNumber:any) { - console.log(this.profile); - - // const modal = await this.modalController.create({ - // component: PedidoPage, - // componentProps:{ - // enterAnimation: "", - // serialNumber: serialNumber, - // profile: this.profile, - // }, - // cssClass: 'modal modal-desktop', - // }); - // await modal.present(); - // modal.onDidDismiss().then((res)=>{ - // console.log('refresh list'); - // this.LoadList(); - // }); let navigationExtras: NavigationExtras = { queryParams: { enterAnimation: "", serialNumber: serialNumber, - profile: this.profile, } }; this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);