save

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 =>{

src/app/pages/agenda/agenda.page.html

@@ -3,13 +3,13 @@
   <ion-toolbar>
     <ion-buttons slot="end">
       <!-- customized TOGGLE button -->
-      <!-- <div class="toggleBox">
+      <div class="toggleBox">
         <div (click)="changeProfile()" class="toggle">
           <input type="checkbox">
           <label for="" class="onbtn">PR</label>
           <label for="" class="ofbtn">MDGPR</label>
         </div> 
-      </div> -->
+      </div>
     </ion-buttons>
     <ion-title>Agenda</ion-title>
   </ion-toolbar>

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()); */
 

src/app/pages/events/events.page.html

@@ -10,13 +10,13 @@
       </ion-label>
     </ion-item>
   <ion-buttons slot="end">
-<!-- <div class="toggleBox">
+<div class="toggleBox">
   <div (click)="changeProfile()" class="toggle">
     <input type="checkbox">
     <label for="" class="onbtn">PR</label>
     <label for="" class="ofbtn">MDGPR</label>
   </div> 
-</div> -->
+</div>
 </ion-buttons>
 </ion-toolbar>
   <ion-toolbar>
@@ -24,7 +24,7 @@
       <ion-item class="ion-text-right" lines="none">
         <ion-label class="ion-text-wrap">
             <h3 class="header-medium"> {{greetting}} Excelência <br />
-              <!-- Ministro Director do Gabinete do --><!-- <br /> -->
+              Ministro Director do Gabinete do<!-- <br /> -->
               Presidente da República
             </h3>
           
@@ -97,7 +97,7 @@
     <ion-list *ngSwitchCase="'Oficial'">
       <ion-item-group>
         <ion-item-sliding>
-          <ion-item lines="none"
+          <ion-item lines="none" 
           *ngFor="let event of officialeventsList"
           [routerLink]="['/home/events', event.EventId, 'events']">
             <div class="div-item-{{event.CalendarName}}">

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);
     
 

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -10,7 +10,7 @@
     <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <!-- <ion-card color="#d4d5ca">
+  <ion-card color="#d4d5ca">
     <ion-card-header>
       <ion-card-title>Eventos para Aprovação</ion-card-title>
       <ion-card-content>
@@ -18,14 +18,14 @@
           <ion-label>Minha agenda</ion-label>
           <ion-button slot="end">{{count_ev_md}}</ion-button>
         </ion-item>
-        <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"> [routerLink]="['/home/gabinete-digital/event-list', 'pr']" 
+        <ion-item (click)="openEventsToApproveList('PR')" class="ion-item-change-color"><!-- [routerLink]="['/home/gabinete-digital/event-list', 'pr']" -->
           <ion-label>Agenda do Presidente</ion-label>
           <ion-button slot="end">{{count_ev_pr}}</ion-button>
         </ion-item>
       </ion-card-content>
     </ion-card-header>
-  </ion-card> -->
-    <!-- <ion-card color="#d4d5ca">
+  </ion-card>
+    <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente</ion-card-title>
     <ion-card-content>
@@ -43,7 +43,7 @@
       </ion-item>
     </ion-card-content>
   </ion-card-header>
-</ion-card> -->
+</ion-card>
 <ion-card color="#d4d5ca">
   <ion-card-header>
     <ion-card-title>Expediente para o PR</ion-card-title>
@@ -70,10 +70,10 @@
   <ion-card-header>
     <ion-card-title>Diplomas</ion-card-title>
     <ion-card-content>
-      <!-- <ion-item primary (click)="notImplemented()" class="ion-activated">
+      <ion-item primary (click)="notImplemented()" class="ion-activated">
         <ion-label>Por validar (MDGPR)</ion-label>
         <ion-button slot="end">{{count_dip_pv}}</ion-button>
-      </ion-item> -->
+      </ion-item>
       <ion-item (click)="notImplemented()" class="ion-item-change-color">
         <ion-label>Assinados pelo PR</ion-label>
         <ion-button slot="end">{{count_dip_apr}}</ion-button>

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'
 };