diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index c03231f1a..1fdca5045 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -28,25 +28,25 @@

{{customDate}}

-
+

Tarefas que terminam hoje

{{ TaskService.deadline }}
-
+

Tarefas em atraso

{{ TaskService.overdueTasks }}
-
+

Novas tarefas

{{ TaskService.new }}
-
+

Tarefas não lidas

{{ TaskService.unread }} diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index bf01141bc..0d8930fc3 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -436,6 +436,16 @@ export class EventsPage implements OnInit { this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras); } + goToAllTaskFilter(event: any) { + let navigationExtras: NavigationExtras = { queryParams: { + filter: event, + processes: true + } } + + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + goToExpediente(SerialNumber: any) { this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); } 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 80b8fc981..43e3bc271 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 @@ -28,7 +28,7 @@ export class DiplomasAssinarPage implements OnInit { customTaskPipe = new CustomTaskPipe() skeletonLoader = true deplomasStore = DeplomasStore - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html index b47ea02af..3c4f1db21 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html @@ -132,7 +132,7 @@
- {{ task.Folio }} + {{ task.Folio }}
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 150f400c4..29134be44 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 @@ -29,7 +29,7 @@ export class DiplomasGerarPage implements OnInit { skeletonLoader = true deplomasStore = DeplomasStore - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processes:ProcessesService, diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index ff81c7687..b684228ad 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -110,7 +110,7 @@
- {{ task.Folio }} + {{ task.Folio }}
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 11c458b74..c816b34d0 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -30,7 +30,7 @@ export class DiplomasPage implements OnInit, OnDestroy { skeletonLoader = true deplomasStore = DeplomasStore customTaskPipe = new CustomTaskPipe() - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processes: ProcessesService, diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index e2d208690..f4f2166d6 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -42,7 +42,7 @@ export class EventListPage implements OnInit { eventsList: any = [] color: 'pr' | 'mdgpr' environment = environment - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' showFilter = false constructor( diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 43f5ed4b4..d7d284f4c 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -36,7 +36,7 @@ export class ExpedientePage implements OnInit { listToPresent= [] - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processes: ProcessesService, private router: Router, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 009b59e2a..cb0030854 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -34,7 +34,7 @@ export class ExpedientesPrPage implements OnInit { skeletonLoader = true expedienteGdStore = ExpedienteGdStore; expedienteTaskPipe = new ExpedienteTaskPipe() - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processes:ProcessesService, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0d10932f8..f189b97b9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -118,7 +118,7 @@ export class GabineteDigitalPage implements OnInit { @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage; - filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'Todos' = 'Todos' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos' constructor( private processesbackend: ProcessesService, @@ -180,6 +180,7 @@ export class GabineteDigitalPage implements OnInit { this.LoadCounts(); this.updateAllProcess() + this.checkFilter(); const pathname = window.location.pathname this.router.events.forEach((event) => { @@ -190,9 +191,11 @@ export class GabineteDigitalPage implements OnInit { if(this.NotificationsService.active === false) { this.checkRoutes(); this.LoadCounts(); + this.checkFilter() } else { this.checkRoutes(); this.LoadCounts(); + this.checkFilter() } } }) @@ -293,6 +296,28 @@ export class GabineteDigitalPage implements OnInit { } + + checkFilter() { + const params: any = new Proxy(new URLSearchParams(window.location.search), { + get: (searchParams: any, prop: any) => searchParams.get(prop), + }); + + const filter = params.filter + + if(filter == 'ForToDay') { + this.filterName = 'Para hoje' + } else if (filter == 'OverdueTasks') { + this.filterName = 'OverdueTasks' + } else if (filter == 'New') { + this.filterName = 'Novos' + } else if (filter == 'unread') { + this.filterName = 'Não lidos' + } else { + console.log('filter', filter) + } + + } + async loadAllProcesses() { this.LoadCounts(); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 4a60bdb45..f905d63af 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -35,7 +35,7 @@ Todos - +