diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index ed8768d54..71d5a6b1b 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -59,7 +59,7 @@ const routes: Routes = [ loadChildren: ()=> import('../pages/gabinete-digital/gabinete-digital.module').then(m => m.GabineteDigitalPageModule) }, { - path:':expedienteId', + path:'expediente', children: [ { path:'', diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a859dbcb0..98ea78d95 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -17,6 +17,7 @@ + { this.eventsList = response; + this.showLoader = false; } ); break; @@ -78,6 +79,7 @@ export class EventsPage implements OnInit { this.eventService.getEvents(this.segment, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59') .subscribe(response => { this.personaleventsList = response; + this.showLoader = false; } ); break; @@ -85,11 +87,11 @@ export class EventsPage implements OnInit { this.eventService.getEvents(this.segment, formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59') .subscribe(response => { this.officialeventsList = response; + this.showLoader = false; } ); break; } - this.showLoader = false; } showGreeting(){ diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 7af5442da..f476398ab 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -33,7 +33,7 @@
- +

{{ task.Folio }}

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 0856d4d9a..e640caa95 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -17,15 +17,15 @@ Expediente - + CorrespondĂȘncia {{ count_exp_dailywork }} - + Pedidos de parecer {{count_exp_pp}} - + Pedidos de deferimento {{count_exp_pd}} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index bdd7beea3..e627dee0e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -46,4 +46,9 @@ export class GabineteDigitalPage implements OnInit { }, 2000); } + load() + { + + } + }