diff --git a/src/components/tasks/partials/reminder-detail.vue b/src/components/tasks/partials/reminder-detail.vue index daacf6bf6..1929ce348 100644 --- a/src/components/tasks/partials/reminder-detail.vue +++ b/src/components/tasks/partials/reminder-detail.vue @@ -12,16 +12,17 @@
{{ formatReminder(p) }} - Custom + {{ $t('task.reminder.custom') }} - Date + {{ $t('task.reminder.dateAndTime') }}
@@ -62,7 +63,6 @@ import {PeriodUnit, secondsToPeriod} from '@/helpers/time/period' import type {ITaskReminder} from '@/modelTypes/ITaskReminder' import {formatDateShort} from '@/helpers/time/formatDate' -import BaseButton from '@/components/base/BaseButton.vue' import DatepickerInline from '@/components/input/datepickerInline.vue' import ReminderPeriod from '@/components/tasks/partials/reminder-period.vue' import Popup from '@/components/misc/popup.vue' @@ -88,10 +88,10 @@ const emit = defineEmits(['update:modelValue']) const reminder = ref(new TaskReminderModel()) const presets: TaskReminderModel[] = [ - {relativePeriod: SECONDS_A_DAY, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, - {relativePeriod: SECONDS_A_DAY * 3, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, - {relativePeriod: SECONDS_A_DAY * 7, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, - {relativePeriod: SECONDS_A_DAY * 30, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, + {reminder: null, relativePeriod: -1 * SECONDS_A_DAY, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, + {reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 3, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, + {reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 7, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, + {reminder: null, relativePeriod: -1 * SECONDS_A_DAY * 30, relativeTo: REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE}, ] const reminderDate = ref(null) @@ -126,6 +126,11 @@ function setReminderDate() { emit('update:modelValue', reminder.value) } +function setReminderFromPreset(preset) { + reminder.value = preset + emit('update:modelValue', reminder.value) +} + function formatReminder(reminder: TaskReminderModel) { const period = secondsToPeriod(reminder.relativePeriod) diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index ea435ff50..89e79c8b1 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -727,7 +727,9 @@ "afterShort": "after", "onDueDate": "On the due date", "onStartDate": "On the start date", - "onEndDate": "On the end date" + "onEndDate": "On the end date", + "custom": "Custom", + "dateAndTime": "Date and time" }, "repeat": { "everyDay": "Every Day",