Skip to content

fix: change inputs for date and time to date selectors #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2025
Merged

fix: change inputs for date and time to date selectors #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions adminforth/dataConnectors/mysql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,9 @@ class MysqlConnector extends AdminForthBaseConnector implements IAdminForthDataS
}
return dayjs(value).toISOString();
} else if (field.type == AdminForthDataTypes.DATE) {
if (!value) {
return null;
}
return dayjs(value).toISOString().split('T')[0];
return value || null;
} else if (field.type == AdminForthDataTypes.TIME) {
if (!value) {
return null;
}
return dayjs(value).toISOString().split('T')[1];
return value || null;
} else if (field.type == AdminForthDataTypes.BOOLEAN) {
return !!value;
} else if (field.type == AdminForthDataTypes.JSON) {
Expand Down
2 changes: 1 addition & 1 deletion adminforth/spa/src/components/ColumnValueInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
@update:modelValue="$emit('update:modelValue', $event)"
/>
<CustomDatePicker
v-else-if="['datetime'].includes(type || column.type)"
v-else-if="['datetime', 'date', 'time'].includes(type || column.type)"
ref="input"
:column="column"
:valueStart="value"
Expand Down
15 changes: 13 additions & 2 deletions adminforth/spa/src/components/CustomDatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div>
<label v-if="label" for="start-time" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">{{ label }}</label>

<div class="relative">
<div class="relative" :class="{hidden: column.type === 'time'}">
<div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">
<IconCalendar class="w-4 h-4 text-gray-500 dark:text-gray-400"/>
</div>
Expand Down Expand Up @@ -34,6 +34,7 @@

<button type="button"
class="text-lightPrimary dark:text-darkPrimary text-base font-medium hover:underline p-0 inline-flex items-center mb-2"
:class="{hidden: column.type !== 'datetime'}"
@click="toggleTimeInputs">{{ showTimeInputs ? $t('Hide time') : $t('Show time') }}
<svg class="w-8 h-8 ms-0.5" :class="{'rotate-180': showTimeInputs}" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" width="24" height="24"
Expand Down Expand Up @@ -81,7 +82,7 @@ const emit = defineEmits(['update:valueStart']);

const datepickerStartEl = ref();

const showTimeInputs = ref(false);
const showTimeInputs = ref(props.column?.type === 'time');

const startDate = ref('');

Expand All @@ -90,12 +91,20 @@ const startTime = ref('');
const datepickerObject = ref('')

const start = computed(() => {
if (props.column?.type === 'time') {
return formatTime(startTime.value);
}

if (!startDate.value) {
return;
}

let date = dayjs(startDate.value);

if (props.column?.type === 'date') {
return date.format('YYYY-MM-DD');
}

if (startTime.value) {
date = addTimeToDate(formatTime(startTime.value), date)
}
Expand All @@ -107,6 +116,8 @@ async function updateFromProps() {
if (!props.valueStart) {
datepickerStartEl.value.value = '';
startTime.value = '';
} else if (props.column.type === 'time') {
startTime.value = props.valueStart;
} else {
// wait ref to initialize
await nextTick();
Expand Down
42 changes: 32 additions & 10 deletions adminforth/spa/src/components/CustomDateRangePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<div class="mx-auto grid grid-cols-2 gap-4 mb-2">
<div class="mx-auto grid grid-cols-2 gap-4 mb-2" :class="{hidden: column.type === 'time'}">
<div class="relative">
<div class="absolute inset-y-0 end-0 top-0 flex items-center pe-3.5 pointer-events-none">
<IconCalendar class="w-4 h-4 text-gray-500 dark:text-gray-400"/>
Expand Down Expand Up @@ -51,6 +51,7 @@

<button type="button"
class="text-lightPrimary dark:text-darkPrimary text-base font-medium hover:underline p-0 inline-flex items-center mb-2"
:class="{hidden: column.type !== 'datetime'}"
@click="toggleTimeInputs">{{ showTimeInputs ? $t('Hide time') : $t('Show time') }}
<svg class="w-8 h-8 ms-0.5 relative top-px" :class="{'rotate-180': showTimeInputs}" aria-hidden="true"
xmlns="http://www.w3.org/2000/svg" width="24" height="24"
Expand Down Expand Up @@ -93,7 +94,7 @@ const emit = defineEmits(['update:valueStart', 'update:valueEnd']);
const datepickerStartEl = ref();
const datepickerEndEl = ref();

const showTimeInputs = ref(false);
const showTimeInputs = ref(props.column?.type === 'time');

const startDate = ref('');
const endDate = ref('');
Expand All @@ -105,12 +106,20 @@ const datepickerStartObject = ref('')
const datepickerEndObject = ref('')

const start = computed(() => {
if (props.column?.type === 'time') {
return formatTime(startTime.value);
}

if (!startDate.value) {
return;
}

let date = dayjs(startDate.value);

if (props.column?.type === 'date') {
return date.format('YYYY-MM-DD');
}

if (startTime.value) {
date = addTimeToDate(formatTime(startTime.value), date)
}
Expand All @@ -119,12 +128,20 @@ const start = computed(() => {
})

const end = computed(() => {
if (props.column?.type === 'time') {
return formatTime(endTime.value);
}

if (!endDate.value) {
return;
}

let date = dayjs(endDate.value);

if (props.column?.type === 'date') {
return date.format('YYYY-MM-DD');
}

if (endTime.value) {
date = addTimeToDate(formatTime(endTime.value), date)
} else {
Expand All @@ -135,7 +152,12 @@ const end = computed(() => {
})

function updateFromProps() {
if (props.valueStart) {
if (!props.valueStart) {
datepickerStartEl.value.value = '';
startTime.value = '';
} else if (props.column.type === 'time') {
startTime.value = props.valueStart;
} else {
const date = dayjs(props.valueStart);
datepickerStartEl.value.value = date.format('DD MMM YYYY');
if (date.format('HH:mm') !== '00:00') {
Expand All @@ -145,11 +167,14 @@ function updateFromProps() {
startTime.value = '';
}
startDate.value = date.toString();
} else {
datepickerStartEl.value.value = '';
startTime.value = '';
}
if (props.valueEnd) {

if (!props.valueEnd) {
datepickerEndEl.value.value = '';
endTime.value = '';
} else if (props.column.type === 'time') {
endTime.value = props.valueEnd;
} else {
const date = dayjs(props.valueEnd);
datepickerEndEl.value.value = date.format('DD MMM YYYY');
if (date.format('HH:mm') !== '00:00') {
Expand All @@ -159,9 +184,6 @@ function updateFromProps() {
endTime.value = '';
}
endDate.value = date.toString();
} else {
datepickerEndEl.value.value = '';
endTime.value = '';
}
}

Expand Down
11 changes: 1 addition & 10 deletions adminforth/spa/src/components/Filters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,14 @@
/>

<CustomDateRangePicker
v-else-if="['datetime'].includes(c.type)"
v-else-if="['datetime', 'date', 'time'].includes(c.type)"
:column="c"
:valueStart="filtersStore.filters.find(f => f.field === c.name && f.operator === 'gte')?.value || undefined"
@update:valueStart="setFilterItem({ column: c, operator: 'gte', value: $event || undefined })"
:valueEnd="filtersStore.filters.find(f => f.field === c.name && f.operator === 'lte')?.value || undefined"
@update:valueEnd="setFilterItem({ column: c, operator: 'lte', value: $event || undefined })"
/>

<Input
v-else-if="['date', 'time'].includes(c.type)"
type="text"
full-width
:placeholder="$t('Search datetime')"
@update:modelValue="setFilterItem({ column: c, operator: 'ilike', value: $event || undefined })"
:modelValue="getFilterItem({ column: c, operator: 'ilike' })"
/>

<CustomRangePicker
v-else-if="['integer', 'decimal', 'float'].includes(c.type) && c.allowMinMaxQuery"
:min="getFilterMinValue(c.name)"
Expand Down