From d0f47d91834b20071175ac49d6a127591ae3e649 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 19 May 2021 14:51:01 +0100 Subject: [PATCH 001/160] improvements in pedidos --- .../despachos/despacho/despacho.page.ts | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 2 +- .../pedidos/pedido/pedido.page.html | 58 +++++++++++---- .../pedidos/pedido/pedido.page.ts | 70 +++++++++++++------ .../pedidos/pedidos.page.html | 2 +- .../gabinete-digital/pedidos/pedidos.page.ts | 9 +-- 6 files changed, 103 insertions(+), 42 deletions(-) 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 2619547fe..e36176c6b 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -162,7 +162,7 @@ export class DespachoPage implements OnInit { "dataFields": { "ReviewUserComent": note, }, - "AttachmentList" :null, + "AttachmentList" :documents, } this.processes.CompleteTask(body); this.close(); @@ -175,7 +175,7 @@ export class DespachoPage implements OnInit { "dataFields": { "ReviewUserComent": note, }, - "AttachmentList" :null, + "AttachmentList" :documents, } this.processes.CompleteTask(body); this.close(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index bf44bb9bb..978e8869f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -96,7 +96,7 @@ export class GabineteDigitalPage implements OnInit { else if(params["pedidos"]) { console.log(params["pedidos"]); - this.openPedidosPage("MDGPR"); + this.openPedidosPage('parecer'); this.selectedElement='RequestsForOpinion' } diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 486d8b864..64c008a59 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -24,7 +24,7 @@
-

{{customDate}}{{ task.WorkflowName }}

+

{{customDate}}{{ task.activityInstanceName }}

{{ task.DeadlineType }}
@@ -72,19 +72,51 @@
-
- - -
- - - - +
+
+ + +
+ + + + +
+
+ + +
+ + + + +
+
+ + +
+ + + + + +
-
- - - +
+
+ + + + +
+
+ + + + + + +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 38a1e8532..e32bb5795 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -17,6 +17,7 @@ import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-m import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; +import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; @Component({ selector: 'app-pedido', @@ -60,7 +61,6 @@ export class PedidoPage implements OnInit { console.log(this.serialnumber); this.LoadTaskDetail(this.serialnumber); - this.LoadRelatedEvents(this.serialnumber); } goBack(){ @@ -98,6 +98,7 @@ export class PedidoPage implements OnInit { "WorkflowName": res.workflowDisplayName, "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, + "activityInstanceName": res.activityInstanceName, } } else if(res.workflowDisplayName == 'Pedido de Deferimento'){ @@ -115,6 +116,7 @@ export class PedidoPage implements OnInit { "WorkflowName": res.workflowDisplayName, "DeadlineType": res.workflowInstanceDataFields.DeadlineType, "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID, + "activityInstanceName": res.activityInstanceName, } } @@ -150,23 +152,6 @@ export class PedidoPage implements OnInit { }) } - async LoadRelatedEvents(serial: string) { - if (this.eventsList == null) { - this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { - console.log(res); - res.forEach(att => { - if (this.eventsList == null) { - this.eventsList = new Array(); - } - this.events.getEvent(att.ParentId).subscribe(event => { - this.eventsList.push(event); - console.log(this.eventsList); - }); - }); - }); - } - } - viewDocument(docId:string){ this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ console.log(res); @@ -180,17 +165,31 @@ export class PedidoPage implements OnInit { this.menu.open(); this.modalController.dismiss(); } - arquivar(){ + repreciar(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Reapreciação", + "ActionTypeId": 100000009, + "dataFields": { + "ReviewUserComent": note, + }, + "AttachmentList" :documents, + } + this.processes.CompleteTask(body); + this.close(); + } + arquivar(note:string, documents:any){ let body = { "serialNumber": this.serialnumber, "action": "Arquivo", "ActionTypeId": 95, "dataFields": { - "ReviewerUseComment": '', + "ReviewUserComent": note, }, - "AttachmentList" :null, + "AttachmentList" :documents, } this.processes.CompleteTask(body); + this.close(); } sendExpedienteToPending(){ @@ -350,5 +349,34 @@ export class PedidoPage implements OnInit { await modal.present(); modal.onDidDismiss(); } + async openAddNoteModal(actionName:string) { + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop' + } + const modal = await this.modalController.create({ + component: AddNotePage, + componentProps:{ + }, + cssClass: classs, + backdropDismiss: true + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + console.log(res); + if(res.data){ + if(actionName == 'Solicitar Reapreciação'){ + this.repreciar(res.data.note,res.data.documents); + } + else if(actionName == 'Arquivar'){ + this.arquivar(res.data.note,res.data.documents); + } + } + }); + } } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index d1035f67d..1c3978ee1 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -3,7 +3,7 @@
Pedidos
-
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index 16cb21734..68dc620cc 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -46,9 +46,10 @@ export class PedidosPage implements OnInit { } ngOnInit() { - this.segment = 'parecer'; //Inicializar segment - this.segment = 'parecer'; + //this.segment = 'parecer'; + console.log(this.serialNumber); + this.LoadList(); } segmentChanged(ev: any) { @@ -93,6 +94,7 @@ export class PedidosPage implements OnInit { "DocumentsQty": 0, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, } this.parecerList.push(task); }); @@ -131,10 +133,9 @@ export class PedidosPage implements OnInit { console.log(this.taskType); } - doRefresh(event) { + doRefresh() { this.LoadList(); setTimeout(() => { - event.target.complete(); }, 2000); } From 58d72c4b09102eac31a20a9f75c5171a951fa20a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 19 May 2021 15:10:03 +0100 Subject: [PATCH 002/160] Add signed-diploma --- .../gabinete-digital.module.ts | 4 +- .../gabinete-digital.page.html | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 29 ++- .../signed-diploma.component.html | 119 ++++++++++++ .../signed-diploma.component.scss | 177 ++++++++++++++++++ .../signed-diploma.component.spec.ts | 24 +++ .../signed-diploma.component.ts | 164 ++++++++++++++++ 7 files changed, 516 insertions(+), 5 deletions(-) create mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.html create mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss create mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts create mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 15cf02bb4..e30ea9283 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -20,7 +20,7 @@ import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despach import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page'; import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; - +import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; /* import { ComponentsModule } from 'src/app/components/components.module'; */ @NgModule({ @@ -44,6 +44,7 @@ import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-p DespachosPrPage, DiplomasPage, ExpedientesPrPage, + SignedDiplomaComponent ], entryComponents: [ EmptyContainerPage, @@ -56,6 +57,7 @@ import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-p DespachosPrPage, DiplomasPage, ExpedientesPrPage, + SignedDiplomaComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 97aaca971..b85a12242 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -118,7 +118,7 @@

{{count_dip_pv}} Documentos

-
+
@@ -144,7 +144,7 @@ - +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 37270950e..b661cfa1f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,6 +12,7 @@ import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; +import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -60,6 +61,7 @@ export class GabineteDigitalPage implements OnInit { showDiplomas = false; showExpedientesPr = false; showExpedientDetail = false; + showSignedDiploma = false emptyTextDescription = 'Sem opção selecionada'; serialNumber:string; @@ -141,7 +143,7 @@ export class GabineteDigitalPage implements OnInit { } - closeAllDesktopComponents(){ + closeAllDesktopComponents() { this.showEmptyContainer = false; this.showEventsToApprove = false; this.showExpedients = false; @@ -152,6 +154,7 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomas = false; this.showExpedientesPr = false; this.showExpedientDetail = false; + this.showSignedDiploma = false } async LoadCounts() { @@ -337,7 +340,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDiplomasPage(segment:string){ + openDiplomasPage(segment:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ this.openDeploma(); @@ -348,7 +351,29 @@ export class GabineteDigitalPage implements OnInit { } } + openSignedDiploma(segment:string) { + this.closeAllDesktopComponents(); + if( window.innerWidth <= 800){ + this.openDeploma(); + } + else{ + this.segment = segment; + this.showSignedDiploma = true; + } + } + async openSignedDiplom(){ + const modal = await this.modalController.create({ + component: SignedDiplomaComponent, + componentProps:{ + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + //backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } async openDeploma() { const modal = await this.modalController.create({ diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.html b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.html new file mode 100644 index 000000000..86645cf16 --- /dev/null +++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.html @@ -0,0 +1,119 @@ + +
+
Diploma assinados
+
+ +
+
+ + + + + + + + +
+
+ + + + + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Remetente}} +
+
+ + +
+
+
+ {{ task.Folio }} +
+
+ + + +
+
+ + +
+
+
+ {{ task.CreateDate | date: 'dd-MM-yy' }} +
+
+ {{task.Remetente}} +
+
+ + + +
+
+
+ {{ task.Folio }} +
+
+ + +
+
+
+ + + + + + + +

+

+

+ + + + + + + +

+

+

+ + + +
+ + diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss new file mode 100644 index 000000000..e624d0744 --- /dev/null +++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss @@ -0,0 +1,177 @@ +@import '~src/function.scss'; +/* CONTENT */ +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; +} +.title{ + font-family: Roboto; + font-size: 25px; + color:#000; + overflow: auto; + + .thetitle{ + width: fit-content; + float: left; + } + .theicon{ + width: fit-content; + float: right; + } + } +.item-list-small{ + font-size: 11px; + overflow: hidden; + } + .ion-item-class{ + padding: 0; + + } + .label-text{ + width: 100%; + padding: 0; + margin: 0; + } +//DIV +ion-item{ + --background: none; +} +.item { + //border-radius: 15px; + //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + //Sborder: solid 1px #e9e9e9; + background-color: var(--white); + margin: 0 auto; + //padding: 10px; + margin-bottom: 10px; + overflow: hidden; + } +.div-content-expediente{ + width: 100%; + float: left; + border-left: 3px solid #dae3f3; + padding:5px 5px 15px 5px; + margin: 10px 0 10px 0; + background: #dae3f3; + border-radius: 20px; +} +.div-content-pendentes{ + width: 100%; + float: left; + border-left: 3px solid #d9d9d9; + padding: 5px; +} + .div-content-expediente h3, .div-content-pendentes h3{ + margin: 0; + padding: 0; + font-size: 14pt; + width: 100%; + } + .div-icon{ + width: 10%; + font-size: 20px; + float: left; + color: #808080; + } + .div-icon ion-icon{ + display: block; + margin: 0 auto; + + } + .div-content-expediente p, .div-content-pendentes p{ + font-size: 14pt; + color: rgb(94, 92, 92); + padding: 0; + margin: 0; + } + .span-left{ + /* border: 1px solid red; */ + float: left; + font-size: 12px; + padding-left: 18px; + } + .span-right{ + /* border: 1px solid blue; */ + text-align: right; + float: right; + font-size: 12px; + padding-right: 18px; +} + +/* New CSS */ +.expediente{ + padding-top: 10px; +} +.exp-list-item{ + //width: 368px; + overflow: auto; + /* border-bottom: 1px solid gray; */ + margin: 10px auto; +} +.exp-top-detail{ + width: 100%; + overflow: auto; +} +.exp-date{ + width: auto; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #797979; + float: left; +} +.exp-remetente{ + //width: 200px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + color: #000000; + float: left; + margin-left: 16px; + +} +.exp-icon{ + width: 45px; + float: right; + font-size: 13px; +} +.exp-icon ion-icon{ + font-size: 25px; + color: #42b9fe; +} +.exp-bottom-detail{ + float: left; + font-family: Roboto; + font-size: 16px; + font-weight: 700; + color: #0d89d1; +} +.div-top-header{ + width: 400px; + margin: 6px auto; + background-color: #0782c9; + overflow: auto; +} +.div-search{ + font-size: 45px; + float: left; + margin: 0 0 0 10px +} +.div-logo{ + background: transparent; + width: 150px; + margin: 2.5px 0 2.5px 71px; + float: left; +} +.div-logo img{ + width: 100%; +} +.div-profile{ + font-size: 45px; + float: right; + margin-right: 10px; +} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts new file mode 100644 index 000000000..125b8ddcd --- /dev/null +++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { SignedDiplomaComponent } from './signed-diploma.component'; + +describe('SignedDiplomaComponent', () => { + let component: SignedDiplomaComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ SignedDiplomaComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(SignedDiplomaComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts new file mode 100644 index 000000000..ebdf45a2e --- /dev/null +++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts @@ -0,0 +1,164 @@ +import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { formatDate } from '@angular/common'; +import { ModalController, NavParams } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; +import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; + +@Component({ + selector: 'app-signed-diploma', + templateUrl: './signed-diploma.component.html', + styleUrls: ['./signed-diploma.component.scss'], +}) +export class SignedDiplomaComponent implements OnInit { + +//profile:string; +diplomasList:DailyWorkTask[] = []; +showLoader: boolean; +totalDocs:any; +serialNumber:string; + +@Input() profile:string; +@Input() segment:string; + +constructor( + private processes:ProcessesService, + private modalController: ModalController, + private alertService: AlertService, + ) { + this.profile = 'mdgpr'; + this.segment = 'validar' + } + +ngOnInit() { + //Inicializar segment + this.segment = 'assinados'; + this.LoadList(); +} +segmentChanged(ev: any) { + this.LoadList(); +} + +notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); +} + +async LoadList(){ + + + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + this.diplomasList = new Array(); + + console.log(diplomas); + switch (this.segment) { + case 'validar': + let diplomasValidar = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Revising"); + console.log(diplomasValidar); + diplomasValidar.forEach(element => { + let DocId = element.workflowInstanceDataFields.FolderID; + let ApplicationId = element.workflowInstanceDataFields.ApplicationId; + this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ + this.totalDocs = res.DocumentsTotal; + console.log(res.DocumentsTotal); + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": this.totalDocs, + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + } + this.diplomasList.push(task); + }, + (error)=>{ + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + } + this.diplomasList.push(task); + }); + }); + this.showLoader = false; + break; + case 'assinados': + let diplomasassinado = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed"); + console.log('Assinados'); + + diplomasassinado.forEach(element => { + let DocId = element.workflowInstanceDataFields.FolderID; + let ApplicationId = element.workflowInstanceDataFields.ApplicationId; + this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ + this.totalDocs = res.DocumentsTotal; + console.log(res.DocumentsTotal); + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": this.totalDocs, + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + } + this.diplomasList.push(task); + }, + (error)=>{ + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + } + this.diplomasList.push(task); + }); + }); + this.showLoader = false; + + break; + } +} + +doRefresh(event) { + this.LoadList(); + setTimeout(() => { + //event.target.complete(); + }, 2000); +} + +async viewPedidoDetail(serialNumber:any) { + console.log(this.profile); + + const modal = await this.modalController.create({ + component: DiplomaPage, + componentProps:{ + enterAnimation: "", + serialNumber: serialNumber, + profile: this.profile, + }, + cssClass: 'modal modal-desktop', + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + console.log('refresh list'); + this.LoadList(); + }); +} +} From ce560abd597da1ea10f78c44bd22f38f47d8d332 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 19 May 2021 15:14:23 +0100 Subject: [PATCH 003/160] save --- .../despacho-pr/despacho-pr.module.ts | 2 + .../despacho-pr/despacho-pr.page.html | 184 +++++++++- .../despacho-pr/despacho-pr.page.scss | 236 +++++++++++++ .../despacho-pr/despacho-pr.page.ts | 332 +++++++++++++++++- .../despachos-pr/despachos-pr.page.ts | 6 +- 5 files changed, 752 insertions(+), 8 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts index cf5c0f2ac..a8f986367 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { DespachoPrPageRoutingModule } from './despacho-pr-routing.module'; import { DespachoPrPage } from './despacho-pr.page'; +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + SharedModule, DespachoPrPageRoutingModule ], declarations: [DespachoPrPage] 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 fa39c9b0e..c59cd5d79 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 @@ -1,9 +1,183 @@ - - - despacho-pr - - + + + + Menu + + + + + + + Efectuar Despacho + + + + Pedido de Parecer + + + + Pedido de Deferimento + + + + Marcar reunião + + + + Descartar + + + + + +
+ +
+
+
+
+
+ +
+ {{ task.Folio}} +
+
+ + +
+
+
+
+
+ +

{{customDate}}{{ task.activityInstanceName }}

+

{{ task.DeadlineType }}

+ +
+
+
+
+
Intervenientes
+ + +
+

{{interveniente.Name}}

+
+ + +
+
Com conhecimento
+ + +
+

{{c.Name}}

+
+ + +
+
+
Detalhes
+ +

+ +
+
+
+ +
Documentos Anexados
+ + +

{{ attachment.Assunto }}

+

{{ attachment.DocNumber }}

+

{{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}

+ + + +
+
+
+
+ + +
+ + + +
+ +
+
+ + +
+ + + +
+ +
+
+ +
+ + + +
+ + +
+
+ +
+ + + + + + + + +

+ +

+

+ +

+ + + + +

+ +

+

+ + + + +

+ +

+

+ +

+ + + + + + + +
+
+ diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss index e69de29bb..860c052db 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss @@ -0,0 +1,236 @@ +@import '~src/function.scss'; +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; +} +.color-red{ + font-weight: 500; + color:#d30a0a !important; +} +.btn-size{ + font-size: 18px !important; +} +.main-header{ + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:auto; + color:#000; + transform: translate3d(0, 1px, 0); + .header-top{ + width: 360px; + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 280px; + margin: 2.5px 0 0 5px; + display: flex; + align-items: center; + + } + .right{ + padding: 0!important; + float: right; + font-size: 25px; + color: #0782c9; + margin: 5px 0 0 0; + } + } + .header-bottom{ + width: 310px; + overflow: auto; + margin: 0 auto; + + .header-bottom-icon{ + width: 30px; + font-size: 25px; + float: left; + padding: 2px; + } + .header-bottom-contacts{ + width: 275px; + font-size: 15px; + color: #797979; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + float: left; + padding: 5px; + margin: 1px; + } + } + + .title{ + font-size: 25px; + overflow: auto; + float: left; + padding-top: 4px; + padding-left: 5px; + } + .div-icon{ + width: 40px; + float: right; + font-size: 35px; + overflow: auto; + padding: 1px; + } +} +ion-item-group{ + margin: 15px; +} +ion-button{ + display: block; + width: 80%; + margin: 20px auto; +} + + +.upper-content{ + font-family: Roboto; + margin-left: 41px; + overflow: auto; + font-size: 18px; + + .label{ + border-radius: 20px; + background: #ffb703; + float: right; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } + + .button-calendar-type ion-button{ + height: 25px; + } + .content-details{ + font-size: 17px; + .date{ + color: #797979; + } + } +} +.middle-conten{ + .middle-content p{ + font-size: 16px; + } +} +.bottom-content{ + //width: 360px; + margin: 0 auto; + + .bottom-content h3{ + font-size: 16px; + margin: 0 0 0 10px; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + font-size: 18px; + width: 100%; + color:#0d89d1; + padding-bottom: 5px; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } +} +.aside-right{ + padding: 30px 20px 0 20px !important; + + .arrow-right{ + display: flex; + justify-content: flex-end; + margin-bottom: 20px; + + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } + } + .buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-between; + + .btn-ok, .btn-cancel, .btn-delete{ + height: auto !important; + font-size: 16px !important; + font-weight: 600 !important; + width: 100% !important; + margin-bottom: 10px !important; + padding: 15px !important; + } + } + .solid { + display: block; + width: 90%; + border-top: 1px solid #ebebeb; + margin: 0 auto !important; + margin-bottom: 10px !important; + } +} + +@media only screen and (max-width: 800px) { + .content{ + width: 100% !important; + } + .aside-right{ + display: none; + } +} +@media only screen and (min-width: 801px) { + .div-icon{ + display: none; + } + .content{ + width: 65%; + border-right: 1px solid #d8d8d8; + } + + .aside-right{ + width: 35%; + } +} + +@media only screen and (min-width: 1024px){ + .content{ + width: 70%; + } + .aside-right{ + width: 30%; + } +} + +@media only screen and (min-width: 1140px){ + .content{ + width: 75%; + } + .aside-right{ + width: 25%; + } +} 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 c4d4fc1e9..7cc0bb88a 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 @@ -1,4 +1,23 @@ import { Component, OnInit } from '@angular/core'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { AttachmentsService } from 'src/app/services/attachments.service'; +import { EventsService } from 'src/app/services/events.service'; +import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; +import { DailyWorkTask } from '../../../../models/dailyworktask.model'; +import { ActivatedRoute, Router } from '@angular/router'; +import { formatDate } from '@angular/common'; +import { Event } from '../../../../models/event.model'; +import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; +import { AlertService } from 'src/app/services/alert.service'; +import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; +import { momentG } from 'src/plugin/momentG' +import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page'; +import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; +import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; +import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; +import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; +import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; @Component({ selector: 'app-despacho-pr', @@ -6,10 +25,321 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./despacho-pr.page.scss'], }) export class DespachoPrPage implements OnInit { + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; - constructor() { } + customDate:any; + + task: any; + attachments:any; + fulltask: any; + eventsList: Event[]; + serialnumber: string; + profile: string; + intervenientes: any; + cc: any; + + constructor(private activateRoute: ActivatedRoute, + private processes: ProcessesService, + private iab: InAppBrowser, + private attachmentsService: AttachmentsService, + private events: EventsService, + private menu: MenuController, + private router: Router, + private modalController: ModalController, + private navParams: NavParams, + private alertService: AlertService, + public popoverController: PopoverController) { + this.serialnumber = this.navParams.get('serialNumber'); + this.profile = this.navParams.get('profile'); + } ngOnInit() { + this.profile = "mdgpr"; + console.log(this.serialnumber); + + this.activateRoute.paramMap.subscribe(paramMap => { + if (!paramMap.has('SerialNumber')) { + return; + } + /* this.serialnumber = paramMap.get('SerialNumber'); */ + this.LoadTaskDetail(this.serialnumber); + this.LoadRelatedEvents(this.serialnumber); + }); + this.LoadTaskDetail(this.serialnumber); + this.LoadRelatedEvents(this.serialnumber); } + close(){ + this.modalController.dismiss(); + } + + + async LoadTaskDetail(serial: string) { + this.processes.GetTask(serial).subscribe(res => { + this.task = { + "SerialNumber": res.serialNumber, + "Folio": res.workflowInstanceDataFields.Subject, + "Senders": res.originator.email, + "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'), + "DocumentURL": res.workflowInstanceDataFields.ViewerRequest, + "Remetente": res.workflowInstanceDataFields.Sender, + "Note": res.workflowInstanceDataFields.Note, + "FolderId": res.workflowInstanceDataFields.FolderID, + "FsId": '361', + "DocId": res.workflowInstanceDataFields.DispatchDocId, + "WorkflowName": res.workflowDisplayName, + "DeadlineType": res.workflowInstanceDataFields.DeadlineType, + "activityInstanceName": res.activityInstanceName, + } + this.fulltask = res; + console.log(this.task); + + console.log('GetTask', res); + + let thedate = new Date(this.task.CreateDate); + this.customDate = this.days[thedate.getDay()]+ ", " + thedate.getDate() +" de " + ( this.months[thedate.getMonth()]); + + + this.processes.GetTaskParticipants(this.task.FolderId).subscribe(users=>{ + this.intervenientes = users.filter(user=>{ + return user.Type == 'I'; + }); + this.cc = users.filter(user=>{ + return user.Type == 'CC'; + }); + console.log(users); + + }); + this.getDocumentDetails(this.task.FolderId, '361'); + + }); + } + + getDocumentDetails(forlderId:string, applicationId:string) { + this.processes.GetDocumentDetails(forlderId,applicationId).subscribe(res=>{ + this.attachments = res.Documents; + console.log(res['Documents']); + console.log(this.attachments); + }) + } + + async LoadRelatedEvents(serial: string) { + if (this.eventsList == null) { + this.attachmentsService.getAttachmentsBySerial(serial).subscribe(res => { + console.log(res); + res.forEach(att => { + if (this.eventsList == null) { + this.eventsList = new Array(); + } + this.events.getEvent(att.ParentId).subscribe(event => { + this.eventsList.push(event); + console.log(this.eventsList); + }); + }); + }); + } + } + + viewDocument(docId:string){ + this.processes.GetDocumentUrl(docId, '361').subscribe(res=>{ + console.log(res); + const url: string = res.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); + const browser = this.iab.create(url,"_blank"); + browser.show(); + }); + } + + openMenu() { + this.menu.open(); + this.modalController.dismiss(); + } + executado(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Conhecimento", + "ActionTypeId": 104, + "dataFields": { + "ReviewUserComent": note, + }, + "AttachmentList" :documents, + } + this.processes.CompleteTask(body); + this.close(); + } + arquivar(note:string, documents:any){ + let body = { + "serialNumber": this.serialnumber, + "action": "Arquivo", + "ActionTypeId": 95, + "dataFields": { + "ReviewUserComent": note, + }, + "AttachmentList" :documents, + } + this.processes.CompleteTask(body); + this.close(); + } + + sendExpedienteToPending(){ + this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ + console.log(res); + this.close(); + }); + } + + async openAddNoteModal(actionName:string) { + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop' + } + const modal = await this.modalController.create({ + component: AddNotePage, + componentProps:{ + }, + cssClass: classs, + backdropDismiss: true + }); + + await modal.present(); + + modal.onDidDismiss().then(res => { + console.log(res); + if(res.data){ + if(actionName == 'Executado'){ + this.executado(res.data.note,res.data.documents); + } + else if(actionName == 'Arquivar'){ + this.arquivar(res.data.note,res.data.documents); + } + } + }); + } + + async openExpedientActionsModal(taskAction: any, task: any) { + //this.modalController.dismiss(); + let classs; + if( window.innerWidth <= 800){ + classs = 'modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: CreateProcessPage, + componentProps: { + taskAction: taskAction, + task: task, + profile: this.profile, + }, + cssClass: classs, + }); + await modal.present(); + modal.onDidDismiss().then(res=>{ + console.log(res['data']); + if(res['data']=='openDiscart'){ + console.log('open discart'); + + this.distartExpedientModal(); + + } + + }); + } + + async distartExpedientModal2(task: any){ + const modal = await this.modalController.create({ + component: DiscartExpedientModalPage, + componentProps: { + serialNumber: task.serialNumber, + folderId: task.workflowInstanceDataFields.FolderID, + action: 'discart', + }, + cssClass: 'discart-expedient-modal', + backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss(); + } + + async openBookMeetingModal(task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + async openDelegarModal(task: any) { + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: DelegarPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + async distartExpedientModal(){ + console.log(this.fulltask); + const modal = await this.modalController.create({ + component: DiscartExpedientModalPage, + componentProps: { + serialNumber: this.fulltask.serialNumber, + folderId: this.fulltask.workflowInstanceDataFields.FolderID, + action: 'complete', + }, + cssClass: 'discart-expedient-modal', + backdropDismiss: false + }); + + await modal.present(); + modal.onDidDismiss().then(res=>{ + if(res['data']=='close'){ + this.close(); + /* console.log('2Expedient Discard closed2'); + this.close(); + this.openMenu(); */ + } + + }); + } + + async openOptions(taskAction?: any) { + const popover = await this.popoverController.create({ + component: OptsExpedientePage, + cssClass: 'exp-options', + componentProps: { + task: this.task, + fulltask: this.fulltask, + taskAction:taskAction, + showEnviarPendentes: false + }, + translucent: true + }); + return await popover.present(); + } + } diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 9f620b60a..5e7075ff4 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -14,6 +14,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 { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page'; @Component({ selector: 'app-despachos-pr', @@ -97,7 +98,8 @@ segmentChanged(ev: any) { "DocId": element.workflowInstanceDataFields.DocId, "WorkflowName": element.workflowDisplayName, "FolderID": element.workflowInstanceDataFields.FolderID, - "Status": element.workflowInstanceDataFields.Status + "Status": element.workflowInstanceDataFields.Status, + "activityInstanceName": element.activityInstanceName, } this.despachoList.push(task) @@ -145,7 +147,7 @@ async viewExpedientDetail(serialNumber:any) { } const modal = await this.modalController.create({ - component: DespachoPage, + component: DespachoPrPage, componentProps:{ enterAnimation: "", serialNumber: serialNumber, From 3c738597458b9924e82c3acf75a7624a5f1b31cf Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 19 May 2021 15:19:08 +0100 Subject: [PATCH 004/160] save --- .../pages/gabinete-digital/diplomas/diploma/diploma.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts index 868885b08..6bec3e645 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { DiplomaPageRoutingModule } from './diploma-routing.module'; import { DiplomaPage } from './diploma.page'; +import { SharedModule } from 'src/app/shared/shared.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + SharedModule, DiplomaPageRoutingModule ], declarations: [DiplomaPage] From 8316ab45ab50a08e0dfe451eaace4ad4885ce82c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 19 May 2021 15:36:03 +0100 Subject: [PATCH 005/160] Improve edit event to approve --- .../edit-event-to-approve/edit-event.page.html | 2 +- .../edit-event-to-approve/edit-event.page.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) 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 006791024..f0dd92225 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 @@ -196,7 +196,7 @@ Correspondencia AccoesPresidenciais ArquivoDespachoElect - + 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 af8c6f3f6..c8692ca82 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 @@ -257,7 +257,7 @@ export class EditEventToApproveComponent implements OnInit { this.loadedAttachments.forEach((document:any)=>{ - if(document['action'] == 'add'){ + if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{}); } else if(document['action'] == 'delete') { @@ -266,8 +266,10 @@ export class EditEventToApproveComponent implements OnInit { } }) - - alert('save') + + + this.modalController.dismiss(); + } async openAttendees() { @@ -345,7 +347,7 @@ export class EditEventToApproveComponent implements OnInit { deleteAttachment(attachment: Attachment) { - this.attachmentsService.deleteEventAttachmentById(attachment.Id).subscribe( res=>{}) + attachment['action'] == 'delete' } From be716c3abfd9a180dd740df1d5d95ca47c18e52a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 19 May 2021 16:10:05 +0100 Subject: [PATCH 006/160] save --- src/app/models/dailyworktask.model.ts | 2 ++ .../despacho-pr/despacho-pr.page.html | 29 ++----------------- .../despachos-pr/despachos-pr.page.ts | 5 ++-- .../despachos/despacho/despacho.page.html | 6 +--- .../despachos/despacho/despacho.page.ts | 16 ++++++++++ .../despachos/despachos.page.html | 3 ++ .../despachos/despachos.page.ts | 2 +- .../expediente/expediente.page.ts | 2 ++ .../pedidos/pedidos.page.html | 3 ++ .../gabinete-digital/pedidos/pedidos.page.ts | 4 +-- .../pendentes/pendentes.page.ts | 2 ++ .../despachos-pr/despachos-pr.page.ts | 2 +- .../despachos/despachos.page.html | 3 ++ .../despachos/despachos.page.scss | 13 +++++++++ .../despachos/despachos.page.ts | 2 +- .../diplomas/diplomas.page.ts | 2 ++ .../expedientes-pr/expedientes-pr.page.ts | 2 ++ .../expedients/expedients.page.ts | 1 + .../pedidos/pedidos.page.html | 3 ++ .../pedidos/pedidos.page.scss | 13 +++++++++ .../gabinete-digital/pedidos/pedidos.page.ts | 5 ++-- .../pendentes/pendentes.page.ts | 2 ++ .../signed-diploma.component.ts | 4 +++ 23 files changed, 86 insertions(+), 40 deletions(-) diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index 88f0f0b86..15855d3de 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -7,10 +7,12 @@ export class DailyWorkTask{ Remetente:string; DocumentsQty:any; WorkflowName:string; + activityInstanceName: string; } export class tasksList{ actions: null; + activityInstanceName: string; formURL: string; originator: { displayName: string, 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 c59cd5d79..45e8da87e 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 @@ -22,10 +22,6 @@ Marcar reunião - - - Descartar -