From dce4afd4da73a32f30ba9d64128971d31ee67216 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <petermaquiran29@gmail.com>
Date: Mon, 1 Feb 2021 12:24:24 +0100
Subject: [PATCH] timeline fix null

---
 src/app/pages/agenda/agenda.page.html | 2 +-
 src/app/pages/agenda/agenda.page.ts   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index b7c49d97e..232d2fe5c 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -178,7 +178,7 @@
       <!-- Calendar currente date -->
       <ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
         <ion-row class="timeline-date">
-          <span *ngIf="timelineIsCurrentDate()">Hoje, </span> {{ timelineDate }}
+          <span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
         </ion-row>
     <!--     <ion-row class="filter ion-align-items-center">
           <div class="filter-name">Todos</div>
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index a7db85b50..e618bbf2d 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -230,7 +230,6 @@ export class AgendaPage implements OnInit {
    /*  this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */
   }
 
-  
   onCurrentChanged = (ev: Date) => {
     // timeline change date
     this.timelineDate = formatDate(ev,'dd MMMM yyyy', 'pt');
@@ -294,14 +293,14 @@ export class AgendaPage implements OnInit {
     });
   }
 
-  timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string): string{
+  timeLineTemplate(startTime: string, eventlocation: string, eventDiscription: any, calendarName: string, subject: string): string{
     return `
       <div class="timeline-box timeline-box-${calendarName}">
         <div>
           <span class="timeline-start-time">${startTime}</span><span class="timeline-location">${eventlocation}</span>
         </div>
         <div class="timeline-event-discription">
-          ${eventDiscription.Text}
+          ${subject}
         </div>
       </div>
     `;
@@ -343,7 +342,7 @@ export class AgendaPage implements OnInit {
                 const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt');
 
                 this.events.push({
-                  title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName),
+                  title: this.timeLineTemplate(startHours, element.Location, element.Body, element.CalendarName, element.Subject),
                   start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)),
                   end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)),
                   color: {