Skip to content

TaskView is a self-hosted project and task management platform focused on clarity, ownership, and control. TaskView is built for teams that want a transparent, self-hosted alternative to SaaS task managers.

feat(web): optional start and end time in the date picker

Daniel Barreto4af305cf3cc5
diff --git a/web/src/components/features/base/TvDateRange.vue b/web/src/components/features/base/TvDateRange.vue
index 327d50d..347b02f 100644
--- a/web/src/components/features/base/TvDateRange.vue
+++ b/web/src/components/features/base/TvDateRange.vue
@@ -32,7 +32,8 @@
</UButton>
<template #content>
- <div class="flex flex-col gap-3 p-3">
+ <!-- With times on it can outgrow the space below the trigger: scroll instead of getting cut off -->
+ <div class="flex max-h-[var(--reka-popover-content-available-height)] flex-col gap-3 overflow-y-auto p-3">
<div class="flex flex-wrap gap-2">
<UButton
v-for="q in quickRanges"
@@ -57,13 +58,48 @@
:week-starts-on="weekStart"
/>
- <div class="flex items-center justify-between gap-2 pt-1">
- <UCheckbox
- v-model="isRange"
- size="md"
- :ui="{ root: 'items-center' }"
- :label="t('deadline.selectRange')"
+ <div
+ v-if="showTime"
+ class="flex items-center gap-2"
+ >
+ <template v-if="isRange">
+ <UInputTime
+ v-model="startTimeModel"
+ :hour-cycle="24"
+ :disabled="!model?.start"
+ :aria-label="t('deadline.startTime')"
+ data-testid="date-range-start-time"
+ />
+ <UIcon
+ name="i-lucide-arrow-right"
+ class="size-3.5 shrink-0 text-dimmed"
+ />
+ </template>
+ <UInputTime
+ v-model="endTimeModel"
+ :hour-cycle="24"
+ :disabled="!model?.end"
+ :aria-label="t('deadline.endTime')"
+ data-testid="date-range-end-time"
/>
+ </div>
+
+ <div class="flex items-center justify-between gap-2 pt-1">
+ <div class="flex flex-wrap items-center gap-x-4 gap-y-2">
+ <UCheckbox
+ v-model="isRange"
+ size="md"
+ :ui="{ root: 'items-center' }"
+ :label="t('deadline.selectRange')"
+ />
+ <UCheckbox
+ v-model="showTime"
+ size="md"
+ :ui="{ root: 'items-center' }"
+ :label="t('deadline.selectTime')"
+ data-testid="date-range-time-toggle"
+ />
+ </div>
<UButton
v-if="model?.start || model?.end"
icon="i-lucide-x"
@@ -80,11 +116,12 @@
</template>
<script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, shallowRef, computed, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { useDateFormat } from '@vueuse/core'
import {
type CalendarDate,
+ Time,
today,
getLocalTimeZone,
startOfWeek,
@@ -117,24 +154,81 @@ watch(() => model.value?.start, (start) => {
// drop the start date when switching back to single-date mode
watch(isRange, (on) => {
if (!on && model.value?.start) {
- model.value = { start: undefined, end: model.value.end }
+ model.value = { start: undefined, end: model.value.end, endTime: model.value.endTime }
+ }
+})
+
+// Times stay hidden until asked for, and show by themselves when the task already has one
+const hasTime = (value: DateRangeValue | undefined) => Boolean(value?.startTime || value?.endTime)
+const showTime = ref(hasTime(model.value))
+watch(() => hasTime(model.value), (has) => {
+ showTime.value = has
+})
+
+// With times on, a date without a time starts at 09:00 (a range ends at 10:00)
+function withDefaultTimes(value: NonNullable<DateRangeValue>): NonNullable<DateRangeValue> {
+ if (!showTime.value) return value
+ return {
+ ...value,
+ startTime: value.start ? value.startTime ?? new Time(9, 0) : undefined,
+ endTime: value.end ? value.endTime ?? new Time(value.start ? 10 : 9, 0) : undefined,
}
+}
+
+// Turning times off clears them. Turning them on adds the default times, or waits for a date to be picked
+watch(showTime, (on) => {
+ const value = model.value
+ if ((!value?.start && !value?.end) || on === hasTime(value)) return
+ model.value = on ? withDefaultTimes(value) : { ...value, startTime: undefined, endTime: undefined }
+})
+
+// UInputTime may hand back a richer date-time value; only the hour and minute are kept
+const toTime = (value: { hour: number, minute: number } | null | undefined) =>
+ value ? new Time(value.hour, value.minute) : undefined
+
+const startTimeModel = computed({
+ get: () => model.value?.startTime,
+ set: (value) => {
+ if (model.value) model.value = { ...model.value, startTime: toTime(value) }
+ },
+})
+
+const endTimeModel = computed({
+ get: () => model.value?.endTime,
+ set: (value) => {
+ if (model.value) model.value = { ...model.value, endTime: toTime(value) }
+ },
})
// single-date mode fills the END date (the deadline)
const singleModel = computed<CalendarDate | undefined>({
get: () => model.value?.end,
set: (date) => {
- model.value = { start: undefined, end: date }
- if (date) open.value = false
+ model.value = date
+ ? withDefaultTimes({ start: undefined, end: date, endTime: model.value?.endTime })
+ : { start: undefined, end: undefined }
+ // With times on, keep the popover open so the time can be set too
+ if (date && !showTime.value) open.value = false
},
})
+// The first click of a new range only sets its start. Hold it here until the end is picked, so a
+// half-chosen range isn't saved, which would drop the end date and its time.
+const pendingRange = shallowRef<DateRangeValue>(null)
+watch(open, (isOpen) => {
+ if (!isOpen) pendingRange.value = null
+})
+
const rangeModel = computed<DateRangeValue>({
- get: () => ({ start: model.value?.start, end: model.value?.end }),
+ get: () => pendingRange.value ?? { start: model.value?.start, end: model.value?.end },
set: (value) => {
- model.value = value ?? null
- if (value?.start && value?.end) open.value = false
+ if (value?.start && !value.end) {
+ pendingRange.value = value
+ return
+ }
+ pendingRange.value = null
+ model.value = value ? withDefaultTimes({ ...value, startTime: model.value?.startTime, endTime: model.value?.endTime }) : null
+ if (value?.start && value?.end && !showTime.value) open.value = false
},
})
@@ -142,10 +236,18 @@ const format = (date?: CalendarDate): string =>
// new Date('YYYY-MM-DD') would read the day as UTC midnight, a day early west of UTC
date ? useDateFormat(date.toDate(getLocalTimeZone()), 'DD MMM').value : ''
-const startLabel = computed(() => model.value?.start ? format(model.value.start) : t('deadline.startDate'))
+const formatTime = (time?: Time): string => time ? time.toString().slice(0, 5) : ''
+const withTime = (date: string, time?: Time): string => time ? `${date}, ${formatTime(time)}` : date
+
+const startLabel = computed(() => model.value?.start
+ ? withTime(format(model.value.start), model.value.startTime)
+ : t('deadline.startDate'))
const endLabel = computed(() => {
- if (model.value?.end) return format(model.value.end)
- return isRange.value ? t('deadline.endDate') : t('tasks.deadline')
+ const value = model.value
+ if (!value?.end) return isRange.value ? t('deadline.endDate') : t('tasks.deadline')
+ // A same-day time range reads "20 Oct, 11:00 → 12:00"
+ if (isRange.value && value.start?.compare(value.end) === 0 && value.endTime) return formatTime(value.endTime)
+ return withTime(format(value.end), value.endTime)
})
type QuickKey = 'today' | 'tomorrow' | 'week' | 'month'
@@ -170,8 +272,9 @@ function applyQuick(key: QuickKey) {
// in single mode keep only the end date; in range mode keep both
function commit(start: CalendarDate, end: CalendarDate) {
- model.value = isRange.value ? { start, end } : { start: undefined, end }
- open.value = false
+ const { startTime, endTime } = model.value ?? {}
+ model.value = withDefaultTimes(isRange.value ? { start, end, startTime, endTime } : { start: undefined, end, endTime })
+ if (!showTime.value) open.value = false
}
function clear() {
diff --git a/web/src/components/features/base/TvDeadlineSelect.vue b/web/src/components/features/base/TvDeadlineSelect.vue
index 0acd3b7..64682cb 100644
--- a/web/src/components/features/base/TvDeadlineSelect.vue
+++ b/web/src/components/features/base/TvDeadlineSelect.vue
@@ -9,11 +9,11 @@
<script setup lang="ts">
import { computed } from 'vue'
import type { Task } from 'taskview-api'
-import { CalendarDate } from '@internationalized/date'
import TvDateRange from '@/components/features/base/TvDateRange.vue'
import { useTasksStore } from '@/stores/tasks.store'
import { useGoalPermissions } from '@/composables/useGoalPermissions'
import type { DateRangeValue } from '@/types/tvDate.types'
+import { fromServerDateTime, toServerDateTime } from '@/helpers/taskDateTime'
const props = defineProps<{
task: Task
@@ -22,26 +22,21 @@ const props = defineProps<{
const tasksStore = useTasksStore()
const { canEditTaskDeadline } = useGoalPermissions()
-function parse(dateStr: string | null | undefined): CalendarDate | undefined {
- if (!dateStr) return undefined
- const [year, month, day] = dateStr.split('-').map(Number)
- if (!year || !month || !day) return undefined
- return new CalendarDate(year, month, day)
-}
-
-const range = computed<DateRangeValue>(() => ({
- start: parse(props.task.startDate),
- end: parse(props.task.endDate),
-}))
+const range = computed<DateRangeValue>(() => {
+ const start = fromServerDateTime(props.task.startDate, props.task.startTime)
+ const end = fromServerDateTime(props.task.endDate, props.task.endTime)
+ return { start: start?.date, startTime: start?.time, end: end?.date, endTime: end?.time }
+})
async function onUpdate(value: DateRangeValue | undefined) {
- const v = value ?? null
+ const start = toServerDateTime(value?.start && { date: value.start, time: value.startTime })
+ const end = toServerDateTime(value?.end && { date: value.end, time: value.endTime })
await tasksStore.saveDateForTask({
id: props.task.id,
- startDate: v?.start ? v.start.toString() : null,
- startTime: v?.start ? props.task.startTime : null,
- endDate: v?.end ? v.end.toString() : null,
- endTime: v?.end ? props.task.endTime : null,
+ startDate: start.date,
+ startTime: start.time,
+ endDate: end.date,
+ endTime: end.time,
})
}
</script>
diff --git a/web/src/helpers/taskDateTime.ts b/web/src/helpers/taskDateTime.ts
new file mode 100644
index 0000000..8935452
--- /dev/null
+++ b/web/src/helpers/taskDateTime.ts
@@ -0,0 +1,27 @@
+import { CalendarDate, Time } from '@internationalized/date'
+
+/** A task date as the user sees it: the local day, plus the local time when one is set. */
+export type LocalDateTime = { date: CalendarDate; time?: Time }
+
+/** Reads a stored task date. Dates with a time are stored in UTC; date-only values are calendar dates. */
+export function fromServerDateTime(date: string | null | undefined, time: string | null | undefined): LocalDateTime | undefined {
+ if (!date) return undefined
+ if (!time) {
+ const [year, month, day] = date.split('-').map(Number)
+ return year && month && day ? { date: new CalendarDate(year, month, day) } : undefined
+ }
+ const local = new Date(`${date}T${time.slice(0, 5)}:00Z`)
+ return {
+ date: new CalendarDate(local.getFullYear(), local.getMonth() + 1, local.getDate()),
+ time: new Time(local.getHours(), local.getMinutes()),
+ }
+}
+
+/** The stored form of a local date: with a time it is converted to UTC, without one it is kept as is. */
+export function toServerDateTime(value: LocalDateTime | undefined): { date: string | null; time: string | null } {
+ if (!value) return { date: null, time: null }
+ if (!value.time) return { date: value.date.toString(), time: null }
+ const { date, time } = value
+ const iso = new Date(date.year, date.month - 1, date.day, time.hour, time.minute).toISOString()
+ return { date: iso.slice(0, 10), time: `${iso.slice(11, 16)}:00` }
+}
diff --git a/web/src/locales/de.ts b/web/src/locales/de.ts
index f86d5e9..6b979fd 100644
--- a/web/src/locales/de.ts
+++ b/web/src/locales/de.ts
@@ -199,6 +199,8 @@ export default {
startDate: 'Startdatum',
endDate: 'Enddatum',
selectTime: 'Zeit auswählen',
+ startTime: 'Startzeit',
+ endTime: 'Endzeit',
selectRange: 'Zeitraum auswählen',
today: 'Heute',
tomorrow: 'Morgen',
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 0b0f829..98e607e 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -213,6 +213,8 @@ export default {
startDate: 'Start date',
endDate: 'End date',
selectTime: 'Select time',
+ startTime: 'Start time',
+ endTime: 'End time',
selectRange: 'Select range',
today: 'Today',
tomorrow: 'Tomorrow',
diff --git a/web/src/locales/es.ts b/web/src/locales/es.ts
index 4ae1c57..7d6359e 100644
--- a/web/src/locales/es.ts
+++ b/web/src/locales/es.ts
@@ -199,6 +199,8 @@ export default {
startDate: 'Fecha de inicio',
endDate: 'Fecha de fin',
selectTime: 'Seleccionar hora',
+ startTime: 'Hora de inicio',
+ endTime: 'Hora de fin',
selectRange: 'Seleccionar rango',
today: 'Hoy',
tomorrow: 'Mañana',
diff --git a/web/src/locales/pt-br.ts b/web/src/locales/pt-br.ts
index 7c6d139..53e93d6 100644
--- a/web/src/locales/pt-br.ts
+++ b/web/src/locales/pt-br.ts
@@ -212,6 +212,8 @@ export default {
startDate: 'Data de início',
endDate: 'Data de término',
selectTime: 'Selecionar horário',
+ startTime: 'Hora de início',
+ endTime: 'Hora de término',
selectRange: 'Selecionar período',
today: 'Hoje',
tomorrow: 'Amanhã',
diff --git a/web/src/locales/ru.ts b/web/src/locales/ru.ts
index a51c535..389870a 100644
--- a/web/src/locales/ru.ts
+++ b/web/src/locales/ru.ts
@@ -213,6 +213,8 @@ export default {
startDate: 'Дата начала',
endDate: 'Дата окончания',
selectTime: 'Выбрать время',
+ startTime: 'Время начала',
+ endTime: 'Время окончания',
selectRange: 'Выбрать период',
today: 'Сегодня',
tomorrow: 'Завтра',
diff --git a/web/src/types/tvDate.types.ts b/web/src/types/tvDate.types.ts
index 283b326..b63f928 100644
--- a/web/src/types/tvDate.types.ts
+++ b/web/src/types/tvDate.types.ts
@@ -1,6 +1,9 @@
-import type { CalendarDate } from '@internationalized/date'
+import type { CalendarDate, Time } from '@internationalized/date'
export type DateRangeValue = {
start: CalendarDate | undefined
end: CalendarDate | undefined
+ // Local times; unset means the date has no time
+ startTime?: Time
+ endTime?: Time
} | null