diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 80df426b9..51e875035 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -18,7 +18,7 @@ {{totalExpediente}} - Gabinete Digital + Gabinete @@ -27,7 +27,7 @@ Pesquisa - --> + Chat diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 5299c00df..3e910933d 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -24,13 +24,13 @@ export class HomePage implements OnInit { //Initialize profile as mdgpr this.profile = "mdgpr"; if(this.profile == "mdgpr"){ - this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; this.totalEvent = this.eventsList.length; }); } else{ - this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { + this.eventService.getAllPrEvents(formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; this.totalEvent = this.eventsList.length; }); diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 095126a7f..1675d3bfa 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -79,7 +79,7 @@ export class LoginPage implements OnInit { } if (await this.authService.login(this.userattempt)){ this.loginRocketChat(); - this.router.navigate(['/home/events']);this.presentAlert('1'); + this.router.navigate(['/home/events']); } else {