diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index ba630395d..ca3fc32a0 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -11,6 +11,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; export class DiscartExpedientModalPage implements OnInit { serialNumber:string; folderId:string; + action:string; constructor( private modalController: ModalController, private processes:ProcessesService, @@ -19,6 +20,7 @@ export class DiscartExpedientModalPage implements OnInit { ) { this.serialNumber = this.navParams.get('serialNumber'); this.folderId = this.navParams.get('folderId'); + this.action = this.navParams.get('action'); } ngOnInit() { @@ -39,16 +41,15 @@ export class DiscartExpedientModalPage implements OnInit { } */ save(){ - - let body = { "serialNumber": this.serialNumber, "action": "Tratado" } - let body2 = { "serialNumber": this.serialNumber, "action": "Passivo" } - console.log(body); - - if(this.folderId){ + if(this.action != 'discart'){ + let body = { "serialNumber": this.serialNumber, "action": "Tratado" } + console.log(body); this.processes.PostTaskAction(body); } else{ - this.processes.PostTaskAction(body2); + let body = { "serialNumber": this.serialNumber, "action": "Passivo" } + console.log(body); + this.processes.PostTaskAction(body); } this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index d32b3607a..08149a595 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -225,6 +225,7 @@ export class ExpedientTaskModalPage implements OnInit { componentProps: { serialNumber: this.task.serialNumber, folderId: this.task.workflowInstanceDataFields.FolderID, + action: 'complete', }, cssClass: 'discart-expedient-modal', backdropDismiss: false 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 9aeeea0a2..0517504b5 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 @@ -148,7 +148,7 @@
- +
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 ef5b75272..768864c61 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 @@ -13,6 +13,7 @@ import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-m import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' +import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; @Component({ selector: 'app-expediente-detail', @@ -135,10 +136,26 @@ export class ExpedienteDetailPage implements OnInit { } discartExpedient() { - let body = { "serialNumber": this.serialnumber, "action": "Passivo" } + /* let body = { "serialNumber": this.serialnumber, "action": "Passivo" } console.log(body); this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/expediente']); + this.router.navigate(['/home/gabinete-digital/expediente']); */ + } + + async distartExpedientModal(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) {