diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index ae9c05f13..de63f84e9 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -45,6 +45,8 @@

Todas as tarefas
- {{ TaskService.new }} Novas tarefas - {{ TaskService.new }} Nova tarefa + {{ TaskService.new }} correspondências novas + {{ TaskService.new }} correspondência tarefa +

+

{{ AllProcess.length }} + Documento + Documento + Documentos

-

{{ AllProcess.length }} Documentos

@@ -241,17 +245,19 @@

Despachos {{ environment.despachoLabel }}
- {{ TaskService.despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos - {{ TaskService.despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo + {{ TaskService.despachoprstore.newList.length}} Despachos correspondências novos + {{ TaskService.despachoprstore.newList.length}} Despacho correspondência novo

Despachos criados por mim
- {{ TaskService.despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos - {{ TaskService.despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo + {{ TaskService.despachoprstore.newList.length}} correspondências novos + {{ TaskService.despachoprstore.newList.length}} correspondência novo

{{ TaskService.despachoprstore.count }} - Documentos + Documento + Documento + Documentos

@@ -266,15 +272,17 @@

Diplomas assinados PR
- {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas por Assinar PR novos - {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diploma por Assinar PR novo + {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novos + {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência novo

Diplomas
- {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas novo - {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diploma novo + {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondências novo + {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} correspondência novo

{{ TaskService.deplomasStore.countDiplomasAssinadoListCount }} - Documentos

+ Documento + Documento + Documentos @@ -289,10 +297,15 @@

Diplomas por Assinar {{ environment.PR}}
- {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas por Assinar {{ environment.PR}} novos - {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma por Assinar {{ environment.PR}} novo + {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas correspondências novos + {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma correspondência novo +

+

+ {{ TaskService.deplomasStore.diplomasParaAssinartCount }} + Documento + Documento + Documentos

-

{{ TaskService.deplomasStore.diplomasParaAssinartCount }} Documentos

@@ -304,11 +317,16 @@

Diplomas por Validar
- {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} Diplomas por validar novos - {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} Diploma por validar novo + {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondências novos + {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} correspondência novo

-

{{ TaskService.deplomasStore.deplomasReviewCount }} Documentos

+

+ {{ TaskService.deplomasStore.deplomasReviewCount }} + Documento + Documento + Documentos +

@@ -322,10 +340,15 @@

Diplomas para Assinar
- {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas para assinar novos - {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma para assinar novo + {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondências novos + {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} correspondência novo +

+

+ {{ TaskService.deplomasStore.diplomasParaAssinartCount }} + Documento + Documento + Documentos

-

{{ TaskService.deplomasStore.diplomasParaAssinartCount }} Documentos

@@ -341,10 +364,15 @@

Diplomas por elaborar
- {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos - {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo + {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondências novos + {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} correspondência novo +

+

+ {{ TaskService.deplomasStore.DiplomaGerarList.length }} + Documento + Documento + Documentos

-

{{ TaskService.deplomasStore.DiplomaGerarList.length }} Documentos

@@ -354,9 +382,15 @@

Eventos 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

+ {{ TaskService.eventoaprovacaostore.newList.length}} correspondências novos + {{ TaskService.eventoaprovacaostore.newList.length}} correspondência novo +

+

+ {{TaskService.eventoaprovacaostore.countAll}} + Documento + Documento + Documentos +

@@ -370,11 +404,16 @@

Expediente
- {{ TaskService.expedientegbstore.newList.length}} Expediente novo - {{ TaskService.expedientegbstore.newList.length}} Expedientes novos + {{ TaskService.expedientegbstore.newList.length}} correspondência novo + {{ TaskService.expedientegbstore.newList.length}} correspondências novos

-

{{TaskService.expedientegbstore.count}} Documentos

+

+ {{TaskService.expedientegbstore.count}} + Documento + Documento + Documentos +

@@ -388,10 +427,15 @@

Despachos
- {{ TaskService.despachoStore.newList.length}} Despachos novos - {{ TaskService.despachoStore.newList.length}} Despacho novo + {{ TaskService.despachoStore.newList.length}} correspondências novos + {{ TaskService.despachoStore.newList.length}} correspondência novo

-

{{TaskService.despachoStore.count}} Documentos

+

+ {{TaskService.despachoStore.count}} + Documento + Documento + Documentos +

@@ -408,15 +452,20 @@

Pedidos de Parecer
- {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer novos - {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer novo + {{ TaskService.pedidosstore.listParecerCount.length}} correspondências novos + {{ TaskService.pedidosstore.listParecerCount.length}} correspondência novo

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.listParecerCount.length}} correspondências novos + {{ TaskService.pedidosstore.listParecerCount.length}} correspondência novo +

+

+ {{TaskService.pedidosstore.countparecer}} + Documento + Documento + Documentos

-

{{TaskService.pedidosstore.countparecer}} Documentos

@@ -431,10 +480,15 @@

Pedidos de Deferimento
- {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento novos - {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedido de Deferimento novo + {{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondências novos + {{ TaskService.pedidosstore.listDeferimentoCount.length}} correspondência novo +

+

+ {{ TaskService.pedidosstore.countdeferimento}} + Documento + Documento + Documentos

-

{{TaskService.pedidosstore.countdeferimento}} Documentos

@@ -448,16 +502,20 @@

Pendentes
- {{ TaskService.pendentesstore.newList.length}} Pendentes novos - {{ TaskService.pendentesstore.newList.length}} Pendente novo + {{ TaskService.pendentesstore.newList.length}} correspondências novos + {{ TaskService.pendentesstore.newList.length}} correspondência novo

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

-

{{TaskService.pendentesstore.count}} Documentos

+

+ {{TaskService.pendentesstore.count}} + Documento + Documento + Documentos diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 965fa6fb3..d31c52eea 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -764,4 +764,14 @@ export class GabineteDigitalPage implements OnInit { } } + + onDragOver(event) { + // do something + event.preventDefault(); + } + onDragLeave(event) { + // do something + event.preventDefault(); + } + } diff --git a/src/app/services/task-deadline.service.ts b/src/app/services/task-deadline.service.ts index 790899c4c..3a9addd65 100644 --- a/src/app/services/task-deadline.service.ts +++ b/src/app/services/task-deadline.service.ts @@ -44,7 +44,7 @@ export class TaskDeadlineService { updateAllProcess() { - this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any) + this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any).concat(this.deplomasStore.diplomasReviewList) .concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any) .concat(this.pendentesstore.list as any)).reverse() } diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 805a54fd9..e638cd9af 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -129,7 +129,7 @@ export class TaskService { } updateAllProcess = () => { - this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any) + this.AllProcess = this.sortArrayISODate(this.despachoprstore.list.concat(this.deplomasStore.diplomasAssinadoList as any).concat(this.deplomasStore.diplomasParaAssinarList as any).concat(this.deplomasStore.DiplomaGerarList as any).concat(this.deplomasStore.diplomasReviewList) .concat(this.eventoaprovacaostore.contactList as any).concat(this.expedientegbstore.list as any).concat(this.despachoStore.list as any).concat(this.pedidosstore.listparecer as any).concat(this.pedidosstore.listdeferimento as any) .concat(this.pendentesstore.list as any)).reverse() diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 62d962cde..c5641fa9e 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -51,7 +51,15 @@ export class AllProcessesPage implements OnInit { // console.log('this.TaskService.AllProcess', this.TaskService.AllProcess) // this.miniSearch.addAll(this.TaskService.AllProcess) // window['miniSearch'] = this.miniSearch - }, 5000) + + + this.TaskService.registerCallback({ + id: import.meta.url, + funx:() => { + this.dynamicSearch() + } + }) + }, 10) this.TaskService.registerCallback({ @@ -86,6 +94,7 @@ export class AllProcessesPage implements OnInit { } else { this.AllProcess = this.TaskService.AllProcess } + } checkFilter() { diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 992caedd6..824c4cf70 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -51,7 +51,7 @@

-
+
@@ -97,13 +97,13 @@
Lista vazia
-
+
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 68103c257..6ff9ec17d 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -15,7 +15,6 @@ import { TaskService } from 'src/app/services/task.service' }) export class DiplomasAssinarPage implements OnInit { - diplomasList:DailyWorkTask[] = []; serialNumber:string; skeletonLoader = true diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts index e9ec626a8..d7b903e68 100644 --- a/src/app/store/deplomas.service.ts +++ b/src/app/store/deplomas.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' - +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' }) @@ -227,12 +227,13 @@ export class DeplomasService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts index da501ce9e..52a97c5b0 100644 --- a/src/app/store/despacho-store.service.ts +++ b/src/app/store/despacho-store.service.ts @@ -3,7 +3,7 @@ import { localstoreService } from './localstore.service' import { SHA1 } from 'crypto-js' import { customTask } from '../models/dailyworktask.model'; import { ObjectQueryService } from '../services/object-query.service'; - +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' }) @@ -161,12 +161,13 @@ export class DespachoStoreService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts index 83b6f4e24..79865ec92 100644 --- a/src/app/store/despachospr-store.service.ts +++ b/src/app/store/despachospr-store.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' @@ -81,12 +82,13 @@ updateNewCount() { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } } diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts index a422e8b70..722e8f712 100644 --- a/src/app/store/eventoaprovacao-store.service.ts +++ b/src/app/store/eventoaprovacao-store.service.ts @@ -3,6 +3,7 @@ import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' import { isArray } from 'ionic-angular/umd/util/util'; import { EventoApprovePipe } from 'src/app/pipes/evento-approve.pipe' +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' @@ -133,12 +134,13 @@ export class EventoaprovacaoStoreService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts index 2ca794a82..7b10d1bcd 100644 --- a/src/app/store/expedientegd-store.service.ts +++ b/src/app/store/expedientegd-store.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { SHA1 } from 'crypto-js' import { ExpedienteTask } from '../models/dailyworktask.model'; +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' @@ -82,12 +83,13 @@ export class ExpedientegdStoreService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } } diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts index 7628d4f8a..32b510952 100644 --- a/src/app/store/pedidos-store.service.ts +++ b/src/app/store/pedidos-store.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' @@ -136,12 +137,13 @@ export class PedidosStoreService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts index 32b2717d0..66bfb3191 100644 --- a/src/app/store/pendestes-store.service.ts +++ b/src/app/store/pendestes-store.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { localstoreService } from './localstore.service' import { AES, enc, SHA1 } from 'crypto-js' +import { momentG } from 'src/plugin/momentG'; @Injectable({ providedIn: 'root' @@ -68,7 +69,7 @@ export class PendestesStoreService { } private save() { - setTimeout(()=>{ + setTimeout(() => { localstoreService.set(this.keyName,{ list: this._list, count: this._list.length @@ -88,12 +89,13 @@ export class PendestesStoreService { lessthen24Hours(isoDateString:string) { - const creationDate = new Date(isoDateString) - const creationDatePlus24h = new Date(creationDate) - creationDatePlus24h.setHours((creationDate.getHours() + 24)) - const currentDate = new Date() - return creationDatePlus24h.getTime() > currentDate.getTime() + if(!isoDateString) { + return false + } + + const creationDate = new Date(isoDateString) + return momentG(new Date(), 'dd MMMM yyyy') == momentG(new Date(creationDate), 'dd MMMM yyyy') } } diff --git a/version/git-version.ts b/version/git-version.ts index b5485d132..aeb75714f 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "544b35443", - "SHA": "544b35443d93e7d35238a1795af28b6d3483496b", + "shortSHA": "8d88b613c", + "SHA": "8d88b613cb520268618af660c72d39d048eb965d", "branch": "feature/gabineteLabels", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Apr 25 10:04:32 2023 +0100'", + "lastCommitTime": "'Tue Apr 25 10:13:45 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "4930", + "lastCommitNumber": "4931", "change": "", - "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html", + "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.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/services/task-deadline.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/store/deplomas.service.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/despachospr-store.service.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts\n\tmodified: src/app/store/expedientegd-store.service.ts\n\tmodified: src/app/store/pedidos-store.service.ts\n\tmodified: src/app/store/pendestes-store.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file