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

fix: added formatter in all DatePicker & DateTimePicker

Browse Source
This commit is contained in:
Shariq Ansari 2024-12-02 12:42:38 +05:30
parent d991eb52ef
commit 576e356e9d
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/Fields.vue
View File

@ -134,6 +134,7 @@
v-else-if="field.type === 'Datetime'" v-else-if="field.type === 'Datetime'"
v-model="data[field.name]" v-model="data[field.name]"
icon-left="" icon-left=""
:formatter="(date) => getFormat(date, '', true, true)"
:placeholder="getPlaceholder(field)" :placeholder="getPlaceholder(field)"
input-class="border-none" input-class="border-none"
/> />
@ -141,6 +142,7 @@
v-else-if="field.type === 'Date'" v-else-if="field.type === 'Date'"
icon-left="" icon-left=""
v-model="data[field.name]" v-model="data[field.name]"
:formatter="(date) => getFormat(date, '', true)"
:placeholder="getPlaceholder(field)" :placeholder="getPlaceholder(field)"
input-class="border-none" input-class="border-none"
/> />
@ -178,6 +180,7 @@ import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
import UserAvatar from '@/components/UserAvatar.vue' import UserAvatar from '@/components/UserAvatar.vue'
import Link from '@/components/Controls/Link.vue' import Link from '@/components/Controls/Link.vue'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { getFormat } from '@/utils'
import { Tooltip, DatePicker, DateTimePicker } from 'frappe-ui' import { Tooltip, DatePicker, DateTimePicker } from 'frappe-ui'
const { getUser } = usersStore() const { getUser } = usersStore()

3
frontend/src/components/Modals/TaskModal.vue
View File

@ -93,6 +93,7 @@
class="datepicker w-36" class="datepicker w-36"
v-model="_task.due_date" v-model="_task.due_date"
:placeholder="__('01/04/2024 11:30 PM')" :placeholder="__('01/04/2024 11:30 PM')"
:formatter="(date) => getFormat(date, '', true, true)"
input-class="border-none" input-class="border-none"
/> />
<Dropdown :options="taskPriorityOptions(updateTaskPriority)"> <Dropdown :options="taskPriorityOptions(updateTaskPriority)">
@ -114,7 +115,7 @@ import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
import ArrowUpRightIcon from '@/components/Icons/ArrowUpRightIcon.vue' import ArrowUpRightIcon from '@/components/Icons/ArrowUpRightIcon.vue'
import UserAvatar from '@/components/UserAvatar.vue' import UserAvatar from '@/components/UserAvatar.vue'
import Link from '@/components/Controls/Link.vue' import Link from '@/components/Controls/Link.vue'
import { taskStatusOptions, taskPriorityOptions } from '@/utils' import { taskStatusOptions, taskPriorityOptions, getFormat } from '@/utils'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { capture } from '@/telemetry' import { capture } from '@/telemetry'
import { TextEditor, Dropdown, Tooltip, call, DateTimePicker } from 'frappe-ui' import { TextEditor, Dropdown, Tooltip, call, DateTimePicker } from 'frappe-ui'

3
frontend/src/components/SectionFields.vue
View File

@ -152,6 +152,7 @@
<DateTimePicker <DateTimePicker
icon-left="" icon-left=""
:value="data[field.name]" :value="data[field.name]"
:formatter="(date) => getFormat(date, '', true, true)"
:placeholder="field.placeholder" :placeholder="field.placeholder"
placement="left-start" placement="left-start"
@change="(data) => emit('update', field.name, data)" @change="(data) => emit('update', field.name, data)"
@ -161,6 +162,7 @@
<DatePicker <DatePicker
icon-left="" icon-left=""
:value="data[field.name]" :value="data[field.name]"
:formatter="(date) => getFormat(date, '', true)"
:placeholder="field.placeholder" :placeholder="field.placeholder"
placement="left-start" placement="left-start"
@change="(data) => emit('update', field.name, data)" @change="(data) => emit('update', field.name, data)"
@ -202,6 +204,7 @@ import EditIcon from '@/components/Icons/EditIcon.vue'
import Link from '@/components/Controls/Link.vue' import Link from '@/components/Controls/Link.vue'
import UserAvatar from '@/components/UserAvatar.vue' import UserAvatar from '@/components/UserAvatar.vue'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { getFormat } from '@/utils'
import { Tooltip, DateTimePicker, DatePicker } from 'frappe-ui' import { Tooltip, DateTimePicker, DatePicker } from 'frappe-ui'
import { computed } from 'vue' import { computed } from 'vue'