use calendarStartDate and calendarEndDate attrs in weekly dashboard calendar.

Author: stopfstedt

packages/ilios-common/addon/components/ilios-calendar-week.gjs

@@ -44,12 +44,19 @@ export default class IliosCalendarWeekComponent extends Component {
   }
   get singleDayEvents() {
     return this.nonIlmPreWorkEvents.filter((event) =>
-      DateTime.fromISO(event.startDate).hasSame(DateTime.fromISO(event.endDate), 'day'),
+      DateTime.fromISO(event.calendarStartDate).hasSame(
+        DateTime.fromISO(event.calendarEndDate),
+        'day',
+      ),
     );
   }
   get multiDayEventsList() {
     return this.nonIlmPreWorkEvents.filter(
-      (event) => !DateTime.fromISO(event.startDate).hasSame(DateTime.fromISO(event.endDate), 'day'),
+      (event) =>
+        !DateTime.fromISO(event.calendarStartDate).hasSame(
+          DateTime.fromISO(event.calendarEndDate),
+          'day',
+        ),
     );
   }
 

packages/ilios-common/addon/components/weekly-calendar-event.gjs

@@ -29,9 +29,9 @@ export default class WeeklyCalendarEventComponent extends Component {
 
   get minutes() {
     const allMinutesInDay = Array(60 * 24).fill(0);
-    this.args.allDayEvents.forEach(({ startDate, endDate }) => {
-      const start = this.getMinuteInTheDay(DateTime.fromISO(startDate));
-      const end = this.getMinuteInTheDay(DateTime.fromISO(endDate));
+    this.args.allDayEvents.forEach(({ calendarStartDate, calendarEndDate }) => {
+      const start = this.getMinuteInTheDay(DateTime.fromISO(calendarStartDate));
+      const end = this.getMinuteInTheDay(DateTime.fromISO(calendarEndDate));
       for (let i = start; i <= end; i++) {
         allMinutesInDay[i - 1]++;
       }
@@ -41,11 +41,11 @@ export default class WeeklyCalendarEventComponent extends Component {
   }
 
   get startDateTime() {
-    return DateTime.fromISO(this.args.event.startDate);
+    return DateTime.fromISO(this.args.event.calendarStartDate);
   }
 
   get endDateTime() {
-    return DateTime.fromISO(this.args.event.endDate);
+    return DateTime.fromISO(this.args.event.calendarEndDate);
   }
 
   get startDate() {

packages/ilios-common/addon/components/weekly-calendar.gjs

@@ -54,7 +54,7 @@ export default class WeeklyCalendarComponent extends Component {
     }
 
     return this.sortedEvents.reduce((earliestHour, event) => {
-      const hour = Number(DateTime.fromISO(event.startDate).toFormat('HH'));
+      const hour = Number(DateTime.fromISO(event.calendarStartDate).toFormat('HH'));
       return hour < earliestHour ? hour : earliestHour;
     }, 24);
   }
@@ -64,7 +64,7 @@ export default class WeeklyCalendarComponent extends Component {
       return [];
     }
 
-    return sortBy(this.args.events, ['startDate', 'endDate', 'name']);
+    return sortBy(this.args.events, ['calendarStartDate', 'calendarEndDate', 'name']);
   }
 
   get days() {

packages/test-app/tests/integration/components/weekly-calendar-event-test.gjs

@@ -16,6 +16,8 @@ module('Integration | Component | weekly-calendar-event', function (hooks) {
     this.server.create('userevent', {
       startDate: DateTime.fromFormat(startDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
       endDate: DateTime.fromFormat(endDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
+      calendarStartDate: DateTime.fromFormat(startDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
+      calendarEndDate: DateTime.fromFormat(endDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
       color,
       lastModified: DateTime.fromFormat(lastModified, 'yyyy-LL-dd hh:mm:ss').toISO(),
       isPublished,

packages/test-app/tests/integration/components/weekly-calendar-test.gjs

@@ -23,6 +23,8 @@ module('Integration | Component | weekly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: DateTime.fromFormat(startDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
       endDate: DateTime.fromFormat(endDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
+      calendarStartDate: DateTime.fromFormat(startDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
+      calendarEndDate: DateTime.fromFormat(endDate, 'yyyy-LL-dd hh:mm:ss').toISO(),
       color: color || '#' + Math.floor(Math.random() * 16777215).toString(16),
       lastModified: endDate,
     });
@@ -213,6 +215,8 @@ module('Integration | Component | weekly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: january9th2019.toISO(),
       endDate: january9th2019.plus({ hour: 1 }).toISO(),
+      calendarStartDate: january9th2019.toISO(),
+      calendarEndDate: january9th2019.plus({ hour: 1 }).toISO(),
       offering: 1,
     });
     this.set('events', this.server.db.userevents);
@@ -248,6 +252,8 @@ module('Integration | Component | weekly-calendar', function (hooks) {
       isMulti: true,
       startDate: january9th2019.toISO(),
       endDate: january9th2019.plus({ hour: 1 }).toISO(),
+      calendarStartDate: january9th2019.toISO(),
+      calendarEndDate: january9th2019.plus({ hour: 1 }).toISO(),
       offering: 1,
     });
     this.set('events', this.server.db.userevents);
@@ -282,6 +288,8 @@ module('Integration | Component | weekly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: december111980.toISO(),
       endDate: december111980.plus({ hour: 1 }).toISO(),
+      calendarStartDate: december111980.toISO(),
+      calendarEndDate: december111980.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', december111980.toJSDate());
@@ -331,6 +339,8 @@ module('Integration | Component | weekly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: february252020.toISO(),
       endDate: february252020.plus({ hour: 1 }).toISO(),
+      calendarStartDate: february252020.toISO(),
+      calendarEndDate: february252020.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', february252020.toJSDate());