test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

Merge pull request #455 from shariquerik/date-time-format

Browse Source 
feat: format date, datetime based on system settings date & time format
This commit is contained in:
Shariq Ansari 2024-12-02 13:38:39 +05:30 committed by GitHub
commit f214890146
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 163 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
crm/www/crm.py
View File

@ -3,8 +3,14 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import add_user_info, cint, get_system_timezone
from frappe.utils import cint, get_system_timezone
from frappe.utils.telemetry import capture
from frappe.locale import (
get_date_format,
get_first_day_of_the_week,
get_number_format,
get_time_format,
)
no_cache = 1
@ -34,24 +40,22 @@ def get_boot():
"read_only_mode": frappe.flags.read_only,
"csrf_token": frappe.sessions.get_csrf_token(),
"setup_complete": cint(frappe.get_system_settings("setup_complete")),
"sysdefaults": {
"float_precision": cint(frappe.get_system_settings("float_precision"))
or 3,
"date_format": get_date_format(),
"time_format": get_time_format(),
"first_day_of_the_week": get_first_day_of_the_week(),
"number_format": get_number_format().string,
},
"timezone": {
"system": get_system_timezone(),
"user": get_user_info()
.get(frappe.session.user, {})
.get("time_zone", None)
"user": frappe.db.get_value("User", frappe.session.user, "time_zone")
or get_system_timezone(),
}
},
}
)
def get_user_info():
# get info for current user
user_info = frappe._dict()
add_user_info(frappe.session.user, user_info)
return user_info
def get_default_route():
return "/crm"

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

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

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

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

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

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

2
frontend/src/pages/CallLogs.vue
View File

