From 0c27c2f21396a70a7b451935fa56f0bb92f59ac9 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 20 Apr 2023 15:34:00 +0100 Subject: [PATCH] add lebels --- .../diplomas-assinar/diplomas-assinar.page.ts | 10 +---- .../diplomas-gerar/diplomas-gerar.page.ts | 2 + .../diplomas/diplomas.page.ts | 38 +------------------ .../gabinete-digital.page.html | 20 +++++----- src/app/services/task.service.ts | 3 +- version/git-version.ts | 12 +++--- 6 files changed, 22 insertions(+), 63 deletions(-) diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 43e3bc271..272587f33 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -83,16 +83,8 @@ export class DiplomasAssinarPage implements OnInit { try { let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + this.TaskService.loadDiplomas() - - let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); - - let format = diplomasAssinar.map(element => { - return this.customTaskPipe.transform(element) - }); - - this.deplomasStore.resetDiplomasParaAssinar(format) - this.diplomasList = this.sortService.sortDate(format, 'CreateDate') } catch(error) { } diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index 29134be44..f73c0eaf1 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -82,6 +82,8 @@ export class DiplomasGerarPage implements OnInit { this.skeletonLoader = true try { + + await this.TaskService.loadDiplomas(); let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.diplomasList = []; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index f60352b92..f5fe3903f 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -109,43 +109,7 @@ export class DiplomasPage implements OnInit, OnDestroy { try { this.skeletonLoader = true - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - this.skeletonLoader = false - this.showLoader = false; - - let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma"); - let diplomasList = []; - diplomasValidar.forEach(async element => { - - let task = this.pipeTask(element) - diplomasList.push(task); - - }); - - this.deplomasStore.resetDiplomasReview(diplomasValidar) - - this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate'); - - let diplomasAssinados = diplomas.filter(data => data.activityInstanceName == "Diploma Assinado"); - - - let diplomasAssinadoList = diplomasAssinados.map( element => { - return this.pipeTask(element); - }); - - this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate') - this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados); - - - let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); - - this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar.map(element => { - return this.customTaskPipe.transform(element) - })) - - // console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList) - + await this.TaskService.loadDiplomas() } catch(error) { this.skeletonLoader = false } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 881347cac..8cb45cd36 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -350,8 +350,8 @@

Eventos para Aprovação
- {{ TaskService.eventoaprovacaostore.newList.length}} Eventos para aprovação - {{ TaskService.eventoaprovacaostore.newList.length}} Evento para aprovação

+ {{ TaskService.eventoaprovacaostore.newList.length}} Eventos para aprovação novos + {{ TaskService.eventoaprovacaostore.newList.length}} Evento para aprovação novo

{{TaskService.eventoaprovacaostore.countAll}} Documentos

@@ -404,13 +404,13 @@

Pedidos de Parecer
- {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer - {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer + {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer novos + {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer novo

Pedidos de Parecer solicitados por mim
- {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim - {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer solicitados por mim + {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim novos + {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer solicitados por mim novo

{{TaskService.pedidosstore.countparecer}} Documentos

@@ -427,8 +427,8 @@

Pedidos de Deferimento
- {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento - {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento + {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento novos + {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedido de Deferimento novo

{{TaskService.pedidosstore.countdeferimento}} Documentos

@@ -449,8 +449,8 @@

Meus Pendentes
- {{ TaskService.pendentesstore.newList.length}} Meus Pendente - {{ TaskService.pendentesstore.newList.length}} Meu Pendent + {{ TaskService.pendentesstore.newList.length}} Meus Pendente novos + {{ TaskService.pendentesstore.newList.length}} Meu Pendent novo

{{TaskService.pendentesstore.count}} Documentos

diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 7b1b52251..60bce693a 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -299,7 +299,7 @@ export class TaskService { diplomasList.push(task); }); - this.sortService.sortDate(diplomasList, 'CreateDate') + diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate') this.deplomasStore.resetDiplomaGerar(diplomasList); @@ -320,6 +320,7 @@ export class TaskService { let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element)) + this.sortService.sortDate(diplomasAssinar, 'CreateDate') this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado"); diff --git a/version/git-version.ts b/version/git-version.ts index 31e6a9bd0..ac098e5d8 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "47dd1b2bc", - "SHA": "47dd1b2bc84906c09e286e745cfc1fef3441133e", + "shortSHA": "74a2fe805", + "SHA": "74a2fe80582edea712fa31d9d859bf3bb20d788b", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Apr 20 11:45:46 2023 +0100'", - "lastCommitMessage": "add seach button", - "lastCommitNumber": "4924", + "lastCommitTime": "'Thu Apr 20 13:36:59 2023 +0100'", + "lastCommitMessage": "fix update", + "lastCommitNumber": "4925", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: version/git-version.ts", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/task.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file