use calendarStartDate and calendarEndDate attrs in daily dashboard calendar.

Author: stopfstedt

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

@@ -22,9 +22,9 @@ export default class DailyCalendarEventComponent extends Component {
   constructor() {
     super(...arguments);
     const allMinutesInDay = Array(60 * 24).fill(0);
-    this.args.allDayEvents.forEach(({ startDate, endDate }) => {
-      const start = this.getMinuteInTheDay(startDate);
-      const end = this.getMinuteInTheDay(endDate);
+    this.args.allDayEvents.forEach(({ calendarStartDate, calendarEndDate }) => {
+      const start = this.getMinuteInTheDay(calendarStartDate);
+      const end = this.getMinuteInTheDay(calendarEndDate);
       for (let i = start; i <= end; i++) {
         allMinutesInDay[i - 1]++;
       }
@@ -66,11 +66,11 @@ export default class DailyCalendarEventComponent extends Component {
   }
 
   get startLuxon() {
-    return DateTime.fromISO(this.args.event.startDate);
+    return DateTime.fromISO(this.args.event.calendarStartDate);
   }
 
   get endLuxon() {
-    return DateTime.fromISO(this.args.event.endDate);
+    return DateTime.fromISO(this.args.event.calendarEndDate);
   }
 
   get startOfDayLuxon() {
@@ -94,8 +94,8 @@ export default class DailyCalendarEventComponent extends Component {
   }
 
   get span() {
-    const start = this.getMinuteInTheDay(this.args.event.startDate);
-    const end = this.getMinuteInTheDay(this.args.event.endDate);
+    const start = this.getMinuteInTheDay(this.args.event.calendarStartDate);
+    const end = this.getMinuteInTheDay(this.args.event.calendarEndDate);
 
     const minutes = this.minutes.slice(start, end - 1);
     const max = Math.max(...minutes);

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

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

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

@@ -30,8 +30,8 @@ export default class IliosCalendarDayComponent extends Component {
   get events() {
     return this.args.calendarEvents.filter(
       (event) =>
-        DateTime.fromISO(event.startDate).hasSame(this.today, 'day') ||
-        DateTime.fromISO(event.endDate).hasSame(this.today, 'day'),
+        DateTime.fromISO(event.calendarStartDate).hasSame(this.today, 'day') ||
+        DateTime.fromISO(event.calendarEndDate).hasSame(this.today, 'day'),
     );
   }
   get ilmPreWorkEvents() {
@@ -57,12 +57,19 @@ export default class IliosCalendarDayComponent 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 multiDayEvents() {
     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',
+        ),
     );
   }
   <template>

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

@@ -20,6 +20,8 @@ module('Integration | Component | daily-calendar-event', function (hooks) {
       lastModified,
       isPublished,
       isScheduled,
+      calendarStartDate: startDate,
+      calendarEndDate: endDate,
     });
   };
 

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

@@ -23,6 +23,8 @@ module('Integration | Component | daily-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: DateTime.fromFormat(startDate, 'y-MM-dd h:m:s').toISO(),
       endDate: DateTime.fromFormat(endDate, 'y-MM-dd h:m:s').toISO(),
+      calendarStartDate: DateTime.fromFormat(startDate, 'y-MM-dd h:m:s').toISO(),
+      calendarEndDate: DateTime.fromFormat(endDate, 'y-MM-dd h:m:s').toISO(),
       color: color || '#' + Math.floor(Math.random() * 16777215).toString(16),
       lastModified: endDate,
     });
@@ -131,6 +133,8 @@ module('Integration | Component | daily-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);
@@ -164,6 +168,8 @@ module('Integration | Component | daily-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());