adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 04:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

add date selector to time entries, fixes ST-134

Browse Source
This commit is contained in:
Gregor Vostrak
2024-06-05 15:41:56 +02:00
parent 2692db2a86
commit b1795392ad
6 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
resources/js/Components/Common/TimeRangeSelector.vue
View File

@@ -2,6 +2,7 @@
import { defineProps, ref, watch } from 'vue';
import TimePicker from '@/Components/Common/TimePicker.vue';
import { useFocusWithin } from '@vueuse/core';
import DatePicker from '@/Components/Common/DatePicker.vue';
const props = defineProps<{
start: string;
@@ -35,21 +36,32 @@ watch(focused, (newValue, oldValue) => {
<template>
<div
ref="dropdownContent"
class="grid grid-cols-2 divide-x divide-card-background-separator text-center py-1">
<div>
<div class="font-bold text-white text-sm pb-1">Start</div>
<TimePicker
data-testid="time_entry_range_start"
@changed="updateTimeEntry"
v-model="tempStart"></TimePicker>
class="grid grid-cols-2 divide-x divide-card-background-separator text-center py-2">
<div class="px-2">
<div class="font-bold text-white text-sm pb-2">Start</div>
<div class="space-y-1">
<TimePicker
data-testid="time_entry_range_start"
@changed="updateTimeEntry"
v-model="tempStart"></TimePicker>
<DatePicker
class="text-sm px-2 py-1"
@changed="updateTimeEntry"
v-model="tempStart"></DatePicker>
</div>
</div>
<div>
<div class="font-bold text-white text-sm pb-1">End</div>
<TimePicker
v-if="tempEnd !== null"
data-testid="time_entry_range_end"
@changed="updateTimeEntry"
v-model="tempEnd"></TimePicker>
<div class="px-2">
<div class="font-bold text-white text-sm pb-2">End</div>
<div v-if="tempEnd !== null" class="space-y-1">
<TimePicker
data-testid="time_entry_range_end"
@changed="updateTimeEntry"
v-model="tempEnd"></TimePicker>
<DatePicker
class="text-sm px-2 py-1"
@changed="updateTimeEntry"
v-model="tempEnd"></DatePicker>
</div>
<div class="text-muted" v-else>-- : --</div>
</div>
</div>