-
diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 81e57b3ca..93304a383 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -97,7 +97,7 @@ export class DelegarPage implements OnInit { let body = { "SerialNumber": this.task.SerialNumber, "DispatchDocId": this.task.DocId, - "FolderID": this.task.FolderId, + "FolderID": this.task.FolderId || this.task.FolderID, "Subject": this.task.Folio, "Comment": this.note, "DelegatedUserEmail": this.taskParticipants[0].EmailAddress, diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts index 3d1b4fe24..db279af79 100644 --- a/src/app/services/toast.service.ts +++ b/src/app/services/toast.service.ts @@ -14,9 +14,7 @@ export class ToastService { private modalController: ModalController, ) { } - ngOnInit() { - - } + ngOnInit() {} async presentToast(infoMessage: string) { const toast = await this.toastController.create({ From 0e30306d49a009d153ad5318f3b75202c66bfb32 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Nov 2021 15:45:32 +0100 Subject: [PATCH 2/6] Improve --- src/app/shared/agenda/approve-event/approve-event.page.html | 2 +- .../edit-event-to-approve/edit-event-to-approve.page.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html index 671c6c56f..35da291f1 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.html +++ b/src/app/shared/agenda/approve-event/approve-event.page.html @@ -22,7 +22,7 @@
- +
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 5570ca88b..cee80c6e3 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -88,7 +88,8 @@ export class EditEventToApprovePage implements OnInit { MDEmail: '', MDName: '', IsAllDayEvent: false, - Message: '' + Message: '', + Status: '' } } @@ -295,7 +296,7 @@ export class EditEventToApprovePage implements OnInit { MDName: this.eventProcess.workflowInstanceDataFields.MDName, MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail, IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent, - Status: null, + Status: this.eventProcess.workflowInstanceDataFields.Status, EventType: this.eventProcess.workflowInstanceDataFields.EventType, IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring, Message: this.eventProcess.workflowInstanceDataFields.Message, From a693afd1d75f7789d4877654dafcee514e8f3ec5 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Nov 2021 16:11:57 +0100 Subject: [PATCH 3/6] Fix --- .../agenda/edit-event-to-approve/edit-event-to-approve.page.ts | 2 +- src/app/shared/agenda/event-list/event-list.page.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index cee80c6e3..bf0cc6f6a 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -301,7 +301,7 @@ export class EditEventToApprovePage implements OnInit { IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring, Message: this.eventProcess.workflowInstanceDataFields.Message, EventRecurrence: { - Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType, + Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType || '-1', LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence, }, ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index f166dd248..924755b02 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -56,7 +56,7 @@ export class EventListPage implements OnInit { } ngOnChanges() { - //this.LoadToApproveEvents(); + this.LoadToApproveEvents(); } segmentChanged(ev: any) { From 05acdd8cd632baf36e73044185b961298ab1763c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Nov 2021 16:45:01 +0100 Subject: [PATCH 4/6] fix generate deploma --- .../despachos/despacho/despacho.page.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) 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 15312a34a..496e12bf4 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -356,6 +356,32 @@ export class DespachoPage implements OnInit { } + async generateDiploma(note:string, documents:any) { + let body = { + "serialNumber": this.serialnumber, + "action": "Reencaminhar", + "ActionTypeId": 99999839, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + + const loader = this.toastService.loading() + + try { + await this.processes.CompleteTask(body).toPromise() + this.toastService.successMessage() + this.close(); + } catch (error) { + this.toastService.badRequest() + } finally { + loader.remove() + } + + } + + toDateString(e) { return new Date(e).toDateString() } @@ -417,6 +443,9 @@ export class DespachoPage implements OnInit { else if (actionName == 'Reexecução') { await this.reexecute(res.data.note, docs); this.goBack(); + } else if(actionName == 'Gerar Diploma') { + await this.generateDiploma(res.data.note, docs); + this.goBack(); } } }); @@ -533,4 +562,5 @@ export class DespachoPage implements OnInit { return await popover.present(); } + } From d2f411841814106ea943e0c03ef0917928258da2 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Nov 2021 16:49:15 +0100 Subject: [PATCH 5/6] DFix --- src/app/pages/agenda/agenda.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 322aa5555..044c38f94 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -339,7 +339,7 @@
-
+
{{event.event.StartDate | date: 'HH:mm'}}
From 39df5e42b7d262fa2b2b569db80c799be26ecdff Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 3 Nov 2021 17:03:16 +0100 Subject: [PATCH 6/6] Fix error --- src/app/pipes/participants.pipe.ts | 2 +- src/app/shared/agenda/edit-event/edit-event.page.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/pipes/participants.pipe.ts b/src/app/pipes/participants.pipe.ts index 9856911c6..92019441b 100644 --- a/src/app/pipes/participants.pipe.ts +++ b/src/app/pipes/participants.pipe.ts @@ -6,7 +6,7 @@ import { EventPerson } from 'src/app/models/eventperson.model' }) export class ParticipantsPipe implements PipeTransform { - transform(EventPerson: EventPerson[]): any { + transform(EventPerson: EventPerson[] = []): any { let taskParticipants = []; let taskParticipantsCc = []; diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 494b832fa..4eef38a80 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -302,9 +302,8 @@ export class EditEventPage implements OnInit { SerialNumber: '', }; - this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{ - this.getAttachments(this.postEvent.EventId); - }); + await this.attachmentsService.setEventAttachmentById(DocumentToSave).toPromise(); + this.getAttachments(this.postEvent.EventId); } else if(remove) { this.attachmentsService.deleteEventAttachmentById(e.Id).subscribe( res=> {})