diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 93f81070a..5cb8bd0b2 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -264,11 +264,11 @@
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
 
-                        <div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início</div>
-                        <div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
-                        <div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end"> {{event.event.EndDate | date: 'HH:mm'}} </div>
 
                         <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
@@ -307,11 +307,11 @@
                     >
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
-                        <div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início</div>
-                        <div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
-                        <div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
 
                         <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
@@ -336,6 +336,7 @@
               </div>
             </div>
             
+            <!-- shared desktop -->
             <div  class="sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto" *ngIf="SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' " >
               <div *ngFor="let events of TimelinePRList | keyvalue;">
 
@@ -350,13 +351,13 @@
                     <div class="d-flex content-pr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)">
 
                       <div class="schedule-time" *ngIf="!event.event.IsAllDayEvent">
-                        <div *ngIf="!event.endMany && !event.middle" class="time-start labelb">Início</div>
-                        <div *ngIf="event.endMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="event.startMany && !event.middle" class="time-start labelb">Início</div>
+                        <div *ngIf="event.endMany && !event.middle " class="time-end labelb">Fim</div>
 
-                        <div *ngIf="!event.startMany && !event.middle" class="time-end labelb">Fim</div>
-                        <div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
+                        <div *ngIf="!(event.endMany && !event.middle) && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</div>
+                        <div *ngIf="!(event.startMany && !event.middle) && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}} </div>
 
-                        <div *ngIf="event.middle" class="time-start"> Todo {{ event.startMany }}   </div>
+                        <div *ngIf="event.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
 
                       </div>
diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/pages/agenda/agenda.page.scss
index 970c808a1..b7f934b9e 100644
--- a/src/app/pages/agenda/agenda.page.scss
+++ b/src/app/pages/agenda/agenda.page.scss
@@ -486,12 +486,12 @@ td.monthview-primary-with-event {
     margin-right: 10px;
     min-width: 33px;
     .time-start{
-      color: #797979 ;
+      color: #797979 !important;
       font-family: Roboto;
       font-size: 13px;
     }
     .time-end{
-      color: #797979 ;
+      color: #797979 !important;
       font-family: Roboto;
       font-size: 13px;
     }
@@ -916,7 +916,7 @@ $font-size: 11pt;
 }
 
 
+
 .labelb {
   font-weight: 500;
-    color: red !important;
 }
\ No newline at end of file
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index ce4e85057..4e2c33a10 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -794,11 +794,12 @@ export class AgendaPage implements OnInit {
             // loop
             this.CalendarStore.pushEvent(eventsList, 'md');
   
-            this.listToPresent = this.CalendarStore.eventSource
+            this.listToPresent = this.CalendarStore.eventSource           
   
             this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-            
-            // console.log('this.TimelineMDList', this.TimelineMDList);
+            console.log(this.CalendarStore.eventSource)
+            console.log('this.TimelineMDList', this.TimelineMDList)
+
 
             this.myCal.update();
             this.myCal.loadEvents();
@@ -841,10 +842,12 @@ export class AgendaPage implements OnInit {
   
             this.CalendarStore.pushEvent(eventsList, 'pr');
             this.listToPresent = this.CalendarStore.eventSource
+
+            
   
   
             this.TimelinePRList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })
-  
+            console.log('this.TimelinePRList', this.TimelinePRList)
             // 
   
             this.myCal.update();
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 8f5bc6aca..fe411fa7d 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -171,7 +171,7 @@
       </div>
     </div>
 
