Skip to content

Commit 1495b2b

Browse files
Fixed deadline_date_controller incorrectly using RRule library, causing next reminder calculation to change based on time of day and time zone
1 parent 48bece7 commit 1495b2b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

app/javascript/controllers/deadline_day_controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default class extends Controller {
4747

4848
if (this.byDayOfMonthTarget.checked && this.dayOfMonthTarget.value) {
4949
const rule = new RRule({
50-
dtstart: today,
50+
dtstart: new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 12)),
5151
freq: RRule.MONTHLY,
5252
interval: monthlyInterval,
5353
bymonthday: parseInt(this.dayOfMonthTarget.value),
@@ -57,7 +57,7 @@ export default class extends Controller {
5757
}
5858
if (this.byDayOfWeekTarget.checked && this.everyNthDayTarget.value && (this.dayOfWeekTarget.value)) {
5959
const rule = new RRule({
60-
dtstart: today,
60+
dtstart: new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 12)),
6161
freq: RRule.MONTHLY,
6262
interval: monthlyInterval,
6363
byweekday: WEEKDAY_NUM_TO_OBJ[ parseInt(this.dayOfWeekTarget.value) ].nth( parseInt(this.everyNthDayTarget.value) ),

0 commit comments

Comments
 (0)