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

fix: minor fixes

Browse Source 
(cherry picked from commit 2584cca128628b3cb7afa8b2307bfe6e61c303c5)
This commit is contained in:
Shariq Ansari 2025-07-14 20:12:52 +05:30 committed by Mergify
parent 6f71d738b3
commit 859d93404d
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crm/api/dashboard.py
View File

@ -228,7 +228,7 @@ def get_average_ongoing_deal_value(from_date, to_date, user=""):
avg_value_delta = current_month_avg_value - prev_month_avg_value if prev_month_avg_value else 0 avg_value_delta = current_month_avg_value - prev_month_avg_value if prev_month_avg_value else 0
return { return {
"title": _("Avg ongoing deal value"), "title": _("Avg. ongoing deal value"),
"tooltip": _("Average deal value of non won/lost deals"), "tooltip": _("Average deal value of non won/lost deals"),
"value": current_month_avg_value, "value": current_month_avg_value,
"delta": avg_value_delta, "delta": avg_value_delta,
@ -344,7 +344,7 @@ def get_average_won_deal_value(from_date, to_date, user=""):
avg_value_delta = current_month_avg_value - prev_month_avg_value if prev_month_avg_value else 0 avg_value_delta = current_month_avg_value - prev_month_avg_value if prev_month_avg_value else 0
return { return {
"title": _("Avg won deal value"), "title": _("Avg. won deal value"),
"tooltip": _("Average deal value of won deals"), "tooltip": _("Average deal value of won deals"),
"value": current_month_avg_value, "value": current_month_avg_value,
"delta": avg_value_delta, "delta": avg_value_delta,
@ -401,7 +401,7 @@ def get_average_deal_value(from_date, to_date, user=""):
delta = current_month_avg - prev_month_avg if prev_month_avg else 0 delta = current_month_avg - prev_month_avg if prev_month_avg else 0
return { return {
"title": _("Avg deal value"), "title": _("Avg. deal value"),
"tooltip": _("Average deal value of ongoing & won deals"), "tooltip": _("Average deal value of ongoing & won deals"),
"value": current_month_avg, "value": current_month_avg,
"prefix": get_base_currency_symbol(), "prefix": get_base_currency_symbol(),
@ -454,7 +454,7 @@ def get_average_time_to_close_a_lead(from_date, to_date, user=""):
delta_lead = current_avg_lead - prev_avg_lead if prev_avg_lead else 0 delta_lead = current_avg_lead - prev_avg_lead if prev_avg_lead else 0
return { return {
"title": _("Avg time to close a lead"), "title": _("Avg. time to close a lead"),
"tooltip": _("Average time taken from lead creation to deal closure"), "tooltip": _("Average time taken from lead creation to deal closure"),
"value": current_avg_lead, "value": current_avg_lead,
"suffix": " days", "suffix": " days",
@ -508,7 +508,7 @@ def get_average_time_to_close_a_deal(from_date, to_date, user=""):
delta_deal = current_avg_deal - prev_avg_deal if prev_avg_deal else 0 delta_deal = current_avg_deal - prev_avg_deal if prev_avg_deal else 0
return { return {
"title": _("Avg time to close a deal"), "title": _("Avg. time to close a deal"),
"tooltip": _("Average time taken from deal creation to deal closure"), "tooltip": _("Average time taken from deal creation to deal closure"),
"value": current_avg_deal, "value": current_avg_deal,
"suffix": " days", "suffix": " days",

8
frontend/src/pages/Dashboard.vue
View File

@ -127,6 +127,7 @@
</div> </div>
</div> </div>
<AddChartModal <AddChartModal
v-if="showAddChartModal"
v-model="showAddChartModal" v-model="showAddChartModal"
v-model:items="dashboardItems.data" v-model:items="dashboardItems.data"
/> />
@ -142,6 +143,7 @@ import ViewBreadcrumbs from '@/components/ViewBreadcrumbs.vue'
import LayoutHeader from '@/components/LayoutHeader.vue' import LayoutHeader from '@/components/LayoutHeader.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 { copy } from '@/utils'
import { getLastXDays, formatter, formatRange } from '@/utils/dashboard' import { getLastXDays, formatter, formatRange } from '@/utils/dashboard'
import { import {
usePageMeta, usePageMeta,
@ -258,12 +260,12 @@ provide('filters', filters)
function enableEditing() { function enableEditing() {
editing.value = true editing.value = true
oldItems.value = JSON.parse(JSON.stringify(dashboardItems.data)) oldItems.value = copy(dashboardItems.data)
} }
function cancel() { function cancel() {
editing.value = false editing.value = false
dashboardItems.data = JSON.parse(JSON.stringify(oldItems.value)) dashboardItems.data = copy(oldItems.value)
} }
const saveDashboard = createResource({ const saveDashboard = createResource({
@ -276,7 +278,7 @@ const saveDashboard = createResource({
}) })
function save() { function save() {
const dashboardItemsCopy = JSON.parse(JSON.stringify(dashboardItems.data)) const dashboardItemsCopy = copy(dashboardItems.data)
dashboardItemsCopy.forEach((item: any) => { dashboardItemsCopy.forEach((item: any) => {
delete item.data delete item.data

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

@ -531,3 +531,8 @@ export function TemplateOption({ active, option, theme, icon, onClick }) {
], ],
) )
} }
export function copy(obj) {
if (!obj) return obj
return JSON.parse(JSON.stringify(obj))
}