diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 3711f99b2..c03231f1a 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -31,25 +31,25 @@

Tarefas que terminam hoje

- 0 + {{ TaskService.deadline }}

Tarefas em atraso

- 0 + {{ TaskService.overdueTasks }}

Novas tarefas

- 0 + {{ TaskService.new }}

Tarefas não lidas

- 0 + {{ TaskService.unread }}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 9d64138a6..bf01141bc 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -17,6 +17,7 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; import { ChangeProfileService } from 'src/app/services/change-profile.service'; import { SessionStore } from 'src/app/store/session.service'; +import { TaskService } from 'src/app/services/task.service' @Component({ selector: 'app-events', templateUrl: './events.page.html', @@ -79,7 +80,10 @@ export class EventsPage implements OnInit { private storage: Storage, public p: PermissionService, private changeProfileService: ChangeProfileService, + public TaskService: TaskService ) { + + this.TaskService.updateCount() window['zipPhoneCallback'] = function (zipphone) { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 3f726d2dd..bec80da66 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -23,10 +23,16 @@ Lidos - + Não lidos + + + + Em atraso + + Todos diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 73f651114..ff81c7687 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -18,10 +18,16 @@ Lidos - + Não lidos + + + + Em atraso + + Todos diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index fd6bf294e..5c870660c 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -30,6 +30,12 @@ Não lidos + + + + Em atraso + + Todos diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index b05e4ba94..70a36d253 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -26,14 +26,20 @@ Lidos - + Não lidos + + + Em atraso + + Todos + -
+
@@ -26,60 +26,99 @@ + +
+ + + + + Para hoje + + + + Novos + + + + Lidos + + + + Não lidos + + + + Em atraso + + + + Todos + + + + + +
+ +
-
-
-
- - {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}} +
+
+
+
+ + {{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}} + Para hoje + Nova +
+
+ + + + +
-
- - - - +
+
+ {{task.Senders }} + {{ task.workflowInstanceDataFields.Sender }} +
-
-
-
- {{task.Senders }} - {{ task.workflowInstanceDataFields.Sender }} +
+
+ {{task.customDate}} +
-
-
-
- {{task.customDate}} +
+
+ + + Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular + + + A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} + +
-
-
-
- - - Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Titular - - - A sua agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} - -
-
-
-
- {{task.activityInstanceName}} -
-
- {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }} +
+
+ {{task.activityInstanceName}} +
+
+ {{ task.CreateDate || task.taskStartDate || task.TaskStartDate | date: 'dd-MM-yyyy HH:mm' }} +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 89649b9fb..0d10932f8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -35,6 +35,8 @@ import { NotificationsService } from 'src/app/services/notifications.service' import { environment } from 'src/environments/environment'; import { EventsService } from 'src/app/services/events.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; +import { TaskService } from 'src/app/services/task.service' + @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -115,6 +117,9 @@ export class GabineteDigitalPage implements OnInit { @ViewChild(PendentesPage) pendentesListPage: PendentesPage; @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; + + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + constructor( private processesbackend: ProcessesService, private modalController: ModalController, @@ -130,7 +135,8 @@ export class GabineteDigitalPage implements OnInit { public p: PermissionService, public NotificationsService: NotificationsService, public eventService: EventsService, - private httpErroHandle: HttpErrorHandle + private httpErroHandle: HttpErrorHandle, + public TaskService: TaskService ) { // this.workerList = new Worker(new URL('./list.worker.js', import.meta.url)); @@ -502,6 +508,9 @@ export class GabineteDigitalPage implements OnInit { this.showDiplomasGerar = false } + + 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) @@ -520,9 +529,19 @@ export class GabineteDigitalPage implements OnInit { // .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) // } - if(window['all-process']) { - window['all-process']() - } + + + clearTimeout(this.functionTimer); + this.functionTimer = setTimeout(() => { + + if(window['all-process']) { + window['all-process']() + } else { + this.TaskService.updateCount() + } + }, 1000); // time is in milliseconds + + } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 63e7a666d..4a60bdb45 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -22,14 +22,20 @@ Lidos - + Não lidos + + Em atraso + + + Todos +
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 83115d5cb..2a8f96be5 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 @@ -18,7 +18,7 @@ Lidos - + Não lidos @@ -26,6 +26,10 @@ Todos + + Em atraso + +