diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index ef10ad7f5..1b9ecc95a 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -20,14 +20,14 @@

{{ viewTitle }}

- + + + + + Hoje,   {{ timelineDate }} + + + @@ -187,18 +201,6 @@ - - - - - Hoje, {{ timelineDate }} - - -
Todos
- -
-
-
{ // timeline change date 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); }; @@ -256,7 +256,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); }; @@ -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 `
${startTime}${eventlocation}
- ${eventDiscription.Text} + ${subject}
`; @@ -339,11 +338,12 @@ 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'); 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: { @@ -352,6 +352,7 @@ export class AgendaPage implements OnInit { }, id: element.EventId }); + // timeline end }); @@ -374,12 +375,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 @@ + + + + + + diff --git a/src/global.scss b/src/global.scss index f32253053..2d929b05c 100644 --- a/src/global.scss +++ b/src/global.scss @@ -40,6 +40,7 @@ td.monthview-current{ /* display: flex; */ height: 100%; div { + padding-left: 7px; border-radius: 28px; display: flex; justify-content: center; @@ -67,6 +68,7 @@ td.monthview-selected { } .calendar-event-type + /* Timeline */ .cal-hour-segment {