diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index bd69174d2..8baba1ccd 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -19,7 +19,7 @@
       <!-- <ion-segment-button value="MDGPR">
         Minha agenda
       </ion-segment-button> -->
-      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'MDGPR' : i.OwnerUserId">
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
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 3c657c8fc..84b5acbd5 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
@@ -58,7 +58,13 @@ export class EventListPage implements OnInit {
 
   ngOnInit() {
 
-    this.segment = 'MDGPR';
+    if(!this.segment) {
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.segment = 'Meu calendario';
+      } else {
+        this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+      }
+    }
 
     const location = window.location
     const pathname = location.pathname + location.search
@@ -157,7 +163,7 @@ export class EventListPage implements OnInit {
 
     const segment = this.segment
 
-    if(this.segment == 'MDGPR') {
+    if(this.segment == 'Meu calendario') {
       // color
       if(SessionStore.user.Profile == 'PR') {
         this.color = 'pr'
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 07549dd5a..b7855c40d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -33,6 +33,7 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { SessionStore } from 'src/app/store/session.service';
 import { NotificationsService } from 'src/app/services/notifications.service'
 import { environment } from 'src/environments/environment';
+import { EventsService } from 'src/app/services/events.service';
 @Component({
   selector: 'app-gabinete-digital',
   templateUrl: './gabinete-digital.page.html',
@@ -126,7 +127,8 @@ export class GabineteDigitalPage implements OnInit {
     private sortService: SortService,
     private storage: Storage,
     public p: PermissionService,
-    public  NotificationsService: NotificationsService
+    public  NotificationsService: NotificationsService,
+    public eventService: EventsService,
   ) {
 
     // this.workerList = new Worker(new URL('./list.worker.js', import.meta.url));
@@ -732,6 +734,33 @@ export class GabineteDigitalPage implements OnInit {
       this.updateAllProcess()
     }
 
+    
+    for(let calendar of this.eventService.calendarNamesAry) {
+      if(calendar == 'Meu calendario') {
+        // color
+        let genericEvents = await this.processesbackend.GetTasksList('Agendar Evento', false).toPromise();
+        let eventsList
+        try {
+          eventsList = this.sortService.sortArrayByDate(genericEvents).reverse();
+        } catch (error) {
+          eventsList = [];
+        }
+  
+        this.eventoaprovacaostore.save(calendar, eventsList)
+        
+      } else {
+  
+        let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId).toPromise()
+        let eventsList
+        try {
+          eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
+        } catch(error) {
+          eventsList = []
+        }
+        
+        this.eventoaprovacaostore.save(calendar, eventsList)
+      }
+    }
     // let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
     // let eventsMDGPRList = mdEventsOficial
     
@@ -739,7 +768,7 @@ export class GabineteDigitalPage implements OnInit {
 
     // this.eventoaprovacaostore.countMd = eventsMDGPRList.length
     // this.eventoaprovacaostore.resetmd(eventsMDGPRList);
-    this.updateAllProcess()
+    // this.updateAllProcess()
 
     // let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
     // let eventsPRList = prEventsOficial
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 3c80ee4ac..a22c403a3 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -266,8 +266,6 @@ export class EventsService {
                 "OwnerUserId": sharedCalendar.OwnerUserId,
                 "RoleId": sharedCalendar.CalendarRoleId
               }
-
-              console.log('objectShared', objectShared)
               
               this.calendarNamesAry.push(objectShared)
               
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index 59b537378..85be20189 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -10,7 +10,7 @@
     </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'MDGPR' : i.OwnerUserId ">
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 4ef5b9f48..8b0fe8d68 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -49,11 +49,13 @@ export class EventListPage implements OnInit {
 
   ngOnInit() {
 
-    this.segment = this.loggeduser.Profile;
-    if(this.segment != "PR" && this.segment != "MDGPR")  {
-      this.segment = "Unknown";
+    if(!this.segment) {
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.segment = 'Meu calendario';
+      } else {
+        this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+      }
     }
-
     const pathname = window.location.pathname
 
     this.router.events.forEach((event) => {
@@ -83,7 +85,7 @@ export class EventListPage implements OnInit {
 
     const segment = this.segment
 
-    if(this.segment == 'MDGPR') {
+    if(this.segment == 'Meu calendario') {
       // color
       if(SessionStore.user.Profile == 'PR') {
         this.color = 'pr'
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index c67296ad0..f4fa0777e 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -13,7 +13,7 @@
           Minha agenda
         </ion-segment-button> -->
 
-        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'MDGPR' : i.OwnerUserId">
+        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId">
           <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> Agenda do PR {{ i.OwnerUserIds }}</div>
           <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> Agenda do MD </div>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index f07aed64f..1aec8d2c0 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -27,7 +27,6 @@ export class EventsToApprovePage implements OnInit {
   eventBody: EventBody;
   categories: string[];
   serialnumber:string;
-  loggeduser: LoginUserRespose;
   segment:string;
   eventaprovacaostore = EventoAprovacaoStore;
 
@@ -44,12 +43,17 @@ export class EventsToApprovePage implements OnInit {
     private storage: Storage,
     public eventService: EventsService,
     )
-    {
-      this.loggeduser = SessionStore.user;
-    }
+    {}
 
   ngOnInit() {
-    this.segment = this.loggeduser.Profile;
+    if(!this.segment) {
+      if(this.eventService.calendarNamesAry.includes('Meu calendario')) {
+        this.segment = 'Meu calendario';
+      } else {
+        this.segment = this.eventService.calendarNamesAry[0].OwnerUserId
+      }
+    }
+
     this.LoadToApproveEvents();
 
     this.router.events.forEach((event) => {
@@ -73,9 +77,8 @@ export class EventsToApprovePage implements OnInit {
   async LoadToApproveEvents() {
     this.showLoader = true;
     const segment = this.segment
-    console.log(this.eventService.calendarNamesAry)
 
-    if(this.segment == 'MDGPR') {
+    if(this.segment == 'Meu calendario') {
       // color
       if(SessionStore.user.Profile == 'PR') {
         this.color = 'pr'
@@ -98,12 +101,9 @@ export class EventsToApprovePage implements OnInit {
     } else {
 
 
-
       this.color = 'pr'
 
       let allEvents = await this.processes.eventsToApprove(segment).toPromise()
-
-      console.log('allEvents', allEvents)
       try {
         this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
       } catch(error) {
diff --git a/version/git-version.ts b/version/git-version.ts
index 2e18ea10d..d207ba8ea 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "623df60ae",
-  "SHA": "623df60aeb62c6830a82deda35294a2fc72907a2",
+  "shortSHA": "2e1e6be4c",
+  "SHA": "2e1e6be4c9fd6c7dc220b6d49210d2989ff36439",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Wed Feb 22 13:06:31 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4817",
+  "lastCommitTime": "'Wed Feb 22 13:08:14 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4819",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file