diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 93f81070a..6cefd8036 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -264,10 +264,10 @@
 
                       <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 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-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.middle" class="time-start"> Todo </div>
@@ -306,12 +306,13 @@
                     <div  class="d-flex content-mdgpr-{{event.event.CalendarName}} mt-10 cursor-pointer item-hover" (click)="eventClicked(event)"
                     >
 
+                    <!-- Shared -->
                       <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.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-end labelb">Fim</div>
-                        <div *ngIf="event.startMany && !event.middle" class="time-end">{{event.event.EndDate | date: 'HH:mm'}}</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.middle" class="time-start"> Todo </div>
                         <div *ngIf="event.middle" class="time-end text-center"> o dia </div>
@@ -350,11 +351,11 @@
                     <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.startMany && !event.middle" class="time-start">{{event.event.StartDate | date: 'HH:mm'}}</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" class="time-end labelb">Fim4</div>
+                        <div *ngIf="!event.endMany && !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-end text-center"> o dia </div>
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/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/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,
 };