diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index d7343c06a..acba86506 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -61,7 +61,7 @@ export class ApproveEventPage implements OnInit { private attachmentsService: AttachmentsService, ) { this.activatedRoute.paramMap.subscribe(params => { - // + // if (params["params"].serialNumber) { this.serialNumber = params["params"].serialNumber; @@ -72,7 +72,7 @@ export class ApproveEventPage implements OnInit { }); window['approve-event-getTask'] = () => { - this.getTask1() + this.getTask() } } @@ -81,7 +81,7 @@ export class ApproveEventPage implements OnInit { } ngOnInit() { - + this.getTask(); this.backgroundservice.registerBackService('Online', () => { this.getTask(); @@ -95,12 +95,12 @@ export class ApproveEventPage implements OnInit { } addProcessToDB(data) { - + } getProcessFromDB() { - + } getTask1 = () => { @@ -108,11 +108,11 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = res this.addProcessToDB(this.loadedEvent) - + try { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - + } catch(error) { // console.log(this.loadedEvent) throw(error) @@ -133,11 +133,11 @@ export class ApproveEventPage implements OnInit { this.loadedEvent = res this.getAttachments(); this.addProcessToDB(this.loadedEvent) - + try { this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate); this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); - + } catch(error) { // console.log(this.loadedEvent) throw(error) @@ -154,7 +154,7 @@ export class ApproveEventPage implements OnInit { async approveTask(serialNumber: string) { let body = { "serialNumber": serialNumber, "action": "Aprovar" } - + const loader = this.toastService.loading() @@ -174,7 +174,7 @@ export class ApproveEventPage implements OnInit { } async emendTask(serialNumber: string) { - + const modal = await this.modalController.create({ component: EmendMessageModalPage, @@ -188,9 +188,9 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss() .then(async (res) => { - - if(res.data.option == 'save') { - + + if(res.data.option == 'save') { + let body = { "serialNumber": serialNumber, "action": "Emendar", @@ -198,14 +198,14 @@ export class ApproveEventPage implements OnInit { "ReviewUserComment": res.data, } } - + const loader = this.toastService.loading() try { await this.processes.PostTaskAction(body).toPromise() .catch(() => { - + this.offlineManager.storeRequestData('event-listRever', body); }); this.httpErrorHandle.httpsSucessMessagge('Rever') @@ -217,7 +217,7 @@ export class ApproveEventPage implements OnInit { loader.remove() } - + } }, (error) => { console.log(error) @@ -229,7 +229,7 @@ export class ApproveEventPage implements OnInit { async rejeitar(serialNumber: string) { let body = { "serialNumber": serialNumber, "action": "Descartar" } - + const loader = this.toastService.loading() try { await this.processes.PostTaskAction(body).toPromise(); @@ -281,6 +281,7 @@ export class ApproveEventPage implements OnInit { }); return await popover.present().then(() => { this.TaskService.loadEventosParaAprovacao() + this.getTask(); }, (error) => { console.log(error) }) @@ -302,9 +303,9 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss().then(async (res) => { - + if(res.data.option == 'save') { - + let body = { "serialNumber": serialNumber, "action": "Emendar", @@ -312,7 +313,7 @@ export class ApproveEventPage implements OnInit { "ReviewUserComment": res.data, } } - + const loader = this.toastService.loading() @@ -327,7 +328,7 @@ export class ApproveEventPage implements OnInit { loader.remove() } - + } else { } @@ -380,7 +381,7 @@ export class ApproveEventPage implements OnInit { } catch (error) { console.error('getAttchaments',error) } - + } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index b93174794..cc2234028 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -8,7 +8,7 @@
- Editar evento por aprovar ccxcxcxc
+ Editar evento por aprovar
Campos marcados com * são obrigatórios
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index e59a32677..cafbd4728 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -148,8 +148,8 @@ export class EditEventToApproveComponent implements OnInit { async getTask() { const result = await this.processes.GetTask(this.serialNumber).toPromise(); - - + + this.eventProcess = result this.eventProcess.workflowInstanceDataFields.Category = result.workflowInstanceDataFields.EventType this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) @@ -190,17 +190,17 @@ export class EditEventToApproveComponent implements OnInit { getRecurrenceTypes() { this.eventsService.getRecurrenceTypes().subscribe(res=>{ - + this.recurringTypes = res; }); } onSelectedRecurringChanged(ev:any){ - + this.calculetedLastOccurrence(ev); - + if(ev.length > 1){ - + this.postEvent.EventRecurrence.Type = ev.filter(data => data != '-1'); } if(ev.length == 0){ @@ -209,7 +209,7 @@ export class EditEventToApproveComponent implements OnInit { } calculetedLastOccurrence(type:number){ - var valor; + var valor; var opcao: boolean; if (type == 0) { valor = 7; @@ -235,15 +235,15 @@ export class EditEventToApproveComponent implements OnInit { this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; } else { time = new Date( - time.getFullYear() + valor, - time.getMonth(), - time.getDate(), - time.getHours(), + time.getFullYear() + valor, + time.getMonth(), + time.getDate(), + time.getHours(), time.getMinutes() ); this.eventProcess.workflowInstanceDataFields.LastOccurrence = time; } - + } openLastOccurrence() { @@ -318,24 +318,26 @@ export class EditEventToApproveComponent implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - this.toastService._successMessage(); + window['approve-event-getTask'] () + // this.toastService._successMessage(); }, error =>{ if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest(); } }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - this.toastService._successMessage() + window['approve-event-getTask'] () + // this.toastService._successMessage() }, error =>{ if(error.status == 0) { this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { - + this.toastService._badRequest() } }) @@ -360,7 +362,7 @@ export class EditEventToApproveComponent implements OnInit { backdropDismiss: false }); - + modal.onDidDismiss().then((data) => { @@ -372,7 +374,7 @@ export class EditEventToApproveComponent implements OnInit { this.setIntervenient(newAttendees); this.setIntervenientCC(newAttendeesCC); - + } }); await modal.present(); @@ -420,7 +422,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments = result - // + // } deleteAttachment(attachment: Attachment, index) { @@ -463,7 +465,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments.push(DocumentToSave) - + // await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ // this.getAttachments();