feat: start adding relative reminder picker with more options
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
kolaente 2023-06-05 16:16:10 +02:00
parent 6c2dc483a2
commit 9df6950d1a
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 98 additions and 15 deletions

View File

@ -1,5 +1,19 @@
<template> <template>
<div> <div>
{{ reminderText }}
<div class="presets">
<BaseButton
v-for="p in presets"
>
{{ formatReminder(p) }}
</BaseButton>
<BaseButton>
Custom
</BaseButton>
</div>
<ReminderPeriod <ReminderPeriod
v-if="showRelativeReminder" v-if="showRelativeReminder"
v-model="reminder" v-model="reminder"
@ -18,12 +32,18 @@
<script setup lang="ts"> <script setup lang="ts">
import {computed, ref, watch, type PropType} from 'vue' import {computed, ref, watch, type PropType} from 'vue'
import {toRef} from '@vueuse/core'
import {SECONDS_A_DAY} from '@/constants/date'
import {secondsToPeriod} from '@/helpers/time/period'
import type {ITaskReminder} from '@/modelTypes/ITaskReminder' import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
import {formatDateShort} from '@/helpers/time/formatDate'
import Datepicker from '@/components/input/datepicker.vue' import Datepicker from '@/components/input/datepicker.vue'
import ReminderPeriod from '@/components/tasks/partials/reminder-period.vue' import ReminderPeriod from '@/components/tasks/partials/reminder-period.vue'
import TaskReminderModel from '@/models/taskReminder' import TaskReminderModel from '@/models/taskReminder'
import BaseButton from '@/components/base/BaseButton.vue'
import {REMINDER_PERIOD_RELATIVE_TO_TYPES} from '@/types/IReminderPeriodRelativeTo'
const props = defineProps({ const props = defineProps({
modelValue: { modelValue: {
@ -38,6 +58,13 @@ const props = defineProps({
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
const reminder = ref<ITaskReminder>(new TaskReminderModel()) const reminder = ref<ITaskReminder>(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},
]
const reminderDate = computed({ const reminderDate = computed({
get() { get() {
return reminder.value?.reminder return reminder.value?.reminder
@ -47,18 +74,32 @@ const reminderDate = computed({
return return
} }
reminder.value.reminder = new Date(reminderDate.value) reminder.value.reminder = new Date(reminderDate.value)
} },
}) })
const showAbsoluteReminder = computed(() => !reminder.value || !reminder.value?.relativeTo) const showAbsoluteReminder = computed(() => !reminder.value || !reminder.value?.relativeTo)
const showRelativeReminder = computed(() => !reminder.value || reminder.value?.relativeTo) const showRelativeReminder = computed(() => !reminder.value || reminder.value?.relativeTo)
const reminderText = computed(() => {
if (reminder.value.reminder !== null) {
return formatDateShort(reminder.value.reminder)
}
if (reminder.value.relativeTo !== null) {
return formatReminder(reminder.value)
}
return 'Add a reminder…'
})
const modelValue = toRef(props, 'modelValue')
watch( watch(
props.modelValue, modelValue,
(newReminder) => { (newReminder) => {
reminder.value = newReminder || new TaskReminderModel() reminder.value = newReminder || new TaskReminderModel()
}, },
{immediate: true}, {immediate: true},
) )
function setReminderDate() { function setReminderDate() {
@ -68,4 +109,28 @@ function setReminderDate() {
reminder.value.reminder = new Date(reminderDate.value) reminder.value.reminder = new Date(reminderDate.value)
emit('update:modelValue', reminder.value) emit('update:modelValue', reminder.value)
} }
function formatReminder(reminder: TaskReminderModel) {
const period = secondsToPeriod(reminder.relativePeriod)
let periodHuman = ''
if (period.days > 0) {
periodHuman = period.days + ' days'
}
if (period.days === 1) {
periodHuman = period.days + ' day'
}
return periodHuman + ' ' + (reminder.relativePeriod > 0 ? 'before' : 'after') + ' ' + reminder.relativeTo
}
</script> </script>
<style lang="scss" scoped>
.presets {
display: flex;
flex-direction: column;
align-items: flex-start;
}
</style>

View File

@ -81,6 +81,7 @@
<script setup lang="ts"> <script setup lang="ts">
import {reactive, ref, watch, type PropType, computed} from 'vue' import {reactive, ref, watch, type PropType, computed} from 'vue'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import {toRef} from '@vueuse/core'
import BaseButton from '@/components/base/BaseButton.vue' import BaseButton from '@/components/base/BaseButton.vue'
import Popup from '@/components/misc/popup.vue' import Popup from '@/components/misc/popup.vue'
@ -109,6 +110,8 @@ const emit = defineEmits(['update:modelValue'])
const reminder = ref<ITaskReminder>() const reminder = ref<ITaskReminder>()
const showForm = ref(false)
const periodInput = reactive({ const periodInput = reactive({
duration: { duration: {
days: 0, days: 0,
@ -120,8 +123,9 @@ const periodInput = reactive({
sign: -1, sign: -1,
}) })
const modelValue = toRef(props, 'modelValue')
watch( watch(
props.modelValue, modelValue,
(value) => { (value) => {
reminder.value = value reminder.value = value
if (value && value.relativeTo != null) { if (value && value.relativeTo != null) {
@ -130,13 +134,12 @@ watch(
periodInput.sign = value.relativePeriod <= 0 ? -1 : 1 periodInput.sign = value.relativePeriod <= 0 ? -1 : 1
} else { } else {
reminder.value = new TaskReminderModel() reminder.value = new TaskReminderModel()
isShowForm.value = true showForm.value = true
} }
}, },
{immediate: true}, {immediate: true},
) )
function updateData() { function updateData() {
changed.value = true changed.value = true
if (reminder.value) { if (reminder.value) {
@ -156,7 +159,7 @@ const changed = ref(false)
function close() { function close() {
setTimeout(() => { setTimeout(() => {
isShowForm.value = false showForm.value = false
if (changed.value) { if (changed.value) {
changed.value = false changed.value = false
} }

View File

@ -1,11 +1,26 @@
<script setup lang="ts"> <script setup lang="ts">
import reminders from './reminders.vue' import reminders from './reminders.vue'
import {ref} from 'vue'
import ReminderDetail from '@/components/tasks/partials/reminder-detail.vue'
const reminderNow = ref({reminder: new Date(), relativePeriod: 0, relativeTo: null } )
const relativeReminder = ref({reminder: null, relativePeriod: 1, relativeTo: 'due_date' } )
const newReminder = ref(null)
</script> </script>
<template> <template>
<Story> <Story>
<Variant title="Default"> <Variant title="Default">
<reminders /> <reminders/>
</Variant> </Variant>
</Story> <Variant title="Reminder Detail with fixed date">
<reminder-detail v-model="reminderNow"/>
</Variant>
<Variant title="Reminder Detail with relative date">
<reminder-detail v-model="relativeReminder"/>
</Variant>
<Variant title="New Reminder Detail">
<reminder-detail v-model="newReminder"/>
</Variant>
</Story>
</template> </template>