From 3fca0c848cd6f3dbe3064cf91c41a85e3f334f66 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 6 Aug 2021 16:20:50 +0100 Subject: [PATCH] add --- src/app/pages/events/events.page.html | 2 +- .../expediente-detail.page.html | 6 +- .../expediente-detail.page.ts | 99 +++++++++++++++++++ 3 files changed, 103 insertions(+), 4 deletions(-) diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 0b679e7f3..8da0ebb55 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -44,7 +44,7 @@
- {{ toDayEventStorage.eventsList | json}} +
Enviar para o PR
- +
Solicitar revisão
- +
Outras opções
- +
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 8af165c68..1d245dae7 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 @@ -16,6 +16,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { Location } from '@angular/common'; import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocument } from 'src/app/models/search-document'; +import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; @Component({ selector: 'app-expediente-detail', @@ -79,6 +80,104 @@ export class ExpedienteDetailPage implements OnInit { this.toastService.presentToast('Não foi possível fazer login"'); } + + async approve(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Aprovar", + "ActionTypeId": 100000004 , + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + + console.log(body); + + const loader = this.toastService.loading() + + try { + await this.processes.CompleteTask(body).toPromise(); + this.close(); + this.toastService.successMessage('Processo aprovado') + } catch(error) { + this.toastService.badRequest('Processo não aprovado') + } finally { + loader.remove() + } + + } + + async sendToReview(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Retificar", + "ActionTypeId": 99999877, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + + const loader = this.toastService.loading() + + try { + await this.processes.CompleteTask(body).toPromise() + this.close(); + this.toastService.successMessage() + } catch(error) { + this.toastService.badRequest() + } finally { + loader.remove() + } + } + + + async openAddNoteModal(actionName:string) { + let classs; + if( window.innerWidth < 801) { + classs = 'modal modal-desktop' + } else { + classs = 'add-note-modal' + } + const modal = await this.modalController.create({ + component: AddNotePage, + componentProps:{ + showAttachmentBtn: false, + }, + cssClass: classs, + //backdropDismiss: true + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + console.log(res); + if(res.data){ + const DocumentToSave = res.data.documents.map((e) => { + return { + ApplicationId: e.ApplicationType, + SourceId: e.Id, + } + }); + + let docs = { + ProcessInstanceID: "", + Attachments: DocumentToSave, + } + + if(actionName == 'Aprovar'){ + this.approve(res.data.note, docs); + } + else if(actionName == 'Revisão'){ + this.sendToReview(res.data.note, docs); + } + this.goBack(); + } + }); + } + + goBack() { this.location.back(); /* if(this.task.Status == "Pending" && this.caller != 'events'){