feat(reminders): show resolved reminder time in a tooltip and properly bubble updated task down to the reminder component

This commit is contained in:
kolaente 2023-06-13 12:30:07 +02:00
parent 32e5f9f757
commit 5694b39489
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
3 changed files with 20 additions and 22 deletions

View File

@ -3,6 +3,7 @@
<Popup @close="showFormSwitch = null"> <Popup @close="showFormSwitch = null">
<template #trigger="{toggle}"> <template #trigger="{toggle}">
<SimpleButton <SimpleButton
v-tooltip="reminder.reminder && reminder.relativeTo !== null ? formatDateShort(reminder.reminder) : null"
@click.prevent.stop="toggle()" @click.prevent.stop="toggle()"
> >
{{ reminderText }} {{ reminderText }}

View File

@ -32,7 +32,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {ref, watch, type PropType, computed} from 'vue' import {ref, watch, computed} from 'vue'
import type {ITaskReminder} from '@/modelTypes/ITaskReminder' import type {ITaskReminder} from '@/modelTypes/ITaskReminder'
@ -41,18 +41,12 @@ import ReminderDetail from '@/components/tasks/partials/reminder-detail.vue'
import type {ITask} from '@/modelTypes/ITask' import type {ITask} from '@/modelTypes/ITask'
import {REMINDER_PERIOD_RELATIVE_TO_TYPES} from '@/types/IReminderPeriodRelativeTo' import {REMINDER_PERIOD_RELATIVE_TO_TYPES} from '@/types/IReminderPeriodRelativeTo'
const props = defineProps({ const props = withDefaults(defineProps<{
modelValue: { modelValue: ITask,
type: Array as PropType<ITaskReminder[]>, disabled?: boolean,
default: () => [], }>(), {
}, modelValue: [],
disabled: { disabled: false,
default: false,
},
task: {
type: Object as PropType<ITask>,
required: false,
},
}) })
const emit = defineEmits(['update:modelValue']) const emit = defineEmits(['update:modelValue'])
@ -60,27 +54,28 @@ const emit = defineEmits(['update:modelValue'])
const reminders = ref<ITaskReminder[]>([]) const reminders = ref<ITaskReminder[]>([])
watch( watch(
props.modelValue, () => props.modelValue.reminders,
(newVal) => { (newVal) => {
console.log('change', newVal)
reminders.value = newVal reminders.value = newVal
}, },
{immediate: true}, {immediate: true, deep: true}, // deep watcher so that we get the resolved date after updating the task
) )
const defaultRelativeTo = computed(() => { const defaultRelativeTo = computed(() => {
if (typeof props.task === 'undefined') { if (typeof props.modelValue === 'undefined') {
return null return null
} }
if (props.task?.dueDate) { if (props.modelValue?.dueDate) {
return REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE return REMINDER_PERIOD_RELATIVE_TO_TYPES.DUEDATE
} }
if (props.task.dueDate === null && props.task.startDate !== null) { if (props.modelValue.dueDate === null && props.modelValue.startDate !== null) {
return REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE return REMINDER_PERIOD_RELATIVE_TO_TYPES.STARTDATE
} }
if (props.task.dueDate === null && props.task.startDate === null && props.task.endDate !== null) { if (props.modelValue.dueDate === null && props.modelValue.startDate === null && props.modelValue.endDate !== null) {
return REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE return REMINDER_PERIOD_RELATIVE_TO_TYPES.ENDDATE
} }
@ -88,7 +83,10 @@ const defaultRelativeTo = computed(() => {
}) })
function updateData() { function updateData() {
emit('update:modelValue', reminders.value) emit('update:modelValue', {
...props.modelValue,
reminders: reminders.value,
})
} }
function addNewReminder(newReminder: ITaskReminder) { function addNewReminder(newReminder: ITaskReminder) {

View File

@ -160,9 +160,8 @@
<reminders <reminders
:disabled="!canWrite" :disabled="!canWrite"
:ref="e => setFieldRef('reminders', e)" :ref="e => setFieldRef('reminders', e)"
v-model="task.reminders" v-model="task"
@update:model-value="saveTask" @update:model-value="saveTask"
:task="task"
/> />
</div> </div>
</CustomTransition> </CustomTransition>