From f38c1185ad90531bf0ef14085c35f1bcca01c68a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 12:07:09 +0100 Subject: [PATCH 1/9] save --- .../despachos-pr/despacho-pr/despacho-pr.page.html | 9 ++++++++- .../diplomas-assinar/diplomas-assinar.page.ts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 73dff8af9..b6e653e88 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -109,7 +109,7 @@
-
+
@@ -120,6 +120,13 @@
+
+ + + + +
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 0cd48a4be..030a27f00 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -40,7 +40,7 @@ goToDiploma(serialNumber:any){ "serialNumber": serialNumber, } }; - this.router.navigate(['/home/gabinete-digital/diplomas/diploma'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras); } doRefresh() { From b2dbc41a08e5e1e4b219672864c86efd68a59a4b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 13:33:25 +0100 Subject: [PATCH 2/9] save --- .../despacho-pr/despacho-pr.page.html | 8 +- .../despacho-pr/despacho-pr.page.ts | 47 +++++ .../expedient-task-modal.page.ts | 178 +++++++++--------- 3 files changed, 141 insertions(+), 92 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index b6e653e88..4f25ed658 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -109,7 +109,7 @@
-
+
@@ -120,9 +120,9 @@
-
- - +
+ +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index e70b621a9..26eef1363 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -231,6 +231,47 @@ export class DespachoPrPage implements OnInit { } + async concluir(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Executado", + "ActionTypeId": 104, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + try { + await this.processes.CompleteTask(body); + this.successMessage() + this.close(); + } catch (error) { + this.badRequest() + } + + } + + + async reexecutar(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Reexecutar", + "ActionTypeId": 100000010, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + try { + await this.processes.CompleteTask(body); + this.successMessage() + this.close(); + } catch (error) { + this.badRequest() + } + + } + sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); @@ -282,6 +323,12 @@ export class DespachoPrPage implements OnInit { else if(actionName == 'Gerar Diploma'){ this.generateDiploma(res.data.note, docs); } + else if(actionName == 'Concluido'){ + this.concluir(res.data.note, docs); + } + else if(actionName == 'Reexecução'){ + this.reexecutar(res.data.note, docs); + } } }); } 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 10188bd70..f3fd7dbb1 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 @@ -95,7 +95,7 @@ export class ExpedientTaskModalPage implements OnInit { Message: '', SourceSecFsId: this.task.workflowInstanceDataFields.FsId, //361 SourceType: 'DOC', //FOLDER - SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId + SourceId: this.task.workflowInstanceDataFields.DocIdD, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], @@ -115,6 +115,8 @@ export class ExpedientTaskModalPage implements OnInit { } ngOnInit() { + console.log(this.postData); + this.taskDate = new Date(this.task.taskStartDate); if(!this.task.hasOwnProperty('isEvent')) { this.getAttachments(); @@ -176,96 +178,100 @@ export class ExpedientTaskModalPage implements OnInit { }); docs.Attachments = DocumentToSave; this.dispatchFolder.SubjectTypes = this.selectedTypes; - if(this.taskParticipants.length > 0) { + switch (this.loggeduser.Profile) { case 'MDGPR': - switch (this.taskType) { - case '0': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs, - //SubjectTypes: [], - } - try { - this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } - console.log('this.taskResult', this.taskResult); - let action_despacho = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 94, - "dataFields": { - "Note": "", + if(this.taskParticipants.length > 0) { + switch (this.taskType) { + case '0': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs, + //SubjectTypes: [], } - } - this.modalController.dismiss(action_despacho); - break; - - case '1': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs - } - - try { - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } - - let action_parecer = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 92, - "dataFields": { - "Note": "", + try { + this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') } - } - this.modalController.dismiss(action_parecer); - break; - case '2': - this.postData = { - DistributionType: "Paralelo", - CountryCode: 'AO', - Priority: this.postData.Priority, - UserEmail: this.user, - UsersSelected: attendees, - DispatchFolder: this.dispatchFolder, - AttachmentList: docs - } - //console.log(this.postData); - try { - this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() - await this.successMessage('Processo efetuado') - } catch (error) { - await this.badRequest('Processo não efetuado') - } - console.log('this.taskResult', this.taskResult); - let action_deferimento = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": "", + console.log('this.taskResult', this.taskResult); + let action_despacho = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_despacho); + break; + + case '1': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs + } + + try { + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + + let action_parecer = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 92, + "dataFields": { + "Note": "", + } + } + this.modalController.dismiss(action_parecer); + break; + case '2': + this.postData = { + DistributionType: "Paralelo", + CountryCode: 'AO', + Priority: this.postData.Priority, + UserEmail: this.user, + UsersSelected: attendees, + DispatchFolder: this.dispatchFolder, + AttachmentList: docs + } + //console.log(this.postData); + try { + this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() + await this.successMessage('Processo efetuado') + } catch (error) { + await this.badRequest('Processo não efetuado') + } + console.log('this.taskResult', this.taskResult); + let action_deferimento = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 93, + "dataFields": { + "Note": "", } } this.modalController.dismiss(action_deferimento); - break; + break; } - + } + else { + this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); + } break; case 'PR': switch (this.taskType) { @@ -280,6 +286,7 @@ export class ExpedientTaskModalPage implements OnInit { AttachmentList: docs, //SubjectTypes: [], } + console.log(this.postData); try { this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise(); await this.successMessage('Processo efetuado') @@ -328,11 +335,6 @@ export class ExpedientTaskModalPage implements OnInit { } break; } - } - else { - this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); - } - } getAttachments() { From ca024487bf01e19d7df93c32ad4f3783624d615d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 13:43:25 +0100 Subject: [PATCH 3/9] save --- .../despachos-pr/despacho-pr/despacho-pr.page.ts | 3 ++- .../despachos-pr/despachos-pr.page.ts | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 26eef1363..83ae06620 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -324,11 +324,12 @@ export class DespachoPrPage implements OnInit { this.generateDiploma(res.data.note, docs); } else if(actionName == 'Concluido'){ - this.concluir(res.data.note, docs); + //this.concluir(res.data.note, docs); } else if(actionName == 'Reexecução'){ this.reexecutar(res.data.note, docs); } + this.goBack(); } }); } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 83b94fb5e..17ba6a762 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -15,7 +15,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { AuthService } from 'src/app/services/auth.service'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; import { User } from 'src/app/models/user.model'; -import { NavigationExtras, Router } from '@angular/router'; +import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; @Component({ selector: 'app-despachos-pr', @@ -63,13 +63,15 @@ export class DespachosPrPage implements OnInit { } ngOnInit() { - //Inicializar segment this.segment = "despachos"; this.LoadList(); - this.authService.userData$.subscribe((res:any)=>{ - console.log(res); - }); + + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.LoadList(); + } + }); } segmentChanged(ev: any) { From 076db4a6ceee798ec7bee98e6a9ee9941e5c63bc Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 13:57:33 +0100 Subject: [PATCH 4/9] save --- .../gabinete-digital/gabinete-digital.page.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0cb71da9a..06d3919d4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -204,10 +204,18 @@ export class GabineteDigitalPage implements OnInit { this.count_total_pending = Object.keys(pendentes).length; let despachospr = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - let despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho"); - this.count_de_pr = Object.keys(despachosPr).length; - + let despachosPr; + switch (this.loggeduser.Profile) { + case 'MDGPR': + despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho"); + this.count_de_pr = Object.keys(despachosPr).length; + break; + case 'PR': + despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho"); + this.count_de_pr = Object.keys(despachosPr).length; + break; + } + let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; From dc0eb3b31b2f495a1c72e1e91ee67b36551c3123 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 13:57:51 +0100 Subject: [PATCH 5/9] save --- src/app/modals/create-process/create-process.page.ts | 1 + src/app/models/folder.model.ts | 1 + .../expediente/expedient-task-modal/expedient-task-modal.page.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 7c9cf5177..fb994882c 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -85,6 +85,7 @@ export class CreateProcessPage implements OnInit { SourceId: this.task.workflowInstanceDataFields.DocId, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], + NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, }; diff --git a/src/app/models/folder.model.ts b/src/app/models/folder.model.ts index 0c82e912f..da5aab8bf 100644 --- a/src/app/models/folder.model.ts +++ b/src/app/models/folder.model.ts @@ -7,4 +7,5 @@ export class Folder{ SourceId:string; DeadlineType: string; SubjectTypes: string[]; + NumberPDPP:string; } \ No newline at end of file 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 f3fd7dbb1..cbd5c67db 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 @@ -98,6 +98,7 @@ export class ExpedientTaskModalPage implements OnInit { SourceId: this.task.workflowInstanceDataFields.DocIdD, //FolderId DeadlineType: '', SubjectTypes: ['99999844'], + NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, }; From 9448b5f68b1665c4d7062f8e86397c5a54677b86 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 14:06:27 +0100 Subject: [PATCH 6/9] save --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 3 +-- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index d852360bb..662259267 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -136,9 +136,8 @@

Diplomas por Assinar

-

{{count_dip_Signed}} Documentos

+

{{count_dip_as}} Documentos

-
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 06d3919d4..c42d48841 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -38,6 +38,7 @@ export class GabineteDigitalPage implements OnInit { count_dip_apr : string; count_dip_Signed =0 count_dip_pv=0; + count_dip_as = 0; count_de_pr = 0; count_ev_pr=0; count_ev_md=0; @@ -219,6 +220,9 @@ export class GabineteDigitalPage implements OnInit { let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; + let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); + this.count_dip_as = Object.keys(diplomasAssinar).length; + this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed"); this.count_dip_Signed = Object.keys(res).length From 0e5845eea73f567345fc9fe80e7c9c506abfa227 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 14:15:57 +0100 Subject: [PATCH 7/9] save --- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c42d48841..7b553ee18 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -220,7 +220,7 @@ export class GabineteDigitalPage implements OnInit { let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; - let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); + let diplomasAssinar = despachospr.filter(data => data.activityInstanceName == "Assinar diploma"); this.count_dip_as = Object.keys(diplomasAssinar).length; this.processesbackend.GetTasksList("Expediente", false).subscribe(result => { From d4b589f6ef54201b99787c3757f29c22a3db76f4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 14:19:02 +0100 Subject: [PATCH 8/9] save --- .../expediente/expedient-task-modal/expedient-task-modal.page.ts | 1 + 1 file changed, 1 insertion(+) 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 cbd5c67db..ac931abe2 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 @@ -318,6 +318,7 @@ export class ExpedientTaskModalPage implements OnInit { } try { + this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') From 196ef068fbe49bd1005a78e925e70087ca52a5a3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 14:19:52 +0100 Subject: [PATCH 9/9] save --- .../expediente/expedient-task-modal/expedient-task-modal.page.ts | 1 + 1 file changed, 1 insertion(+) 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 ac931abe2..101711a1e 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 { } try { + this.taskResult = await this.processes.postParecer(this.postData).toPromise() await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado')