diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 232d2fe5c..f62298c2e 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -35,7 +35,10 @@
-
+
+
+
+
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index e618bbf2d..27f035eaa 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -211,7 +211,6 @@ export class AgendaPage implements OnInit {
} else {
return 'calendar-event-type-'+(Object.keys(eventType))[0];
}
-
}
return "";
@@ -235,7 +234,6 @@ export class AgendaPage implements OnInit {
this.timelineDate = formatDate(ev,'dd MMMM yyyy', 'pt');
this.viewDate = new Date(formatDate(ev,'yyyy-MM-dd', 'pt'));
// calendar change date
- console.log('!!this!!')
this.eventSelectedDate = new Date(ev);
};
@@ -255,7 +253,6 @@ export class AgendaPage implements OnInit {
onRangeChanged (ev: { startTime: Date, endTime: Date }) {
this.rangeStartDate = ev.startTime;
this.rangeEndDate = ev.endTime;
- console.log('!!!')
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
};
@@ -338,6 +335,7 @@ export class AgendaPage implements OnInit {
calendarName: element.CalendarName
});
+ // timeline start
const startHours = formatDate(new Date(element.StartDate), 'HH', 'pt');
const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt');
@@ -351,6 +349,7 @@ export class AgendaPage implements OnInit {
},
id: element.EventId
});
+ // timeline end
});
@@ -373,12 +372,34 @@ export class AgendaPage implements OnInit {
startTime: new Date(element.StartDate),
endTime: new Date(element.EndDate),
allDay: false,
- event: element
+ event: element,
+ calendarName: element.CalendarName
});
+
+ // timeline start
+ const startHours = formatDate(new Date(element.StartDate), 'HH', 'pt');
+ const EndHours = formatDate(new Date(element.EndDate), 'HH', 'pt');
+
+ this.events.push({
+
+ 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: {
+ primary: 'white',
+ secondary: 'white'
+ },
+ id: element.EventId
+ });
+ // timeline end
+
});
+
this.myCal.update();
this.myCal.loadEvents();
this.showLoader = false;
+ this.showTimeline = true;
+
});
}
break;
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 827961e65..527bde94b 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -31,8 +31,6 @@ export class PublicationsPage implements OnInit {
months: string[];
days:string[];
-
-
constructor(
private router: Router,
private modalController: ModalController,
diff --git a/src/assets/images/icons-profile-calendar-md.svg b/src/assets/images/icons-profile-calendar-md.svg
new file mode 100644
index 000000000..c00684e68
--- /dev/null
+++ b/src/assets/images/icons-profile-calendar-md.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/assets/images/icons-profile-calendar-pr.svg b/src/assets/images/icons-profile-calendar-pr.svg
new file mode 100644
index 000000000..c377a04b7
--- /dev/null
+++ b/src/assets/images/icons-profile-calendar-pr.svg
@@ -0,0 +1,6 @@
+