diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 0d8930fc3..a2138cd5d 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -83,7 +83,8 @@ export class EventsPage implements OnInit {
public TaskService: TaskService
) {
- this.TaskService.updateCount()
+ // this.TaskService.updateCount()
+ this.TaskService.LoadTask()
window['zipPhoneCallback'] = function (zipphone) {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 65948fffa..3c5ddc073 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -9,12 +9,12 @@
-
+
Gabinete Digital
-
+
@@ -67,12 +67,12 @@
-
+
-
+
@@ -128,7 +128,7 @@
-
+
@@ -174,7 +174,7 @@
-
+
@@ -183,7 +183,7 @@
Todas as tarefas
-
{{ getAllProcessCount }} Documentos
+
{{ TaskService.AllProcess.length }} Documentos
@@ -198,16 +198,16 @@
Despachos {{ environment.despachoLabel }} {{ despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos
- {{ despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo
+ {{ TaskService.despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos
+ {{ TaskService.despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo
Despachos criados por mim{{ despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos
- {{ despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo
+ {{ TaskService.despachoprstore.newList.length}} Despachos {{ environment.despachoLabel }} novos
+ {{ TaskService.despachoprstore.newList.length}} Despacho {{ environment.despachoLabel }} novo
-
{{ despachoprstore.count }}
+
{{ TaskService.despachoprstore.count }}
Documentos
@@ -223,14 +223,14 @@
Diplomas assinados PR {{ deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas por Assinar PR novos
- {{ deplomasStore.diplomasAssinadoListNewCount.length}} Diploma por Assinar PR novo
+ {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas por Assinar PR novos
+ {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diploma por Assinar PR novo
Diplomas {{ deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas novo
- {{ deplomasStore.diplomasAssinadoListNewCount.length}} Diploma novo
+ {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diplomas novo
+ {{ TaskService.deplomasStore.diplomasAssinadoListNewCount.length}} Diploma novo
- {{ deplomasStore.countDiplomasAssinadoListCount }}
+
{{ TaskService.deplomasStore.countDiplomasAssinadoListCount }}
Documentos
@@ -246,10 +246,10 @@
Diplomas por Assinar {{ environment.PR}} {{ deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas por Assinar {{ environment.PR}} novos
- {{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma por Assinar {{ environment.PR}} novo
+ {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas por Assinar {{ environment.PR}} novos
+ {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma por Assinar {{ environment.PR}} novo
-
{{ deplomasStore.diplomasParaAssinartCount }} Documentos
+
{{ TaskService.deplomasStore.diplomasParaAssinartCount }} Documentos
@@ -261,11 +261,11 @@
Diplomas por Validar{{ deplomasStore.diplomasReviewListNewCount.length}} Diplomas por validar novos
- {{ deplomasStore.diplomasReviewListNewCount.length}} Diploma por validar novo
+ {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} Diplomas por validar novos
+ {{ TaskService.deplomasStore.diplomasReviewListNewCount.length}} Diploma por validar novo
- {{ deplomasStore.deplomasReviewCount }} Documentos
+ {{ TaskService.deplomasStore.deplomasReviewCount }} Documentos
@@ -279,10 +279,10 @@
Diplomas para Assinar{{ deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas para assinar novos
- {{ deplomasStore.diplomasParaAssinarNewCount.length}} Diploma para assinar novo
+ {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diplomas para assinar novos
+ {{ TaskService.deplomasStore.diplomasParaAssinarNewCount.length}} Diploma para assinar novo
- {{ deplomasStore.diplomasParaAssinartCount }} Documentos
+ {{ TaskService.deplomasStore.diplomasParaAssinartCount }} Documentos
@@ -298,10 +298,10 @@
Diplomas por elaborar {{ deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos
- {{ deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo
+ {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} Diplomas por elaborar novos
+ {{ TaskService.deplomasStore.diplomasGerarListNewCount.length}} Diploma por elaborar novo
-
{{ deplomasStore.DiplomaGerarList.length }} Documentos
+
{{ TaskService.deplomasStore.DiplomaGerarList.length }} Documentos
- Eventos para Aprovação
- {{eventoaprovacaostore.countAll}} Documentos
+ Eventos para Aprovação {{ TaskService.eventoaprovacaostore.newList.length}} Eventos para aprovação
+ {{ TaskService.eventoaprovacaostore.newList.length}} Evento para aprovação
+ {{TaskService.eventoaprovacaostore.countAll}} Documentos
@@ -325,11 +327,11 @@
Expediente {{ expedientegbstore.newList.length}} Expediente novo
- {{ expedientegbstore.newList.length}} Expedientes novos
+ {{ TaskService.expedientegbstore.newList.length}} Expediente novo
+ {{ TaskService.expedientegbstore.newList.length}} Expedientes novos
- {{expedientegbstore.count}} Documentos
+ {{TaskService.expedientegbstore.count}} Documentos
@@ -343,10 +345,10 @@
Despachos{{ despachoStore.newList.length}} Despachos novos
- {{ despachoStore.newList.length}} Despacho novo
+ {{ TaskService.despachoStore.newList.length}} Despachos novos
+ {{ TaskService.despachoStore.newList.length}} Despacho novo
- {{despachoStore.count}} Documentos
+ {{TaskService.despachoStore.count}} Documentos
@@ -363,15 +365,15 @@
Pedidos de Parecer{{ pedidosstore.listParecerCount.length}} Pedidos de Parecer
- {{ pedidosstore.listParecerCount.length}} Pedido de Parecer
+ {{ TaskService.pedidosstore.listParecerCount.length}} Pedidos de Parecer
+ {{ TaskService.pedidosstore.listParecerCount.length}} Pedido de Parecer
Pedidos de Parecer solicitados por mim {{ pedidosstore.listParecerCount.length}} Pedido de Parecer solicitados por mim
- {{ pedidosstore.listParecerCount.length}} 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
- {{pedidosstore.countparecer}} Documentos
+ {{TaskService.pedidosstore.countparecer}} Documentos
@@ -386,10 +388,10 @@
Pedidos de Deferimento{{ pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento
- {{ pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento
+ {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento
+ {{ TaskService.pedidosstore.listDeferimentoCount.length}} Pedidos de Deferimento
- {{pedidosstore.countdeferimento}} Documentos
+ {{TaskService.pedidosstore.countdeferimento}} Documentos
@@ -403,23 +405,23 @@
Pendentes{{ pendentesstore.newList.length}} Pendentes novos
- {{ pendentesstore.newList.length}} Pendente novo
+ {{ TaskService.pendentesstore.newList.length}} Pendentes novos
+ {{ TaskService.pendentesstore.newList.length}} Pendente novo
Meus Pendentes{{ pendentesstore.newList.length}} Meus Pendente
- {{ pendentesstore.newList.length}} Meu Pendent
+ {{ TaskService.pendentesstore.newList.length}} Meus Pendente
+ {{ TaskService.pendentesstore.newList.length}} Meu Pendent
- {{pendentesstore.count}} Documentos
+ {{TaskService.pendentesstore.count}} Documentos
-
+
{
-
- 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.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()
-
-
- // try{
- // this.workerList.postMessage([
- // this.expedientegbstore.list,this.pedidosstore.listparecer,this.pedidosstore.listdeferimento,
- // this.despachoprstore.list, this.eventoaprovacaostore.listmd, this.eventoaprovacaostore.listpr, this.despachoStore.list,
- // this.deplomasStore.diplomasParaAssinarList, this.deplomasStore.diplomasAssinadoList, this.deplomasStore.DiplomaGerarList
- // ])
- // } catch (e) {
- // this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
- // .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
- // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
- // }
-
-
- clearTimeout(this.functionTimer);
- this.functionTimer = setTimeout(() => {
-
- if(window['all-process']) {
- window['all-process']()
- } else {
- this.TaskService.updateCount()
- }
- }, 1000); // time is in milliseconds
-
-
-
- }
-
- get getAllProcessCount() {
- return this.AllProcess.length
- }
-
loadProcess = {}
get getloadKeys() {
return Object.keys(this.loadProcess)
}
- loadNum = 0
async LoadCounts() {
- this.updateAllProcess()
-
- let expedientes;
- this.showLoader = true
-
- try {
- expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
- this.loadCount = true;
- this.showLoader = false;
- } catch(error) {
- this.showLoader = false
- this.loadCount = true;
- }
-
- this.loadNum++;
-
- expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
-
- expedientes = expedientes.filter((item) => {
- return item.activityInstanceName != 'Retificar Expediente'
- });
-
- expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
-
- this.expedientegbstore.reset(expedientes);
-
-
- let despachos = await this.despachoRule.getList({ updateStore: true })
- if (despachos) {
- this.despachoStore.reset(despachos)
- }
-
- let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
- let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
-
- let allParecer = pareceres.concat(pareceresPr);
-
- this.pedidosstore.countparecer = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
-
- this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
- return this.customTaskPipe.transform(element)
- }));
-
- let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
- this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length
- this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
- return this.customTaskPipe.transform(element)
- }));
-
-
- let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
- this.pendentesstore.count = Object.keys(pendentes).length;
-
- pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
-
- this.pendentesstore.reset(pendentes);
-
- let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
-
- if(SessionStore.user.Profile != 'PR') {
-
- let depacho: any = 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))
-
- this.despachoprstore.reset(depacho)
-
- } else if(SessionStore.user.Profile == 'PR') {
-
- let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
- depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
- this.despachoprstore.reset(depacho)
-
- }
-
- let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
-
- 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 this.customTaskPipe.transform(element)
- }))
-
-
- let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
- diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
- this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
-
- let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
- diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element))
- this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
-
- for(let calendar of this.eventService.calendarNamesAry) {
- if(calendar == 'Meu calendario') {
- // color
- let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise();
- let eventsList
- try {
- eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
- } catch (error) {
- eventsList = [];
- }
-
- this.eventoaprovacaostore.save(calendar, eventsList)
-
- } else {
- let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise()
- let eventsList
- try {
- eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
- } catch(error) {
- eventsList = []
- }
-
- this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList)
- }
- }
- // let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
- // let eventsMDGPRList = mdEventsOficial
-
- // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
-
- // this.eventoaprovacaostore.countMd = eventsMDGPRList.length
- // this.eventoaprovacaostore.resetmd(eventsMDGPRList);
- // this.updateAllProcess()
-
- // let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
- // let eventsPRList = prEventsOficial
- // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
-
- // this.eventoaprovacaostore.countPr = eventsPRList.length
- // this.eventoaprovacaostore.resetpr(eventsPRList);
-
-
- this.loadCount = true
+ await this.TaskService.LoadTask()
}
doRefresh(event) {
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index db0e31a12..76677bef6 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { momentG } from 'src/plugin/momentG';
-
+import { ProcessesService } from 'src/app/services/processes.service';
import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
import { DeplomasStore } from 'src/app/store/deplomas.service';
import { PendentesStore } from 'src/app/store/pendestes-store.service';
@@ -9,6 +9,12 @@ import { TotalDocumentStore } from 'src/app/store/total-document.service';
import { DespachosprStore } from 'src/app/store/despachospr-store.service';
import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
import { PedidosStore } from 'src/app/store/pedidos-store.service';
+import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
+import { DespachoService } from 'src/app/Rules/despacho.service';
+import { CustomTaskPipe } from '../pipes/custom-task.pipe';
+import { SessionStore } from 'src/app/store/session.service';
+import { EventsService } from './events.service';
+import { SortService } from './functions/sort.service';
@Injectable({
providedIn: 'root'
@@ -30,10 +36,30 @@ export class TaskService {
despachoprstore = DespachosprStore;
totalDocumentStore = TotalDocumentStore
deplomasStore = DeplomasStore
+
+ SessionStore = SessionStore
AllProcess = []
+ showLoader: boolean = false
+ loadCount = false
+ loadNum = 0
- constructor() { }
+ expedienteTaskPipe = new ExpedienteTaskPipe();
+ customTaskPipe = new CustomTaskPipe()
+
+ constructor(
+ private processesbackend: ProcessesService,
+ private despachoRule: DespachoService,
+ public eventService: EventsService,
+ private sortService: SortService,
+ ) {
+
+ window['all-process-gabinete'] = () => {
+ this.updateCount()
+ this.updateAllProcess()
+ }
+
+ }
deadlineIsToday(isoDateString:string) {
@@ -88,21 +114,166 @@ export class TaskService {
}
sortArrayISODate(myArray: any): any[] {
- // return myArray.sort(function (a, b) {
- // return (a.CreateDate || a.taskStartDate < b.CreateDate || b.taskStartDate) ? -1 : ((a.CreateDate || a.taskStartDate > b.CreateDate || b.taskStartDate) ? 1 : 0);
- // });
return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate || b.TaskStartDate) - Date.parse(a.CreateDate || a.taskStartDate || a.TaskStartDate))
}
- updateCount() {
- this.updateAllProcess()
+ updateCount = () => {
this.read = this.AllProcess.filter((item) => this.filter(item,'Lidos')).length
this.unread = this.AllProcess.filter((item) => this.filter(item,'Não lidos')).length
this.deadline = this.AllProcess.filter((task) => this.deadlineIsToday(task.Deadline || task.deadline)).length
this.new = this.AllProcess.filter((task) => this.lessThen24Hours(task.TaskStartDate || task.taskStartDate)).length
this.overdueTasks = this.AllProcess.filter((task) => this.overdueTask(task.Deadline || task.deadline)).length
}
+
+
+
+ async LoadTask() {
+
+
+ let expedientes;
+ this.showLoader = true
+
+ try {
+ expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise()
+ this.loadCount = true;
+ this.showLoader = false;
+ } catch(error) {
+ this.showLoader = false
+ this.loadCount = true;
+ }
+
+ this.loadNum++;
+
+ expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active")
+
+ expedientes = expedientes.filter((item) => {
+ return item.activityInstanceName != 'Retificar Expediente'
+ });
+
+ expedientes = expedientes.map((element) => this.expedienteTaskPipe.transform(element));
+
+ this.expedientegbstore.reset(expedientes);
+
+
+ let despachos = await this.despachoRule.getList({ updateStore: true })
+ if (despachos) {
+ this.despachoStore.reset(despachos)
+ }
+
+ let pareceres = await this.processesbackend.GetTasksList("Pedido de Parecer", false).toPromise();
+ let pareceresPr = await this.processesbackend.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
+
+ let allParecer = pareceres.concat(pareceresPr);
+
+ this.pedidosstore.countparecer = Object.keys(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active")).length;
+
+ this.pedidosstore.resetparecer(allParecer.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+ return this.customTaskPipe.transform(element)
+ }));
+
+ let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise();
+ this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length
+ this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => {
+ return this.customTaskPipe.transform(element)
+ }));
+
+
+ let pendentes = await this.processesbackend.GetPendingTasks(false).toPromise();
+ this.pendentesstore.count = Object.keys(pendentes).length;
+
+ pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element))
+
+ this.pendentesstore.reset(pendentes);
+
+ let depachoAPI = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise();
+
+
+ if(SessionStore.user.Profile != 'PR') {
+
+ let depacho: any = 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))
+
+ this.despachoprstore.reset(depacho)
+
+ } else if(SessionStore.user.Profile == 'PR') {
+
+ let depacho: any = depachoAPI.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
+ depacho = depacho.map((e)=> this.customTaskPipe.transform(e))
+ this.despachoprstore.reset(depacho)
+
+ }
+
+ let diplomasValidar = depachoAPI.filter(data => data.activityInstanceName == "Revisar Diploma");
+
+ 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 this.customTaskPipe.transform(element)
+ }))
+
+
+ let diplomasAssinar: any = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma");
+ diplomasAssinar = diplomasAssinar.map((element) => this.expedienteTaskPipe.transform(element))
+ this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar)
+
+ let diplomasAssinados: any = depachoAPI.filter(data => data.activityInstanceName == "Diploma Assinado");
+ diplomasAssinados = diplomasAssinados.map((element) => this.expedienteTaskPipe.transform(element))
+ this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados)
+
+ for(let calendar of this.eventService.calendarNamesAry) {
+ if(calendar == 'Meu calendario') {
+ // color
+ let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise();
+ let eventsList
+ try {
+ eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
+ } catch (error) {
+ eventsList = [];
+ }
+
+ this.eventoaprovacaostore.save(calendar, eventsList)
+
+ } else {
+ let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise()
+ let eventsList
+ try {
+ eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
+ } catch(error) {
+ eventsList = []
+ }
+
+ this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList)
+ }
+ }
+ // let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+ // let eventsMDGPRList = mdEventsOficial
+
+ // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
+ // this.eventoaprovacaostore.countMd = eventsMDGPRList.length
+ // this.eventoaprovacaostore.resetmd(eventsMDGPRList);
+ // this.updateAllProcess()
+
+ // let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+ // let eventsPRList = prEventsOficial
+ // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+
+ // this.eventoaprovacaostore.countPr = eventsPRList.length
+ // this.eventoaprovacaostore.resetpr(eventsPRList);
+
+
+ this.loadCount = true
+ }
+
}
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 3122b9ec0..fe4582e46 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -1,5 +1,5 @@
-
+
Todas as tarefas
@@ -55,13 +55,13 @@
-
+
-
+
@@ -120,13 +120,13 @@
Lista vazia
-
+
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 ff6ff55d6..8591330ca 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
@@ -34,7 +34,6 @@ export class AllProcessesPage implements OnInit {
totalDocumentStore = TotalDocumentStore
deplomasStore = DeplomasStore
- AllProcess = []
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
constructor(
@@ -43,16 +42,10 @@ export class AllProcessesPage implements OnInit {
public TaskService: TaskService
) {
this.loggeduser = SessionStore.user;
-
- window['all-process'] = () => {
- if(window.location.href.includes('?processes=true')) {
- this.updateAllProcess()
- }
- }
}
ngOnInit() {
- this.updateAllProcess()
+ // this.updateAllProcess()
this.checkFilter();
this.router.events.forEach((event) => {
@@ -95,44 +88,18 @@ export class AllProcessesPage implements OnInit {
}, 2000);
}
setTimeout(() => {
- this.updateAllProcess();
+ // this.updateAllProcess();
}, 1000);
}
refreshing() {
setTimeout(() => {
- this.updateAllProcess();
+ // this.updateAllProcess();
}, 1000);
}
- functionTimer = null
- 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)
- .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()
-
- clearTimeout(this.functionTimer);
- this.functionTimer = setTimeout(() => {
-
- this.TaskService.updateCount()
-
- }, 1000); // time is in milliseconds
- }
-
- get getAllProcessCount() {
- return this.AllProcess.length
- }
-
- sortArrayISODate(myArray: any): any[] {
- // return myArray.sort(function (a, b) {
- // return (a.CreateDate || a.taskStartDate < b.CreateDate || b.taskStartDate) ? -1 : ((a.CreateDate || a.taskStartDate > b.CreateDate || b.taskStartDate) ? 1 : 0);
- // });
-
- return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate || b.TaskStartDate) - Date.parse(a.CreateDate || a.taskStartDate || a.TaskStartDate))
- }
setFormatDate(start: any, end: any, allday: boolean) {
let customDate;
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index b67f6f321..b8956e7b0 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -18,6 +18,9 @@ export class EventoaprovacaoStoreService {
private _counts : {[key: string]: number} = {}
private _countsAll = 0
+
+ newList = []
+
constructor() {
this.keyNameAll = (SHA1("EventoaprovacaoStoreService"+"all")).toString()
@@ -96,9 +99,25 @@ export class EventoaprovacaoStoreService {
this._countsAll = allList.length
this._concatList = allList
+
+
+ this.newList = this._concatList.filter((e) =>{
+ return this.lessthen24Hours(e.TaskStartDate || e.taskStartDate)
+ })
}
+ 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()
+ }
+
+
+
}
export const EventoAprovacaoStore = new EventoaprovacaoStoreService()
diff --git a/version/git-version.ts b/version/git-version.ts
index f042cf119..73a7f2d5d 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "f8f5a0074",
- "SHA": "f8f5a0074f42904edc428799667ae44fe8517be8",
+ "shortSHA": "9c835cde2",
+ "SHA": "9c835cde286868d69e7585bb06516f10519455fe",
"branch": "feature/gabineteLabels",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Mon Apr 17 14:57:08 2023 +0100'",
- "lastCommitMessage": "improve links",
- "lastCommitNumber": "4910",
+ "lastCommitTime": "'Mon Apr 17 15:13:44 2023 +0100'",
+ "lastCommitMessage": "remove button form mobile",
+ "lastCommitNumber": "4911",
"change": "",
- "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html",
+ "changeStatus": "On branch feature/gabineteLabels\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.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.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/store/eventoaprovacao-store.service.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file