diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 9f1dd448b..76b7ac1a5 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -122,9 +122,9 @@ export class HomePage implements OnInit { if (service === "agenda") { //this.router.navigate(['/home/', service, idObject, 'home']); this.viewEventDetail(idObject) - } else if (service === "gabinete-digital" && object != "expediente" || object != "event-list") { + } /*else if (service === "gabinete-digital" && object != "expediente" || object != "event-list") { this.router.navigate(['/home/gabinete-digital']); - } else if (service === "gabinete-digital" && object === "expediente") { + } */else if (service === "gabinete-digital" && object === "expediente") { this.viewExpedientDetail(idObject) } else if (service === "gabinete-digital" && object === "event-list") { /* this.ngZone.run(() => {this.router.navigate(['/home/gabinete-digital/event-list', idObject])}) */ @@ -229,6 +229,7 @@ export class HomePage implements OnInit { async viewExpedientDetail(serialNumber:any) { console.log(this.profile); + console.log("Expediente id: ", serialNumber); const modal = await this.modalController.create({ component: ExpedienteDetailPage, diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index f455fb501..15ca40eef 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -65,7 +65,7 @@ export class ApproveEventModalPage implements OnInit { getTask(){ this.processes.GetTask(this.serialNumber).subscribe(res => { - console.log(res); + console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res); this.loadedEvent = res; this.today = new Date(res.workflowInstanceDataFields.StartDate); console.log(new Date(this.today)); @@ -74,6 +74,7 @@ export class ApproveEventModalPage implements OnInit { }) } approveTask(serialNumber:string){ + console.log('approveTask SERIALNUMBER: ', serialNumber) let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); this.processes.PostTaskAction(body); @@ -83,6 +84,7 @@ export class ApproveEventModalPage implements OnInit { } emendTask(serialNumber:string){ + console.log('emendTask: ',serialNumber) /* console.log('Emendar'); */ this.menu.close(); this.openEmendMessageModal(serialNumber); @@ -90,7 +92,7 @@ export class ApproveEventModalPage implements OnInit { } rejectTask(serialNumber:string){ - + console.log('rejectTask: ',serialNumber) let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); this.processes.PostTaskAction(body); @@ -100,6 +102,7 @@ export class ApproveEventModalPage implements OnInit { } getAttachments(){ this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{ + console.log('getAttachments: ',this.serialNumber) this.loadedAttachments = res; console.log(res); }); 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 1fca509aa..e07175330 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 @@ -21,29 +21,29 @@ import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; export class ExpedienteDetailPage implements OnInit { task: any; - fulltask:any; - eventsList: Event[]; - serialnumber:string; + fulltask: any; + eventsList: Event[]; + serialnumber: string; profile: string; constructor(private activateRoute: ActivatedRoute, - private processes:ProcessesService, + private processes: ProcessesService, private iab: InAppBrowser, private attachments: AttachmentsService, private events: EventsService, private menu: MenuController, - private router:Router, + private router: Router, private modalController: ModalController, private navParams: NavParams, - private alertService: AlertService) { - this,this.serialnumber = this.navParams.get('serialNumber'); - this,this.profile = this.navParams.get('profile'); - } + private alertService: AlertService) { + this.serialnumber = this.navParams.get('serialNumber'); + this.profile = this.navParams.get('profile'); + } ngOnInit() { this.profile = "mdgpr"; this.activateRoute.paramMap.subscribe(paramMap => { - if (!paramMap.has('SerialNumber')){ + if (!paramMap.has('SerialNumber')) { return; } this.serialnumber = paramMap.get('SerialNumber'); @@ -55,8 +55,7 @@ export class ExpedienteDetailPage implements OnInit { } - async LoadTaskDetail(serial:string) - { + async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe(res => { this.task = { "SerialNumber": res.serialNumber, @@ -68,18 +67,16 @@ export class ExpedienteDetailPage implements OnInit { } this.fulltask = res; console.log(res); - + }); } - async LoadRelatedEvents(serial:string) - { - if (this.eventsList == null) - { + async LoadRelatedEvents(serial: string) { + if (this.eventsList == null) { this.attachments.getAttachmentsBySerial(serial).subscribe(res => { console.log(res); - res.forEach(att =>{ - if (this.eventsList == null){ + res.forEach(att => { + if (this.eventsList == null) { this.eventsList = new Array(); } this.events.getEvent(att.ParentId).subscribe(event => { @@ -91,20 +88,20 @@ export class ExpedienteDetailPage implements OnInit { } } - viewDocument(){ - const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); + viewDocument() { + const url: string = this.task.DocumentURL.replace("webTRIX.Viewer", "webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url, "_blank"); browser.show(); } openMenu() { - this.menu.open(); + this.menu.open(); } - async openExpedientActionsModal(taskAction:any, task:any){ + async openExpedientActionsModal(taskAction: any, task: any) { const modal = await this.modalController.create({ component: ExpedientTaskModalPage, - componentProps:{ + componentProps: { taskAction: taskAction, task: task, }, @@ -115,17 +112,17 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss(); } - discartExpedient(){ + discartExpedient() { let body = { "serialNumber": this.serialnumber, "action": "Task Completed" } console.log(body); this.processes.PostTaskAction(body); this.router.navigate(['/home/gabinete-digital/expediente']); } - async openBookMeetingModal(task:any){ + async openBookMeetingModal(task: any) { const modal = await this.modalController.create({ component: BookMeetingModalPage, - componentProps:{ + componentProps: { task: task, }, cssClass: 'book-meeting-modal', @@ -135,12 +132,12 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss(); } - async viewEventDetail(eventId:any) { + async viewEventDetail(eventId: any) { console.log(this.profile); - + const modal = await this.modalController.create({ component: ViewEventPage, - componentProps:{ + componentProps: { eventId: eventId, profile: this.profile, }, @@ -148,8 +145,8 @@ export class ExpedienteDetailPage implements OnInit { backdropDismiss: false }); await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ + modal.onDidDismiss().then((res) => { + if (res) { } }); }