peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

timeline fix null

Browse Source
This commit is contained in:
Peter Maquiran
2021-02-01 12:24:24 +01:00
parent 4e7deb50a5
commit dce4afd4da
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.html
+1 -1
View File
@@ -178,7 +178,7 @@
<!-- Calendar currente date --> <!-- Calendar currente date -->
<ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien"> <ion-row class="ion-justify-content-between ion-align-items-center currente-date-timelien">
<ion-row class="timeline-date"> <ion-row class="timeline-date">
<span *ngIf="timelineIsCurrentDate()">Hoje, </span> {{ timelineDate }} <span *ngIf="timelineIsCurrentDate()">Hoje, &nbsp;</span> {{ timelineDate }}
</ion-row> </ion-row>
<!-- <ion-row class="filter ion-align-items-center"> <!-- <ion-row class="filter ion-align-items-center">
<div class="filter-name">Todos</div> <div class="filter-name">Todos</div>
src/app/pages/agenda/agenda.page.ts
+3 -4
View File
@@ -230,7 +230,6 @@ export class AgendaPage implements OnInit {
/* this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */ /* this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */
} }
onCurrentChanged = (ev: Date) => { onCurrentChanged = (ev: Date) => {
// timeline change date // timeline change date
this.timelineDate = formatDate(ev,'dd MMMM yyyy', 'pt'); 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 ` return `
<div class="timeline-box timeline-box-${calendarName}"> <div class="timeline-box timeline-box-${calendarName}">
<div> <div>
<span class="timeline-start-time">${startTime}</span><span class="timeline-location">${eventlocation}</span> <span class="timeline-start-time">${startTime}</span><span class="timeline-location">${eventlocation}</span>
</div> </div>
<div class="timeline-event-discription"> <div class="timeline-event-discription">
${eventDiscription.Text} ${subject}
</div> </div>
</div> </div>
`; `;
@@ -343,7 +342,7 @@ export class AgendaPage implements OnInit {
const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt'); const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt');
this.events.push({ 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)), start: setHours(setMinutes(new Date(element.StartDate), 0), parseInt(startHours)),
end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)), end: setHours(setMinutes(new Date(element.EndDate), 0), parseInt(EndHours)),
color: { color: {