From 9bcff39a4a5f783ded527a12840cece40a25b5c1 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Thu, 12 Sep 2024 11:13:18 -0700 Subject: [PATCH 1/4] convert string to Date --- .../ilios-common/addon/components/timed-release-schedule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ilios-common/addon/components/timed-release-schedule.js b/packages/ilios-common/addon/components/timed-release-schedule.js index ef20141b0f..062d9542c1 100644 --- a/packages/ilios-common/addon/components/timed-release-schedule.js +++ b/packages/ilios-common/addon/components/timed-release-schedule.js @@ -17,6 +17,6 @@ export default class TimedReleaseSchedule extends Component { if (!this.args.startDate) { return false; } - return DateTime.fromJSDate(this.args.startDate) > DateTime.now(); + return DateTime.fromJSDate(new Date(this.args.startDate)) > DateTime.now(); } } From f003268d6b250f6fef07a2c80920b655d5604a87 Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 13 Sep 2024 08:11:47 -0700 Subject: [PATCH 2/4] switch from fromJSDate() to fromISO() --- .../ilios-common/addon/components/timed-release-schedule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ilios-common/addon/components/timed-release-schedule.js b/packages/ilios-common/addon/components/timed-release-schedule.js index 062d9542c1..1540e9193f 100644 --- a/packages/ilios-common/addon/components/timed-release-schedule.js +++ b/packages/ilios-common/addon/components/timed-release-schedule.js @@ -17,6 +17,6 @@ export default class TimedReleaseSchedule extends Component { if (!this.args.startDate) { return false; } - return DateTime.fromJSDate(new Date(this.args.startDate)) > DateTime.now(); + return DateTime.fromISO(this.args.startDate) > DateTime.now(); } } From fe554c46b97926bd1c3e96d865808c15ea75afbb Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 13 Sep 2024 09:04:12 -0700 Subject: [PATCH 3/4] fix typo --- .../tests/integration/components/timed-release-schedule-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/test-app/tests/integration/components/timed-release-schedule-test.js b/packages/test-app/tests/integration/components/timed-release-schedule-test.js index 7bcf377816..07e364a7b1 100644 --- a/packages/test-app/tests/integration/components/timed-release-schedule-test.js +++ b/packages/test-app/tests/integration/components/timed-release-schedule-test.js @@ -65,7 +65,7 @@ module('Integration | Component | timed release schedule', function (hooks) { assert.dom(this.element).hasNoText(); }); - test('it renders nothing with only start date in the past and showNoSchdule set to false', async function (assert) { + test('it renders nothing with only start date in the past and showNoSchedule set to false', async function (assert) { const yesterday = DateTime.fromObject({ hour: 8 }).minus({ days: 1 }); this.set('yesterday', yesterday.toJSDate()); await render( From 5cbb4557b1ec0ab058e1be89ef3f8d596f3409aa Mon Sep 17 00:00:00 2001 From: Michael Chadwick Date: Fri, 13 Sep 2024 10:42:07 -0700 Subject: [PATCH 4/4] back to the 'new Date()' encapsulation hack due to date format discrepancy across site --- .../ilios-common/addon/components/timed-release-schedule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ilios-common/addon/components/timed-release-schedule.js b/packages/ilios-common/addon/components/timed-release-schedule.js index 1540e9193f..062d9542c1 100644 --- a/packages/ilios-common/addon/components/timed-release-schedule.js +++ b/packages/ilios-common/addon/components/timed-release-schedule.js @@ -17,6 +17,6 @@ export default class TimedReleaseSchedule extends Component { if (!this.args.startDate) { return false; } - return DateTime.fromISO(this.args.startDate) > DateTime.now(); + return DateTime.fromJSDate(new Date(this.args.startDate)) > DateTime.now(); } }