From 6f3c88b57cd5eb8871015f092bf67fe0c8fcd257 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Dec 2022 15:31:54 +0100 Subject: [PATCH] save --- src/app/Rules/aprove-event.service.spec.ts | 16 ++ src/app/Rules/aprove-event.service.ts | 52 +++++ src/app/Rules/deadline.service.ts | 1 + .../deferimentos-service.service.spec.ts | 16 ++ src/app/Rules/deferimentos-service.service.ts | 54 +++++ src/app/Rules/deploma.service.ts | 1 + .../Rules/deplomas-service.service.spec.ts | 16 ++ src/app/Rules/deplomas-service.service.ts | 90 +++++++++ src/app/Rules/despacho-pr.service.spec.ts | 16 ++ src/app/Rules/despacho-pr.service.ts | 48 +++++ src/app/Rules/despacho.service.ts | 20 +- src/app/Rules/expediente.service.ts | 34 +++- src/app/Rules/parecer.service.spec.ts | 16 ++ src/app/Rules/parecer.service.ts | 73 +++++++ src/app/Rules/pedido.service.ts | 6 +- src/app/Rules/pendentes.service.ts | 32 ++- src/app/Rules/process-document.service.ts | 2 +- src/app/home/home.page.ts | 12 +- .../gabinete-digital/gabinete-digital.page.ts | 187 +++++------------- src/app/pipes/custom-task.pipe.ts | 2 +- src/app/store/loader.service.ts | 20 +- version/git-version.ts | 12 +- 22 files changed, 571 insertions(+), 155 deletions(-) create mode 100644 src/app/Rules/aprove-event.service.spec.ts create mode 100644 src/app/Rules/aprove-event.service.ts create mode 100644 src/app/Rules/deferimentos-service.service.spec.ts create mode 100644 src/app/Rules/deferimentos-service.service.ts create mode 100644 src/app/Rules/deplomas-service.service.spec.ts create mode 100644 src/app/Rules/deplomas-service.service.ts create mode 100644 src/app/Rules/despacho-pr.service.spec.ts create mode 100644 src/app/Rules/despacho-pr.service.ts create mode 100644 src/app/Rules/parecer.service.spec.ts create mode 100644 src/app/Rules/parecer.service.ts diff --git a/src/app/Rules/aprove-event.service.spec.ts b/src/app/Rules/aprove-event.service.spec.ts new file mode 100644 index 000000000..493903aa2 --- /dev/null +++ b/src/app/Rules/aprove-event.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { AproveEventService } from './aprove-event.service'; + +describe('AproveEventService', () => { + let service: AproveEventService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(AproveEventService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/aprove-event.service.ts b/src/app/Rules/aprove-event.service.ts new file mode 100644 index 000000000..00092e5a6 --- /dev/null +++ b/src/app/Rules/aprove-event.service.ts @@ -0,0 +1,52 @@ +import { Injectable } from '@angular/core'; +import { ProcessesService } from '../services/processes.service'; +import { SessionStore } from '../store/session.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + +@Injectable({ + providedIn: 'root' +}) +export class AproveEventService { + + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + + async GetTasksListEventosMD() { + this.loader.push() + + try { + let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); + let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); + let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + + eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + this.loader.pop() + return eventsMDGPRList + } catch (error) { + this.loader.pop() + return [] + } + + } + + async GetTasksListEventosPR() { + try { + let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); + let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); + let eventsPRList = prEventsOficial.concat(prEventsPessoal); + eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + + return eventsPRList; + } catch (error) { + return [] + } + + } +} diff --git a/src/app/Rules/deadline.service.ts b/src/app/Rules/deadline.service.ts index 776129c02..b0d6c7b33 100644 --- a/src/app/Rules/deadline.service.ts +++ b/src/app/Rules/deadline.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; + @Injectable({ providedIn: 'root' }) diff --git a/src/app/Rules/deferimentos-service.service.spec.ts b/src/app/Rules/deferimentos-service.service.spec.ts new file mode 100644 index 000000000..3a7ef9f32 --- /dev/null +++ b/src/app/Rules/deferimentos-service.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DeferimentosServiceService } from './deferimentos-service.service'; + +describe('DeferimentosServiceService', () => { + let service: DeferimentosServiceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DeferimentosServiceService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/deferimentos-service.service.ts b/src/app/Rules/deferimentos-service.service.ts new file mode 100644 index 000000000..b2ad33a01 --- /dev/null +++ b/src/app/Rules/deferimentos-service.service.ts @@ -0,0 +1,54 @@ +import { Injectable } from '@angular/core'; +import { customTask } from '../models/dailyworktask.model'; +import { ProcessesService } from '../services/processes.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + +@Injectable({ + providedIn: 'root' +}) +export class DeferimentosServiceService { + + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + + async getList() { + let deferimentos + this.loader.push() + + try { + deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise(); + } catch (error) { + + this.loader.pop() + return [] + } + + this.loader.pop() + deferimentos = deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active") + // this.count_def_dailywork = Object.keys(deferimentos).length; + // this.pedidosstore.countdeferimento = this.count_def_dailywork; + + return deferimentos.map((element) => { + return { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": new Date(element.taskStartDate), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + }); + + } +} diff --git a/src/app/Rules/deploma.service.ts b/src/app/Rules/deploma.service.ts index a5f3ec12c..461bb449c 100644 --- a/src/app/Rules/deploma.service.ts +++ b/src/app/Rules/deploma.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; +import { LoaderService } from 'src/app/store/loader.service' @Injectable({ providedIn: 'root' diff --git a/src/app/Rules/deplomas-service.service.spec.ts b/src/app/Rules/deplomas-service.service.spec.ts new file mode 100644 index 000000000..cbf362143 --- /dev/null +++ b/src/app/Rules/deplomas-service.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DeplomasServiceService } from './deplomas-service.service'; + +describe('DeplomasServiceService', () => { + let service: DeplomasServiceService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DeplomasServiceService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/deplomas-service.service.ts b/src/app/Rules/deplomas-service.service.ts new file mode 100644 index 000000000..10ad8a977 --- /dev/null +++ b/src/app/Rules/deplomas-service.service.ts @@ -0,0 +1,90 @@ +import { Injectable } from '@angular/core'; +import { ProcessesService } from '../services/processes.service'; +import { SessionStore } from '../store/session.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + +@Injectable({ + providedIn: 'root' +}) +export class DeplomasServiceService { + + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + + async getListReview(depachoAPI) { + + this.loader.push() + + if(!depachoAPI) { + try { + depachoAPI = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + } catch (error) { + this.loader.pop() + return [] + } + + } + + this.loader.pop() + + if(SessionStore.user.Profile == 'PR') { + let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); + diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho"); + + return diplomasValidar.map((element) => { + + let date = new Date(element.taskStartDate); + date.setMonth(date.getMonth() + 1); + let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + + return { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": taskDate, + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, + } + }) + } + + return [] + + } + + async getListAssinar(depachoAPI) { + if(!depachoAPI) { + depachoAPI = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + } + + if(SessionStore.user.Profile == 'PR') { + return depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); + } + + return [] + } + + async getListAssinados(depachoAPI) { + if(!depachoAPI) { + depachoAPI = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + } + + if(SessionStore.user.Profile == 'PR') { + return depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); + } + + return [] + } +} diff --git a/src/app/Rules/despacho-pr.service.spec.ts b/src/app/Rules/despacho-pr.service.spec.ts new file mode 100644 index 000000000..1106e00ab --- /dev/null +++ b/src/app/Rules/despacho-pr.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { DespachoPRService } from './despacho-pr.service'; + +describe('DespachoPRService', () => { + let service: DespachoPRService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(DespachoPRService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/despacho-pr.service.ts b/src/app/Rules/despacho-pr.service.ts new file mode 100644 index 000000000..d2680cfe8 --- /dev/null +++ b/src/app/Rules/despacho-pr.service.ts @@ -0,0 +1,48 @@ +import { Injectable } from '@angular/core'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; +import { ProcessesService } from '../services/processes.service'; +import { SessionStore } from '../store/session.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + +@Injectable({ + providedIn: 'root' +}) +export class DespachoPRService { + + customTaskPipe = new CustomTaskPipe() + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + async getList(depachoAPI?) { + + this.loader.push() + + if(!depachoAPI) { + try { + depachoAPI = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + } catch (error) { + this.loader.pop() + return [] + } + } + + this.loader.pop() + if(SessionStore.user.Profile != 'PR') { + + let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); + return depacho.map((e)=> this.customTaskPipe.transform(e)) + + } else if(SessionStore.user.Profile == 'PR') { + let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") + return depacho.map((e)=> this.customTaskPipe.transform(e)) + } + } + +} diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 2420dab1d..e57ebf387 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -9,6 +9,7 @@ import { SessionStore } from '../store/session.service'; import { PermissionService } from '../services/permission.service'; import { SortService } from '../services/functions/sort.service'; + @Injectable({ providedIn: 'root' }) @@ -28,13 +29,14 @@ export class DespachoService { customTaskPipe = new CustomTaskPipe() despachoStore = DespachoStore; + loader = this.LoaderService.initialize(this.constructor.name) constructor( private processes: ProcessesService, public p: PermissionService, public LoaderService: LoaderService, private sortService: SortService, - ) { } + ) {} arquivar(note:string, documents:AttachmentList, serialnumber) { @@ -225,6 +227,7 @@ export class DespachoService { } this.LoaderService.push({}) + this.loader.push() let result: fullTaskList[] = [] let despachoList: customTask[] = []; @@ -237,7 +240,7 @@ export class DespachoService { let task: customTask = this.customTaskPipe.transform(element); despachoList.push(task); - }); + }) despachoList = this.sortService.sortDate(despachoList, 'CreateDate') @@ -249,13 +252,24 @@ export class DespachoService { } finally { this.LoaderService.pop({}) + this.loader.pop() return this.despachoStore.list } } async getListPr() { - let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + + this.loader.push() + let result + try { + result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + + } catch(error) { + this.loader.pop() + } + + this.loader.pop() let despachosPr; let despachos = this.sortService.sortArrayByDate(result); diff --git a/src/app/Rules/expediente.service.ts b/src/app/Rules/expediente.service.ts index f88c14f86..567441398 100644 --- a/src/app/Rules/expediente.service.ts +++ b/src/app/Rules/expediente.service.ts @@ -1,14 +1,22 @@ import { Injectable } from '@angular/core'; +import { ExpedienteTask } from '../models/dailyworktask.model'; +import { ExpedienteTaskPipe } from '../pipes/expediente-task.pipe'; import { ProcessesService } from '../services/processes.service'; import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + @Injectable({ providedIn: 'root' }) export class ExpedienteService { + expedienteTaskPipe = new ExpedienteTaskPipe(); + loader = this.LoaderService.initialize(this.constructor.name) + constructor( private processes: ProcessesService, private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, ) { } @@ -34,7 +42,31 @@ export class ExpedienteService { } - UpdateTaskStatus({FolderId}){ + UpdateTaskStatus({FolderId}) { return this.processes.UpdateTaskStatus(FolderId) } + + + async getList(): Promise { + let expedientes + this.loader.push() + + try { + expedientes = await this.processes.GetTaskListExpediente(false).toPromise(); + } catch (error) { + + this.loader.pop() + return [] + } + + this.loader.pop() + + expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") + expedientes = expedientes.filter((item) => { + return item.activityInstanceName != 'Retificar Expediente' + }); + expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element)); + + return expedientes; + } } diff --git a/src/app/Rules/parecer.service.spec.ts b/src/app/Rules/parecer.service.spec.ts new file mode 100644 index 000000000..15d5249a4 --- /dev/null +++ b/src/app/Rules/parecer.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ParecerService } from './parecer.service'; + +describe('ParecerService', () => { + let service: ParecerService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ParecerService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/Rules/parecer.service.ts b/src/app/Rules/parecer.service.ts new file mode 100644 index 000000000..566a66163 --- /dev/null +++ b/src/app/Rules/parecer.service.ts @@ -0,0 +1,73 @@ +import { Injectable } from '@angular/core'; +import { ProcessesService } from '../services/processes.service'; +import { SessionStore } from '../store/session.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' + +@Injectable({ + providedIn: 'root' +}) +export class ParecerService { + + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + + async GetTasksListParecer() { + try { + return await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); + } catch(error) { + return [] + } + } + + async GetTasksListParecerPr() { + try { + return await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); + } catch(error) { + return [] + } + } + + async GetTasksList() { + + this.loader.push() + + let pareceres, pareceresPr, allParecer + + try { + + pareceres = await this.GetTasksListParecer() + pareceresPr = await this.GetTasksListParecerPr() + allParecer = pareceres.concat(pareceresPr); + allParecer = allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active") + + } catch(error) { + this.loader.pop() + return [] + } + + this.loader.pop() + + return allParecer.map((element) => { + return { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": new Date(element.taskStartDate), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + }) + + } +} diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts index f93b7b821..968c6d603 100644 --- a/src/app/Rules/pedido.service.ts +++ b/src/app/Rules/pedido.service.ts @@ -1,15 +1,19 @@ import { Injectable } from '@angular/core'; import { ProcessesService } from '../services/processes.service'; import { PermissionService } from '../services/permission.service'; +import { LoaderService } from 'src/app/store/loader.service' @Injectable({ providedIn: 'root' }) export class PedidoService { + loader = this.LoaderService.initialize(this.constructor.name) + constructor( private processes: ProcessesService, - public p: PermissionService + public p: PermissionService, + public LoaderService: LoaderService, ) { } createParecer(body: any) { diff --git a/src/app/Rules/pendentes.service.ts b/src/app/Rules/pendentes.service.ts index f5328c137..0d42fdcca 100644 --- a/src/app/Rules/pendentes.service.ts +++ b/src/app/Rules/pendentes.service.ts @@ -1,9 +1,39 @@ import { Injectable } from '@angular/core'; +import { customTask } from '../models/dailyworktask.model'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; +import { ProcessesService } from '../services/processes.service'; +import { ProcessDocumentService } from './process-document.service'; +import { LoaderService } from 'src/app/store/loader.service' @Injectable({ providedIn: 'root' }) export class PendentesService { - constructor() { } + customTaskPipe = new CustomTaskPipe() + loader = this.LoaderService.initialize(this.constructor.name) + + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + public LoaderService: LoaderService, + ) { } + + async getList(): Promise { + let pendentes + + this.loader.push() + + try { + pendentes = await this.processes.GetPendingTasks(false).toPromise(); + } catch(error) { + this.loader.pop() + return [] + } + + this.loader.pop() + + pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) + return pendentes + } } diff --git a/src/app/Rules/process-document.service.ts b/src/app/Rules/process-document.service.ts index b3d3bfd25..2f034d4e6 100644 --- a/src/app/Rules/process-document.service.ts +++ b/src/app/Rules/process-document.service.ts @@ -10,7 +10,7 @@ export class ProcessDocumentService { constructor( private processes: ProcessesService, private iab: InAppBrowser, - ) { } + ) {} viewDocument({DocId, ApplicationId}) { this.processes.GetDocumentUrl(DocId, ApplicationId).subscribe( (res) => { diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index d1f828d09..5ce452934 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -207,12 +207,12 @@ export class HomePage implements OnInit { updateList() { - /* this.notificationsService.registerCallback( - 'despachos', - () => { - this.despachoRule.getList({ updateStore: true }) - } - ) */ + // this.notificationsService.registerCallback( + // 'despachos', + // () => { + // // this.despachoRule.getList({ updateStore: true }) + // } + // ) document.addEventListener('pause', function () { // console.log('App going to background'); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 5d120d2e9..5eb08091c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -21,6 +21,13 @@ import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DespachoService } from 'src/app/Rules/despacho.service'; +import { ExpedienteService } from 'src/app/Rules/expediente.service'; +import { PendentesService } from 'src/app/Rules/pendentes.service'; +import { AproveEventService } from 'src/app/Rules/aprove-event.service'; +import { ParecerService } from 'src/app/Rules/parecer.service'; +import { DeferimentosServiceService } from 'src/app/Rules/deferimentos-service.service'; +import { DeplomasServiceService } from 'src/app/Rules/deplomas-service.service' +import { DespachoPRService } from 'src/app/Rules/despacho-pr.service' import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { PermissionService } from 'src/app/services/permission.service'; import { ThemeService } from 'src/app/services/theme.service' @@ -54,24 +61,6 @@ export class GabineteDigitalPage implements OnInit { allProcessesList: any = new Array(); skeletonLoader: boolean; - count_exp_dailywork = 0; - count_exp_pr = 0 - count_desp_dailywork = 0; - count_desp_pending = 0; - count_par_dailywork = 0; - count_par_pending = 0; - count_def_dailywork = 0; - count_def_pending = 0; - count_exp_pp: string; - count_exp_pd: string; - count_dip_apr: string; - count_dip_pv = 0; - count_de_pr = 0; - count_ev_apr = 0; - count_ev_md = 0; - count_total_pending = 0; - count_desp_pr_active = 0; - count_all_processes = 0; selectedElement = ""; @@ -147,7 +136,14 @@ export class GabineteDigitalPage implements OnInit { private sortService: SortService, private dataService: DataService, private storage: Storage, - public p: PermissionService + public p: PermissionService, + private ExpedienteService: ExpedienteService, + private PendentesService: PendentesService, + private DeferimentosServiceService: DeferimentosServiceService, + private DeplomasServiceService: DeplomasServiceService, + private AproveEventService: AproveEventService, + private ParecerService: ParecerService, + private DespachoPRService: DespachoPRService ) { @@ -547,6 +543,8 @@ export class GabineteDigitalPage implements OnInit { if(!this.loadProcess['expedientes']) { try { this.loadProcess['expedientes'] = true + + await this.ExpedienteService.getList() let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") expedientes = expedientes.filter((item) => { @@ -584,7 +582,6 @@ export class GabineteDigitalPage implements OnInit { } } - })(); (async()=>{ @@ -592,29 +589,11 @@ export class GabineteDigitalPage implements OnInit { if(!this.loadProcess['parecerespareceresPr']) { try { this.loadProcess['parecerespareceresPr'] = true - - let pareceres, pareceresPr; - pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise(); - pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); - let allParecer = pareceres.concat(pareceresPr); - - this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - this.pedidosstore.countparecer = this.count_par_dailywork; - this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { - return { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": new Date(element.taskStartDate), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - })); + let allParecer = await this.ParecerService.GetTasksList(); + this.pedidosstore.countparecer = Object.keys(allParecer).length; + + this.pedidosstore.resetparecer(allParecer); delete this.loadProcess['parecerespareceresPr'] } catch(error) { @@ -630,24 +609,9 @@ export class GabineteDigitalPage implements OnInit { try { this.loadProcess['deferimentos'] = true - let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise(); - this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length; - this.pedidosstore.countdeferimento = this.count_def_dailywork; - - this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { - return { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": new Date(element.taskStartDate), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - })); + let deferimentos = await this.DeferimentosServiceService.getList() + this.pedidosstore.countdeferimento = Object.keys(deferimentos).length; + this.pedidosstore.resetdeferimento(deferimentos); delete this.loadProcess['deferimentos'] } catch(error) { @@ -676,19 +640,21 @@ export class GabineteDigitalPage implements OnInit { })(); - (async()=>{ - let pendentes - try { - pendentes = await this.processesbackend.GetPendingTasks(false).toPromise(); - this.count_total_pending = Object.keys(pendentes).length; - this.pendentesstore.count = this.count_total_pending; - - pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) - - this.pendentesstore.reset(pendentes); - } catch (error) { - } + (async() => { + // let pendentes + if(!this.loadProcess['pendentes']) { + try { + this.loadProcess['pendentes'] = true + let pendentes = await this.PendentesService.getList() + + this.pendentesstore.reset(pendentes); + + delete this.loadProcess['pendentes'] + } catch(error) { + delete this.loadProcess['pendentes'] + } + } })(); @@ -697,52 +663,23 @@ export class GabineteDigitalPage implements OnInit { try { let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); if(this.loggeduser.Profile != 'PR') { - - let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == "Active"); - depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) - + let depacho = await this.DespachoPRService.getList(depachoAPI) this.despachoprstore.reset(depacho) + } else if(this.loggeduser.Profile == 'PR') { - - let depacho = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active") - depacho = depacho.map((e)=> this.customTaskPipe.transform(e)) + + let depacho = await this.DespachoPRService.getList(depachoAPI) this.despachoprstore.reset(depacho) - - let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma"); - this.count_dip_pv = Object.keys(diplomasValidar).length; - - diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho"); - - - this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> { - - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - return { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - } - })) - - - let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); + + this.deplomasStore.resetDiplomasReview( + await this.DeplomasServiceService.getListReview(depachoAPI) + ) + let diplomasAssinar = await this.DeplomasServiceService.getListAssinar(depachoAPI) this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) - let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); + let diplomasAssinados = await this.DeplomasServiceService.getListAssinados(depachoAPI) this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) } @@ -755,21 +692,16 @@ export class GabineteDigitalPage implements OnInit { })(); - (async()=>{ + (async() => { if(!this.loadProcess['EventosMD']) { try { this.loadProcess['EventosMD'] = true - - let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); - let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); - let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); - - eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + + let eventsMDGPRList = await this.AproveEventService.GetTasksListEventosMD() this.eventoaprovacaostore.countMd = eventsMDGPRList.length this.eventoaprovacaostore.resetmd(eventsMDGPRList); - delete this.loadProcess['EventosMD'] } catch(error) { delete this.loadProcess['EventosMD'] @@ -784,10 +716,8 @@ export class GabineteDigitalPage implements OnInit { try { this.loadProcess['EventosPR'] = true - let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); - let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); - let eventsPRList = prEventsOficial.concat(prEventsPessoal); - eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') + + let eventsPRList = await this.AproveEventService.GetTasksListEventosPR() this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.resetpr(eventsPRList); @@ -800,17 +730,6 @@ export class GabineteDigitalPage implements OnInit { })(); - (async()=>{ - this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => { - this.count_ev_apr = res; - }, (error) =>{ - console.error(error) - }); - })(); - - this.count_exp_pp = "-"; - this.count_exp_pd = "-"; - this.count_dip_apr = "-"; } doRefresh(event) { diff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts index 6ebb1169d..d4280c1a3 100644 --- a/src/app/pipes/custom-task.pipe.ts +++ b/src/app/pipes/custom-task.pipe.ts @@ -28,4 +28,4 @@ export class CustomTaskPipe implements PipeTransform { } } -} +} \ No newline at end of file diff --git a/src/app/store/loader.service.ts b/src/app/store/loader.service.ts index 53a3784a7..01ea9be85 100644 --- a/src/app/store/loader.service.ts +++ b/src/app/store/loader.service.ts @@ -9,12 +9,30 @@ export class LoaderService { name: string }[] = [] + private loader = {} + constructor() { } - get loading(){ + get loading() { return this.loadingList.length != 0 } + + initialize(name) { + this.loader[name] = [] + return { + push() { + this.loader[name].push() + }, + pop() { + this.loader[name].pop() + }, + isLoader() { + this.loader[name].length + } + } + } + push({name = ''}) { this.loadingList.push({ name: name diff --git a/version/git-version.ts b/version/git-version.ts index 1ef641476..c3ea7582b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a4063a883", - "SHA": "a4063a88397808334edb07fa8a7a22911da60a18", + "shortSHA": "4a82191e9", + "SHA": "4a82191e92e682077011e89f8a58e784bffdf46a", "branch": "develop_bitOut-fix", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Dec 28 14:52:42 2022 +0100'", + "lastCommitTime": "'Wed Dec 28 14:53:04 2022 +0100'", "lastCommitMessage": "fix publication loaders", - "lastCommitNumber": "4591", - "change": "", - "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/publications.page.ts", + "lastCommitNumber": "4592", + "change": "diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts\nindex d1f828d09..5ce452934 100644\n--- a/src/app/home/home.page.ts\n+++ b/src/app/home/home.page.ts\n@@ -207,12 +207,12 @@ export class HomePage implements OnInit {\n \n updateList() {\n \n- /* this.notificationsService.registerCallback(\n- 'despachos',\n- () => {\n- this.despachoRule.getList({ updateStore: true })\n- }\n- ) */\n+ // this.notificationsService.registerCallback(\n+ // 'despachos',\n+ // () => {\n+ // // this.despachoRule.getList({ updateStore: true })\n+ // }\n+ // ) \n \n document.addEventListener('pause', function () {\n // console.log('App going to background');\ndiff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\nindex 5d120d2e9..5eb08091c 100644\n--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts\n@@ -21,6 +21,13 @@ import { DeplomasStore } from 'src/app/store/deplomas.service';\n import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';\n \n import { DespachoService } from 'src/app/Rules/despacho.service';\n+import { ExpedienteService } from 'src/app/Rules/expediente.service';\n+import { PendentesService } from 'src/app/Rules/pendentes.service';\n+import { AproveEventService } from 'src/app/Rules/aprove-event.service';\n+import { ParecerService } from 'src/app/Rules/parecer.service';\n+import { DeferimentosServiceService } from 'src/app/Rules/deferimentos-service.service';\n+import { DeplomasServiceService } from 'src/app/Rules/deplomas-service.service'\n+import { DespachoPRService } from 'src/app/Rules/despacho-pr.service'\n import { ChangeProfileService } from 'src/app/services/change-profile.service';\n import { PermissionService } from 'src/app/services/permission.service';\n import { ThemeService } from 'src/app/services/theme.service'\n@@ -54,24 +61,6 @@ export class GabineteDigitalPage implements OnInit {\n allProcessesList: any = new Array();\n skeletonLoader: boolean;\n \n- count_exp_dailywork = 0;\n- count_exp_pr = 0\n- count_desp_dailywork = 0;\n- count_desp_pending = 0;\n- count_par_dailywork = 0;\n- count_par_pending = 0;\n- count_def_dailywork = 0;\n- count_def_pending = 0;\n- count_exp_pp: string;\n- count_exp_pd: string;\n- count_dip_apr: string;\n- count_dip_pv = 0;\n- count_de_pr = 0;\n- count_ev_apr = 0;\n- count_ev_md = 0;\n- count_total_pending = 0;\n- count_desp_pr_active = 0;\n- count_all_processes = 0;\n \n selectedElement = \"\";\n \n@@ -147,7 +136,14 @@ export class GabineteDigitalPage implements OnInit {\n private sortService: SortService,\n private dataService: DataService,\n private storage: Storage,\n- public p: PermissionService\n+ public p: PermissionService,\n+ private ExpedienteService: ExpedienteService,\n+ private PendentesService: PendentesService,\n+ private DeferimentosServiceService: DeferimentosServiceService,\n+ private DeplomasServiceService: DeplomasServiceService,\n+ private AproveEventService: AproveEventService,\n+ private ParecerService: ParecerService,\n+ private DespachoPRService: DespachoPRService\n ) {\n \n \n@@ -547,6 +543,8 @@ export class GabineteDigitalPage implements OnInit {\n if(!this.loadProcess['expedientes']) {\n try {\n this.loadProcess['expedientes'] = true\n+\n+ await this.ExpedienteService.getList()\n let expedientes: any = await this.processesbackend.GetTaskListExpediente(false).toPromise();\n expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == \"Active\")\n expedientes = expedientes.filter((item) => {\n@@ -584,7 +582,6 @@ export class GabineteDigitalPage implements OnInit {\n }\n } \n \n- \n })();\n \n (async()=>{\n@@ -592,29 +589,11 @@ export class GabineteDigitalPage implements OnInit {\n if(!this.loadProcess['parecerespareceresPr']) {\n try {\n this.loadProcess['parecerespareceresPr'] = true\n- \n- let pareceres, pareceresPr;\n- pareceres = await this.processesbackend.GetTasksList(\"Pedido de Parecer\", false).toPromise();\n- pareceresPr = await this.processesbackend.GetTasksList(\"Pedido de Parecer do Presidente\", false).toPromise();\n- let allParecer = pareceres.concat(pareceresPr);\n- \n- this.count_par_dailywork = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == \"Active\")).length;\n- this.pedidosstore.countparecer = this.count_par_dailywork;\n \n- this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == \"Active\").map((element) => {\n- return {\n- \"SerialNumber\": element.serialNumber,\n- \"Folio\": element.workflowInstanceDataFields.Subject,\n- \"Senders\": element.workflowInstanceDataFields.Sender,\n- \"CreateDate\": new Date(element.taskStartDate),\n- \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n- \"Remetente\": element.workflowInstanceDataFields.Remetente,\n- \"DocumentsQty\": element.totalDocuments,\n- \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n- \"WorkflowName\": element.workflowDisplayName,\n- \"activityInstanceName\": element.activityInstanceName,\n- }\n- })); \n+ let allParecer = await this.ParecerService.GetTasksList();\n+ this.pedidosstore.countparecer = Object.keys(allParecer).length;\n+ \n+ this.pedidosstore.resetparecer(allParecer); \n \n delete this.loadProcess['parecerespareceresPr']\n } catch(error) {\n@@ -630,24 +609,9 @@ export class GabineteDigitalPage implements OnInit {\n try {\n this.loadProcess['deferimentos'] = true\n \n- let deferimentos = await this.processesbackend.GetTasksList(\"Pedido de Deferimento\", false).toPromise();\n- this.count_def_dailywork = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == \"Active\")).length;\n- this.pedidosstore.countdeferimento = this.count_def_dailywork;\n- \n- this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == \"Active\").map((element) => {\n- return {\n- \"SerialNumber\": element.serialNumber,\n- \"Folio\": element.workflowInstanceDataFields.Subject,\n- \"Senders\": element.workflowInstanceDataFields.Sender,\n- \"CreateDate\": new Date(element.taskStartDate),\n- \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n- \"Remetente\": element.workflowInstanceDataFields.Remetente,\n- \"DocumentsQty\": element.totalDocuments,\n- \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n- \"WorkflowName\": element.workflowDisplayName,\n- \"activityInstanceName\": element.activityInstanceName,\n- }\n- }));\n+ let deferimentos = await this.DeferimentosServiceService.getList()\n+ this.pedidosstore.countdeferimento = Object.keys(deferimentos).length;\n+ this.pedidosstore.resetdeferimento(deferimentos);\n \n delete this.loadProcess['deferimentos']\n } catch(error) {\n@@ -676,19 +640,21 @@ export class GabineteDigitalPage implements OnInit {\n })();\n \n \n- (async()=>{\n- let pendentes\n- try {\n- pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();\n- this.count_total_pending = Object.keys(pendentes).length;\n- this.pendentesstore.count = this.count_total_pending;\n- \n- pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))\n- \n- this.pendentesstore.reset(pendentes);\n- } catch (error) {\n- }\n+ (async() => {\n+ // let pendentes\n+ if(!this.loadProcess['pendentes']) {\n+ try {\n+ this.loadProcess['pendentes'] = true\n+ \n+ let pendentes = await this.PendentesService.getList()\n+ \n+ this.pendentesstore.reset(pendentes);\n \n+ delete this.loadProcess['pendentes']\n+ } catch(error) {\n+ delete this.loadProcess['pendentes']\n+ }\n+ } \n })();\n \n \n@@ -697,52 +663,23 @@ export class GabineteDigitalPage implements OnInit {\n try {\n let depachoAPI: any = await this.processesbackend.GetTasksList(\"Despacho do Presidente da República\", false).toPromise();\n if(this.loggeduser.Profile != 'PR') {\n- \n- let depacho = depachoAPI.reverse().filter(data => data.activityInstanceName == \"Tarefa de Despacho\");\n- depacho = depacho.filter(data => data.workflowInstanceDataFields.Status == \"Active\");\n \n- depacho = depacho.map((e)=> this.customTaskPipe.transform(e))\n- \n+ let depacho = await this.DespachoPRService.getList(depachoAPI)\n this.despachoprstore.reset(depacho)\n+\n } else if(this.loggeduser.Profile == 'PR') {\n- \n- let depacho = depachoAPI.filter(data => data.activityInstanceName == \"Concluir Despacho\").filter(data => data.workflowInstanceDataFields.Status == \"Active\")\n- depacho = depacho.map((e)=> this.customTaskPipe.transform(e))\n+ \n+ let depacho = await this.DespachoPRService.getList(depachoAPI)\n this.despachoprstore.reset(depacho)\n- \n- let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == \"Revisar Diploma\");\n- this.count_dip_pv = Object.keys(diplomasValidar).length;\n- \n- diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != \"Tarefa de Despacho\");\n- \n- \n- this.deplomasStore.resetDiplomasReview(diplomasValidar.map((element)=> {\n- \n- let date = new Date(element.taskStartDate);\n- date.setMonth(date.getMonth() + 1);\n- let taskDate = date.getFullYear()+\"-\"+ date.getMonth()+\"-\"+date.getDate()+\" \"+date.getHours()+\":\"+date.getMinutes()+ \":\"+date.getSeconds();\n- \n- return {\n- \"SerialNumber\": element.serialNumber,\n- \"Folio\": element.workflowInstanceDataFields.Subject,\n- \"Senders\": element.workflowInstanceDataFields.Sender,\n- \"CreateDate\": taskDate,\n- \"DocumentURL\": element.workflowInstanceDataFields.ViewerRequest,\n- \"Remetente\": element.workflowInstanceDataFields.Remetente,\n- \"DocumentsQty\": element.totalDocuments,\n- \"DocId\": element.workflowInstanceDataFields.DocIdDiferimento,\n- \"WorkflowName\": element.workflowDisplayName,\n- \"activityInstanceName\": element.activityInstanceName,\n- \"Status\": element.workflowInstanceDataFields.Status,\n- }\n- }))\n- \n- \n- let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == \"Assinar Diploma\");\n+\n+ this.deplomasStore.resetDiplomasReview(\n+ await this.DeplomasServiceService.getListReview(depachoAPI)\n+ )\n \n+ let diplomasAssinar = await this.DeplomasServiceService.getListAssinar(depachoAPI)\n this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)\n \n- let diplomasAssinados = depachoAPI.filter(data => data.activityInstanceName == \"Diploma Assinado\");\n+ let diplomasAssinados = await this.DeplomasServiceService.getListAssinados(depachoAPI)\n this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)\n }\n \n@@ -755,21 +692,16 @@ export class GabineteDigitalPage implements OnInit {\n })();\n \n \n- (async()=>{\n+ (async() => {\n if(!this.loadProcess['EventosMD']) {\n try {\n this.loadProcess['EventosMD'] = true\n- \n- let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();\n- let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();\n- let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);\n- \n- eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')\n+\n+ let eventsMDGPRList = await this.AproveEventService.GetTasksListEventosMD()\n \n this.eventoaprovacaostore.countMd = eventsMDGPRList.length\n this.eventoaprovacaostore.resetmd(eventsMDGPRList);\n \n- \n delete this.loadProcess['EventosMD']\n } catch(error) {\n delete this.loadProcess['EventosMD']\n@@ -784,10 +716,8 @@ export class GabineteDigitalPage implements OnInit {\n try {\n this.loadProcess['EventosPR'] = true\n \n- let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();\n- let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();\n- let eventsPRList = prEventsOficial.concat(prEventsPessoal);\n- eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')\n+\n+ let eventsPRList = await this.AproveEventService.GetTasksListEventosPR()\n \n this.eventoaprovacaostore.countPr = eventsPRList.length\n this.eventoaprovacaostore.resetpr(eventsPRList);\n@@ -800,17 +730,6 @@ export class GabineteDigitalPage implements OnInit {\n \n })();\n \n- (async()=>{\n- this.processesbackend.GetToApprovedEvents('Agenda', 'true').subscribe(res => {\n- this.count_ev_apr = res;\n- }, (error) =>{\n- console.error(error)\n- });\n- })();\n-\n- this.count_exp_pp = \"-\";\n- this.count_exp_pd = \"-\";\n- this.count_dip_apr = \"-\";\n }\n \n doRefresh(event) {\ndiff --git a/src/app/pipes/custom-task.pipe.ts b/src/app/pipes/custom-task.pipe.ts\nindex 6ebb1169d..d4280c1a3 100644\n--- a/src/app/pipes/custom-task.pipe.ts\n+++ b/src/app/pipes/custom-task.pipe.ts\n@@ -28,4 +28,4 @@ export class CustomTaskPipe implements PipeTransform {\n }\n }\n \n-}\n+}\n\\ No newline at end of file\ndiff --git a/src/app/store/loader.service.ts b/src/app/store/loader.service.ts\nindex 53a3784a7..01ea9be85 100644\n--- a/src/app/store/loader.service.ts\n+++ b/src/app/store/loader.service.ts\n@@ -9,12 +9,30 @@ export class LoaderService {\n name: string\n }[] = []\n \n+ private loader = {}\n+\n constructor() { }\n \n- get loading(){\n+ get loading() {\n return this.loadingList.length != 0\n }\n \n+\n+ initialize(name) {\n+ this.loader[name] = []\n+ return {\n+ push() { \n+ this.loader[name].push()\n+ },\n+ pop() {\n+ this.loader[name].pop()\n+ },\n+ isLoader() {\n+ this.loader[name].length\n+ }\n+ }\n+ }\n+ \n push({name = ''}) {\n this.loadingList.push({\n name: name", + "changeStatus": "On branch develop_bitOut-fix\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/Rules/aprove-event.service.spec.ts\n\tnew file: src/app/Rules/aprove-event.service.ts\n\tmodified: src/app/Rules/deadline.service.ts\n\tnew file: src/app/Rules/deferimentos-service.service.spec.ts\n\tnew file: src/app/Rules/deferimentos-service.service.ts\n\tmodified: src/app/Rules/deploma.service.ts\n\tnew file: src/app/Rules/deplomas-service.service.spec.ts\n\tnew file: src/app/Rules/deplomas-service.service.ts\n\tnew file: src/app/Rules/despacho-pr.service.spec.ts\n\tnew file: src/app/Rules/despacho-pr.service.ts\n\tmodified: src/app/Rules/despacho.service.ts\n\tmodified: src/app/Rules/expediente.service.ts\n\tnew file: src/app/Rules/parecer.service.spec.ts\n\tnew file: src/app/Rules/parecer.service.ts\n\tmodified: src/app/Rules/pedido.service.ts\n\tmodified: src/app/Rules/pendentes.service.ts\n\tmodified: src/app/Rules/process-document.service.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pipes/custom-task.pipe.ts\n\tmodified: src/app/store/loader.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file