use calendarStartDate and calendarEndDate attrs in monthly dashboard calendar.

Author: stopfstedt

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

@@ -29,13 +29,20 @@ export default class IliosCalendarMonthComponent 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/monthly-calendar.gjs

@@ -21,7 +21,7 @@ export default class MonthlyCalendarComponent extends Component {
       return [];
     }
 
-    return sortBy(this.args.events, ['startDate', 'endDate', 'name']);
+    return sortBy(this.args.events, ['calendarStartDate', 'calendarEndDate', 'name']);
   }
 
   get firstDayOfMonth() {
@@ -51,7 +51,9 @@ export default class MonthlyCalendarComponent extends Component {
           month: 'numeric',
           day: 'numeric',
         }),
-        events: this.sortedEvents.filter((e) => date.hasSame(DateTime.fromISO(e.startDate), 'day')),
+        events: this.sortedEvents.filter((e) =>
+          date.hasSame(DateTime.fromISO(e.calendarStartDate), 'day'),
+        ),
       };
     });
   }
@@ -104,7 +106,7 @@ export default class MonthlyCalendarComponent extends Component {
               {{#if event.isMulti}}
                 <IliosCalendarEventMonth
                   @event={{event}}
-                  @selectEvent={{fn @changeToDayView event.startDate}}
+                  @selectEvent={{fn @changeToDayView event.calendarStartDate}}
                 />
               {{else}}
                 <IliosCalendarEventMonth @event={{event}} @selectEvent={{fn @selectEvent event}} />

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

@@ -15,6 +15,8 @@ module('Integration | Component | ilios calendar event month', function (hooks)
       color: '#00cc65',
       startDate: november111984.toJSDate(),
       endDate: november111984.plus({ hour: 1 }).toJSDate(),
+      calendarStartDate: november111984.toJSDate(),
+      calendarEndDate: november111984.plus({ hour: 1 }).toJSDate(),
       lastModified: november111984.toJSDate(),
       name: 'test',
     });

packages/test-app/tests/integration/components/ilios-calendar-month-test.gjs

@@ -17,14 +17,20 @@ module('Integration | Component | ilios calendar month', function (hooks) {
     firstEvent.name = 'Some new thing';
     firstEvent.startDate = date.toISO();
     firstEvent.endDate = date.plus({ hour: 1 }).toISO();
+    firstEvent.calendarStartDate = firstEvent.startDate;
+    firstEvent.calendarEndDate = firstEvent.endDate;
     const secondEvent = createUserEventObject();
     secondEvent.name = 'Second new thing';
     secondEvent.startDate = date.plus({ hour: 1 }).toISO();
     secondEvent.endDate = date.plus({ hour: 3 }).toISO();
+    secondEvent.calendarStartDate = secondEvent.startDate;
+    secondEvent.calendarEndDate = secondEvent.endDate;
     const thirdEvent = createUserEventObject();
     thirdEvent.name = 'Third new thing';
     thirdEvent.startDate = date.plus({ hour: 3 }).toISO();
     thirdEvent.endDate = date.plus({ hour: 4 }).toISO();
+    thirdEvent.calendarStartDate = thirdEvent.startDate;
+    thirdEvent.calendarEndDate = thirdEvent.endDate;
     this.set('events', [firstEvent, secondEvent, thirdEvent]);
     await render(
       <template>
@@ -47,10 +53,14 @@ module('Integration | Component | ilios calendar month', function (hooks) {
     firstEvent.name = 'Some new thing';
     firstEvent.startDate = date.toISO();
     firstEvent.endDate = date.plus({ hour: 1 }).toISO();
+    firstEvent.calendarStartDate = firstEvent.startDate;
+    firstEvent.calendarEndDate = firstEvent.endDate;
     const secondEvent = createUserEventObject();
     secondEvent.name = 'Second new thing';
     secondEvent.startDate = date.plus({ hour: 1 }).toISO();
     secondEvent.endDate = date.plus({ hour: 3 }).toISO();
+    secondEvent.calendarStartDate = secondEvent.startDate;
+    secondEvent.calendarEndDate = secondEvent.endDate;
     this.set('events', [firstEvent, secondEvent]);
     await render(
       <template>
@@ -114,9 +124,13 @@ module('Integration | Component | ilios calendar month', function (hooks) {
     const event = createUserEventObject();
     event.startDate = date.toISO();
     event.endDate = date.plus({ hour: 24 }).toISO();
+    event.calendarStartDate = event.startDate;
+    event.calendarEndDate = event.endDate;
     const event2 = createUserEventObject();
     event2.startDate = date.plus({ hour: 48 }).toISO();
     event2.endDate = date.plus({ hour: 72 }).toISO();
+    event2.calendarStartDate = event2.startDate;
+    event2.calendarEndDate = event2.endDate;
     this.set('date', date.toJSDate());
     this.set('events', [event, event2]);
     await render(

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

@@ -66,6 +66,8 @@ module('Integration | Component | monthly-calendar', function (hooks) {
     this.server.createList('userevent', 2, {
       startDate: january9th2019.toISO(),
       endDate: january9th2019.plus({ hour: 1 }).toISO(),
+      calendarStartDate: january9th2019.toISO(),
+      calendarEndDate: january9th2019.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', january9th2019.toJSDate());
@@ -103,6 +105,8 @@ module('Integration | Component | monthly-calendar', function (hooks) {
     this.server.createList('userevent', 3, {
       startDate: january9th2019.toISO(),
       endDate: january9th2019.plus({ hour: 1 }).toISO(),
+      calendarStartDate: january9th2019.toISO(),
+      calendarEndDate: january9th2019.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', january9th2019.toJSDate());
@@ -167,6 +171,8 @@ module('Integration | Component | monthly-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);
@@ -201,6 +207,8 @@ module('Integration | Component | monthly-calendar', function (hooks) {
     this.server.createList('userevent', 3, {
       startDate: january9th2019.toISO(),
       endDate: january9th2019.plus({ hour: 1 }).toISO(),
+      calendarStartDate: january9th2019.toISO(),
+      calendarEndDate: january9th2019.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', january9th2019.toJSDate());
@@ -235,6 +243,8 @@ module('Integration | Component | monthly-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);
@@ -269,6 +279,8 @@ module('Integration | Component | monthly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: december112017.toISO(),
       endDate: december112017.plus({ hour: 1 }).toISO(),
+      calendarStartDate: december112017.toISO(),
+      calendarEndDate: december112017.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', december112017.toJSDate());
@@ -311,6 +323,8 @@ module('Integration | Component | monthly-calendar', function (hooks) {
     this.server.create('userevent', {
       startDate: february1st2020.toISO(),
       endDate: february1st2020.plus({ hour: 1 }).toISO(),
+      calendarStartDate: february1st2020.toISO(),
+      calendarEndDate: february1st2020.plus({ hour: 1 }).toISO(),
     });
     this.set('events', this.server.db.userevents);
     this.set('date', february1st2020.toJSDate());