diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index fa6eac731..5299c00df 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -31,13 +31,9 @@ export class HomePage implements OnInit { } 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.prEventList = res; - 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.mdEventList = res; - this.eventsList = this.prEventList.concat(this.mdEventList); - this.totalEvent = this.eventsList.length; - }); - }); + this.eventsList = res; + this.totalEvent = this.eventsList.length; + }); } this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{ diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 0e327f643..ae6289220 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -3,13 +3,13 @@ - + Agenda diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index af7875679..b335c523f 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -61,7 +61,7 @@ export class AgendaPage implements OnInit { ) {} ngOnInit() { - this.profile = "pr"; + this.profile = "mdgpr"; //Inicializar segment /* localStorage.setItem('test', this.eventSelectedDate.toString()); */ diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index ce4cb7a2f..48553187f 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -10,13 +10,13 @@ - + @@ -24,7 +24,7 @@

{{greetting}} Excelência
- + Ministro Director do Gabinete do Presidente da República

@@ -97,7 +97,7 @@ -
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 41e3280cd..70921673c 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -63,7 +63,7 @@ export class EventsPage implements OnInit { //Inicializar segment this.segment = "Combinada"; //Initialize profile as mdgpr - this.profile = "pr"; + this.profile = "mdgpr"; console.log(this.profile); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 99bebad50..45c5a4610 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -10,7 +10,7 @@ - Agenda do Presidente {{count_ev_pr}} - --> - + Expediente para o PR @@ -70,10 +70,10 @@ Diplomas - + Assinados pelo PR {{count_dip_apr}} diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b533fc683..4b92544cb 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -7,7 +7,7 @@ export const environment = { apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', apiChatUrl: 'http://192.168.100.111:3000/api/v1/', domain: 'gabinetedigital.local', - defaultuser: 'tiago.kayaya', + defaultuser: 'paulo.pinto', defaultuserpwd: 'tabteste@006' };