-    <div class="container-div width-100">
+    <!-- <div class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -192,7 +192,7 @@
 
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts
index a231701ee..5901c40a0 100644
--- a/src/app/pages/agenda/view-event/view-event.page.ts
+++ b/src/app/pages/agenda/view-event/view-event.page.ts
@@ -186,7 +186,12 @@ export class ViewEventPage implements OnInit {
     
     if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
+
+        const div = document.createElement("div")
+        div.innerHTML = res.Body.Text
+        res.Body.Text = div.innerText
         this.loadedEvent = res;
+
         this.addEventToDb(res);
         
         loader.remove()
@@ -208,7 +213,12 @@ export class ViewEventPage implements OnInit {
       
       if(this.CalendarId) {
         this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
+          
+          const div = document.createElement("div")
+          div.innerHTML = res.Body.Text
+          res.Body.Text = div.innerText
           this.loadedEvent = res;
+          
           this.addEventToDb(res);
           
           loader.remove()
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 851b07e8c..89ad200d5 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
@@ -17,7 +17,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Calendário MDGPR
+        Meu Calendário
       </ion-segment-button>
       <ion-segment-button value="PR">
         Calendário Partilhado
diff --git a/src/app/services/agenda/list-box.service.ts b/src/app/services/agenda/list-box.service.ts
index 981ab189e..888e41efc 100644
--- a/src/app/services/agenda/list-box.service.ts
+++ b/src/app/services/agenda/list-box.service.ts
@@ -144,9 +144,11 @@ export class ListBoxService {
 
 					if(this.CanPush(event, selectedDate)) days[day].push(event)
 				}
+			} else {
+				if(this.CanPush(event, selectedDate) && diffDays != 2) days[day].push(event)
 			}
 
-			// if(this.CanPush(event, selectedDate) && diffDays != 2) days[day].push(event)
+			// 
 
 		})
 
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 4d476adf6..2b603aae9 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -11,7 +11,7 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="MDGPR">
-        Agenda de {{loggeduser.FullName}}
+        Meu Calendário
       </ion-segment-button>
       <ion-segment-button value="PR">
         Calendário Partilhado
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 9bbde70e1..34b8207b2 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -176,7 +176,7 @@
     </div>
 
 
-    <div class="container-div width-100">
+    <!-- <div class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
         <div class="ion-icon-class">
           <ion-icon slot="start" src="assets/images/icons-refresh.svg"></ion-icon>
@@ -197,7 +197,7 @@
 
         </div>
       </div>
-    </div>
+    </div> -->
 
     <div *ngIf="postEvent.EventRecurrence.Type != '-1'" class="container-div width-100">
       <div class="ion-item-class-2 d-flex">
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index 9924731d8..c85cb5e77 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -384,7 +384,10 @@ export class NewEventPage implements OnInit {
     this.clearContact.emit();
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
+    // chat exit
     this.backToChat.emit({roomId:this.roomId})
+    // agenda exit
+    this.cloneAllmobileComponent.emit({})
   }
 
   getRecurrenceTypes() {
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts
index ee0f241f1..d01f444dd 100644
--- a/src/app/shared/agenda/view-event/view-event.page.ts
+++ b/src/app/shared/agenda/view-event/view-event.page.ts
@@ -105,8 +105,11 @@ export class ViewEventPage implements OnInit {
     if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') {
       this.eventsService.getEvent(this.eventId).subscribe(res => {
         
+        const div = document.createElement("div")
+        div.innerHTML = res.Body.Text
+        res.Body.Text = div.innerText
         this.loadedEvent = res;
-        // console.log(this.loadedEvent);
+
         this.today = new Date(res.StartDate);
         this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
       }, (error)=> {
@@ -124,13 +127,15 @@ export class ViewEventPage implements OnInit {
       });
     } else {
 
-      
-
-
       if(this.CalendarId) {
         
         this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
+
+          const div = document.createElement("div")
+          div.innerHTML = res.Body.Text
+          res.Body.Text = div.innerText
           this.loadedEvent = res;
+
           this.today = new Date(res.StartDate);
           this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
         }, (error)=> {
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 ba2640b6f..045fab5a4 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
@@ -10,7 +10,7 @@
     <ion-toolbar>
       <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
         <ion-segment-button value="MDGPR">
-          Agenda de {{loggeduser.FullName}}
+          Meu Calendário
         </ion-segment-button>
         <ion-segment-button value="PR">
           Calendário Partilhado
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0bfa1d818..f7c24870d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,8 +11,8 @@ export const environment = {
   // apiChatUrl: 'https://www.tabularium.pt/api/v1/',
   production: true,
   domain: 'gabinetedigital.local',
-  defaultuser: 'paulo.pinto@gabinetedigital.local',//paulo.pinto paulo.pinto@gabinetedigital.local
-  defaultuserpwd: 'tabteste@006', //tabteste@006,
+  defaultuser: 'eqformacao@oapr.gov.ao',//paulo.pinto paulo.pinto@gabinetedigital.local
+  defaultuserpwd: 'M@p2022', //tabteste@006,
   chatOffline: true,
   presidencia: false,
 };