test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update date formatting in DatePicker components and remove unused formatter imports

Browse Source
This commit is contained in:
Shariq Ansari 2025-09-02 17:13:28 +05:30
parent 92b79c2195
commit 2503dea30f
6 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/Calendar/CalendarEventPanel.vue
View File

@ -200,8 +200,9 @@
:class="['[&_input]:w-[216px]']" :class="['[&_input]:w-[216px]']"
variant="outline" variant="outline"
:value="_event.fromDate" :value="_event.fromDate"
:formatter="(date) => getFormat(date, 'MMM D, YYYY')" :format="'MMM D, YYYY'"
:placeholder="__('May 1, 2025')" :placeholder="__('May 1, 2025')"
:clearable="false"
@update:modelValue="(date) => updateDate(date, true)" @update:modelValue="(date) => updateDate(date, true)"
> >
<template #suffix="{ togglePopover }"> <template #suffix="{ togglePopover }">
@ -351,7 +352,7 @@ import DescriptionIcon from '@/components/Icons/DescriptionIcon.vue'
import TimePicker from '@/components/Calendar/TimePicker.vue' import TimePicker from '@/components/Calendar/TimePicker.vue'
import { globalStore } from '@/stores/global' import { globalStore } from '@/stores/global'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { getFormat, validateEmail } from '@/utils' import { validateEmail } from '@/utils'
import { allTimeSlots } from '@/components/Calendar/utils' import { allTimeSlots } from '@/components/Calendar/utils'
import { import {
TextInput, TextInput,

2
frontend/src/components/Controls/Grid.vue
View File

@ -183,7 +183,7 @@
:value="row[field.fieldname]" :value="row[field.fieldname]"
icon-left="" icon-left=""
variant="outline" variant="outline"
:formatter="(date) => getFormat(date, '', true)" :format="getFormat('', '', true, false, false)"
input-class="border-none text-sm text-ink-gray-8" input-class="border-none text-sm text-ink-gray-8"
@change="(v) => fieldChange(v, field, row)" @change="(v) => fieldChange(v, field, row)"
/> />

2
frontend/src/components/FieldLayout/Field.vue
View File

@ -141,7 +141,7 @@
<DatePicker <DatePicker
v-else-if="field.fieldtype === 'Date'" v-else-if="field.fieldtype === 'Date'"
:value="data[field.fieldname]" :value="data[field.fieldname]"
:formatter="(date) => getFormat(date, '', true)" :format="getFormat('', '', true, false, false)"
:placeholder="getPlaceholder(field)" :placeholder="getPlaceholder(field)"
input-class="border-none" input-class="border-none"
@change="(v) => fieldChange(v, field)" @change="(v) => fieldChange(v, field)"

4
frontend/src/components/Modals/EventModal.vue
View File

@ -68,8 +68,9 @@
:class="[_event.isFullDay ? 'w-full' : 'w-[158px]']" :class="[_event.isFullDay ? 'w-full' : 'w-[158px]']"
variant="outline" variant="outline"
:value="_event.fromDate" :value="_event.fromDate"
:formatter="(date) => getFormat(date, 'MMM D, YYYY')" :format="'MMM D, YYYY'"
:placeholder="__('May 1, 2025')" :placeholder="__('May 1, 2025')"
:clearable="false"
@update:modelValue="(date) => updateDate(date, true)" @update:modelValue="(date) => updateDate(date, true)"
> >
<template #suffix="{ togglePopover }"> <template #suffix="{ togglePopover }">
@ -160,7 +161,6 @@ import {
dayjs, dayjs,
} from 'frappe-ui' } from 'frappe-ui'
import { globalStore } from '@/stores/global' import { globalStore } from '@/stores/global'
import { getFormat } from '@/utils'
import { onMounted, ref, computed } from 'vue' import { onMounted, ref, computed } from 'vue'
const props = defineProps({ const props = defineProps({

2
frontend/src/components/SidePanelLayout.vue
View File

@ -252,7 +252,7 @@
<DatePicker <DatePicker
icon-left="" icon-left=""
:value="doc[field.fieldname]" :value="doc[field.fieldname]"
:formatter="(date) => getFormat(date, '', true)" :format="getFormat('', '', true, false, false)"
:placeholder="field.placeholder" :placeholder="field.placeholder"
placement="left-start" placement="left-start"
:hideIcon="true" :hideIcon="true"

18
frontend/src/pages/Calendar.vue
View File

@ -52,11 +52,21 @@
<!-- left side --> <!-- left side -->
<!-- Month Year --> <!-- Month Year -->
<div class="flex items-center"> <div class="flex items-center">
<DateMonthYearPicker <DatePicker
:modelValue="selectedMonthDate" :modelValue="selectedMonthDate"
:formatter="() => currentMonthYear"
@update:modelValue="(val) => onMonthYearChange(val)" @update:modelValue="(val) => onMonthYearChange(val)"
/> :clearable="false"
>
<template #target="{ togglePopover }">
<Button
variant="ghost"
class="text-lg font-medium text-ink-gray-7"
:label="currentMonthYear"
iconRight="chevron-down"
@click="togglePopover"
/>
</template>
</DatePicker>
</div> </div>
<!-- right side --> <!-- right side -->
<!-- actions buttons for calendar --> <!-- actions buttons for calendar -->
@ -125,7 +135,7 @@ import {
createListResource, createListResource,
TabButtons, TabButtons,
dayjs, dayjs,
DateMonthYearPicker, DatePicker,
CalendarActiveEvent as activeEvent, CalendarActiveEvent as activeEvent,
call, call,
} from 'frappe-ui' } from 'frappe-ui'