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

fix: use vueuse/core timeAgo function & updated date formats supported by luxon

Browse Source
This commit is contained in:
Shariq Ansari 2024-11-29 21:51:43 +05:30
parent c5cf1ca07a
commit 1d1f6f5891
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/Activities/TaskArea.vue
View File

@ -19,11 +19,11 @@
</div>
<div v-if="task.due_date">
<Tooltip
:text="formatDate(task.due_date, 'E, MMM d, yyyy | hh:mm aaa')"
:text="formatDate(task.due_date, 'EEE, MMM d, yyyy | hh:mm a')"
>
<div class="flex gap-2">
<CalendarIcon />
<div>{{ formatDate(task.due_date, 'd MMM, hh:mm aaa') }}</div>
<div>{{ formatDate(task.due_date, 'd MMM, hh:mm a') }}</div>
</div>
</Tooltip>
</div>

4
frontend/src/components/Activities/WhatsAppArea.vue
View File

@ -127,9 +127,9 @@
/>
</div>
<div class="-mb-1 flex shrink-0 items-end gap-1 text-ink-gray-5">
<Tooltip :text="formatDate(whatsapp.creation, 'E, MMM d, yyyy')">
<Tooltip :text="formatDate(whatsapp.creation, 'EEE, MMM d, yyyy')">
<div class="text-2xs">
{{ formatDate(whatsapp.creation, 'hh:mm aaa') }}
{{ formatDate(whatsapp.creation, 'hh:mm a') }}
</div>
</Tooltip>
<div v-if="whatsapp.type == 'Outgoing'">

4
frontend/src/components/ListViews/TasksListView.vue
View File

@ -40,12 +40,12 @@
>
<div v-if="column.key === 'due_date'">
<Tooltip
:text="item && formatDate(item, 'E, MMM d, yyyy | hh:mm aaa')"
:text="item && formatDate(item, 'EEE, MMM d, yyyy | hh:mm a')"
>
<div class="flex items-center gap-2 truncate text-base">
<div><CalendarIcon /></div>
<div v-if="item" class="truncate">
{{ formatDate(item, 'd MMM, hh:mm aaa') }}
{{ formatDate(item, 'd MMM, hh:mm a') }}
</div>
</div>
</Tooltip>

7
frontend/src/utils/index.js
View File

@ -2,7 +2,8 @@ import TaskStatusIcon from '@/components/Icons/TaskStatusIcon.vue'
import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
import { usersStore } from '@/stores/users'
import { gemoji } from 'gemoji'
import { toast, convertToUserTimezone, formatAsTimeAgo } from 'frappe-ui'
import { useTimeAgo } from '@vueuse/core'
import { toast, convertToUserTimezone } from 'frappe-ui'
import { h } from 'vue'
export function createToast(options) {
@ -37,12 +38,12 @@ export function formatTime(seconds) {
return formattedTime.trim()
}
export function formatDate(date, format = 'E, MMM d, yyyy h:mm a') {
export function formatDate(date, format = 'EEE, MMM d, yyyy h:mm a') {
return convertToUserTimezone(date, format)
}
export function timeAgo(date) {
return formatAsTimeAgo(date)
return useTimeAgo(date).value
}
export function taskStatusOptions(action, data) {