@ -82,7 +82,7 @@ const rows = computed(() => {
return callLogs.value?.data.data.map((callLog) => {
let _rows = {}
callLogs.value?.data.rows.forEach((row) => {
_rows[row] = getCallLogDetail(row, callLog)
_rows[row] = getCallLogDetail(row, callLog, callLogs.value?.data.columns)
})
return _rows
})

12
frontend/src/pages/Contacts.vue
View File

@ -109,6 +109,18 @@ const rows = computed(() => {
contacts.value?.data.rows.forEach((row) => {
_rows[row] = contact[row]
let fieldType = contacts.value?.data.columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(contact[row], '', true, fieldType == 'Datetime')
}
if (row == 'full_name') {
_rows[row] = {
label: contact.full_name,

27
frontend/src/pages/Deals.vue
View File

@ -335,15 +335,16 @@ const rows = computed(() => {
return getGroupedByRows(
deals.value?.data.data,
deals.value?.data.group_by_field,
deals.value.data.columns,
)
} else if (deals.value.data.view_type === 'kanban') {
return getKanbanRows(deals.value.data.data)
return getKanbanRows(deals.value.data.data, deals.value.data.fields)
} else {
return parseRows(deals.value?.data.data)
return parseRows(deals.value?.data.data, deals.value.data.columns)
}
})
function getGroupedByRows(listRows, groupByField) {
function getGroupedByRows(listRows, groupByField, columns) {
let groupedRows = []
groupByField.options?.forEach((option) => {
@ -359,7 +360,7 @@ function getGroupedByRows(listRows, groupByField) {
label: groupByField.label,
group: option || __(' '),
collapsed: false,
rows: parseRows(filteredRows),
rows: parseRows(filteredRows, columns),
}
if (groupByField.name == 'status') {
groupDetail.icon = () =>
@ -373,22 +374,34 @@ function getGroupedByRows(listRows, groupByField) {
return groupedRows || listRows
}
function getKanbanRows(data) {
function getKanbanRows(data, columns) {
let _rows = []
data.forEach((column) => {
column.data?.forEach((row) => {
_rows.push(row)
})
})
return parseRows(_rows)
return parseRows(_rows, columns)
}
function parseRows(rows) {
function parseRows(rows, columns = []) {
return rows.map((deal) => {
let _rows = {}
deals.value.data.rows.forEach((row) => {
_rows[row] = deal[row]
let fieldType = columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(deal[row], '', true, fieldType == 'Datetime')
}
if (row == 'organization') {
_rows[row] = {
label: deal.organization,

17
frontend/src/pages/EmailTemplates.vue
View File

@ -98,6 +98,23 @@ const rows = computed(() => {
emailTemplates.value?.data.rows.forEach((row) => {
_rows[row] = emailTemplate[row]
let fieldType = emailTemplates.value?.data.columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(
emailTemplate[row],
'',
true,
fieldType == 'Datetime',
)
}
if (['modified', 'creation'].includes(row)) {
_rows[row] = {
label: formatDate(emailTemplate[row]),

27
frontend/src/pages/Leads.vue
View File

@ -349,15 +349,16 @@ const rows = computed(() => {
return getGroupedByRows(
leads.value?.data.data,
leads.value?.data.group_by_field,
leads.value.data.columns,
)
} else if (leads.value.data.view_type === 'kanban') {
return getKanbanRows(leads.value.data.data)
return getKanbanRows(leads.value.data.data, leads.value.data.fields)
} else {
return parseRows(leads.value?.data.data)
return parseRows(leads.value?.data.data, leads.value.data.columns)
}
})
function getGroupedByRows(listRows, groupByField) {
function getGroupedByRows(listRows, groupByField, columns) {
let groupedRows = []
groupByField.options?.forEach((option) => {
@ -373,7 +374,7 @@ function getGroupedByRows(listRows, groupByField) {
label: groupByField.label,
group: option || __(' '),
collapsed: false,
rows: parseRows(filteredRows),
rows: parseRows(filteredRows, columns),
}
if (groupByField.name == 'status') {
groupDetail.icon = () =>
@ -387,22 +388,34 @@ function getGroupedByRows(listRows, groupByField) {
return groupedRows || listRows
}
function getKanbanRows(data) {
function getKanbanRows(data, columns) {
let _rows = []
data.forEach((column) => {
column.data?.forEach((row) => {
_rows.push(row)
})
})
return parseRows(_rows)
return parseRows(_rows, columns)
}
function parseRows(rows) {
function parseRows(rows, columns = []) {
return rows.map((lead) => {
let _rows = {}
leads.value?.data.rows.forEach((row) => {
_rows[row] = lead[row]
let fieldType = columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(lead[row], '', true, fieldType == 'Datetime')
}
if (row == 'lead_name') {
_rows[row] = {
label: lead.lead_name,

17
frontend/src/pages/Organizations.vue
View File

@ -103,6 +103,23 @@ const rows = computed(() => {
organizations.value?.data.rows.forEach((row) => {
_rows[row] = organization[row]
let fieldType = organizations.value?.data.columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(
organization[row],
'',
true,
fieldType == 'Datetime',
)
}
if (row === 'organization_name') {
_rows[row] = {
label: organization.organization_name,

22
frontend/src/pages/Tasks.vue
View File

@ -237,28 +237,40 @@ const rows = computed(() => {
if (!tasks.value?.data?.data) return []
if (tasks.value.data.view_type === 'kanban') {
return getKanbanRows(tasks.value.data.data)
return getKanbanRows(tasks.value.data.data, tasks.value.data.fields)
}
return parseRows(tasks.value?.data.data)
return parseRows(tasks.value?.data.data, tasks.value?.data.columns)
})
function getKanbanRows(data) {
function getKanbanRows(data, columns) {
let _rows = []
data.forEach((column) => {
column.data?.forEach((row) => {
_rows.push(row)
})
})
return parseRows(_rows)
return parseRows(_rows, columns)
}
function parseRows(rows) {
function parseRows(rows, columns = []) {
return rows.map((task) => {
let _rows = {}
tasks.value?.data.rows.forEach((row) => {
_rows[row] = task[row]
let fieldType = columns?.find(
(col) => (col.key || col.value) == row,
)?.type
if (
fieldType &&
['Date', 'Datetime'].includes(fieldType) &&
!['modified', 'creation'].includes(row)
) {
_rows[row] = formatDate(task[row], '', true, fieldType == 'Datetime')
}
if (['modified', 'creation'].includes(row)) {
_rows[row] = {
label: formatDate(task[row]),

9
frontend/src/utils/callLog.js
View File

@ -5,7 +5,7 @@ import { contactsStore } from '@/stores/contacts'
const { getUser } = usersStore()
const { getContact, getLeadContact } = contactsStore()
export function getCallLogDetail(row, log) {
export function getCallLogDetail(row, log, columns = []) {
let incoming = log.type === 'Incoming'
if (row === 'caller') {
@ -51,6 +51,13 @@ export function getCallLogDetail(row, log) {
timeAgo: __(timeAgo(log[row])),
}
}
let fieldType = columns?.find((col) => (col.key || col.value) == row)?.type
if (fieldType && ['Date', 'Datetime'].includes(fieldType)) {
return formatDate(log[row], '', true, fieldType == 'Datetime')
}
return log[row]
}

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

@ -3,7 +3,7 @@ import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
import { usersStore } from '@/stores/users'
import { gemoji } from 'gemoji'
import { useTimeAgo } from '@vueuse/core'
import { toast, convertToUserTimezone } from 'frappe-ui'
import { toast, convertToUserTimezone, luxonDate } from 'frappe-ui'
import { h } from 'vue'
export function createToast(options) {
@ -38,10 +38,34 @@ export function formatTime(seconds) {
return formattedTime.trim()
}
export function formatDate(date, format = 'EEE, MMM d, yyyy h:mm a') {
export function formatDate(date, format, onlyDate = false, onlyTime = false) {
format = getFormat(date, format, onlyDate, onlyTime, false)
return convertToUserTimezone(date, format)
}
export function getFormat(
date,
format,
onlyDate = false,
onlyTime = false,
withDate = true,
) {
if (!date) return ''
let dateFormat =
window.sysdefaults.date_format.replace('mm', 'MM') || 'yyyy-MM-dd'
let timeFormat = window.sysdefaults.time_format || 'HH:mm:ss'
format = format || 'EEE, MMM d, yyyy h:mm a'
if (onlyDate) format = dateFormat
if (onlyTime) format = timeFormat
if (onlyTime && onlyDate) format = `${dateFormat} ${timeFormat}`
if (withDate) {
return luxonDate(date).toFormat(format)
}
return format
}
export function timeAgo(date) {
return useTimeAgo(date).value
}