From ecccc6340f80f1c5a9f4a3b418837d695b87c03b Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Mon, 14 Jul 2025 17:36:50 +0530 Subject: [PATCH] fix: use tooltip from data (cherry picked from commit 0f06715d0cdf967240783aa97d996becc92dcd4c) --- crm/api/dashboard.py | 17 +++++++++-------- .../src/components/Dashboard/DashboardItem.vue | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/crm/api/dashboard.py b/crm/api/dashboard.py index 6e7b3e4f..a9910a70 100644 --- a/crm/api/dashboard.py +++ b/crm/api/dashboard.py @@ -85,6 +85,7 @@ def get_total_leads(from_date, to_date, user=""): return { "title": _("Total leads"), + "tooltip": _("Total number of leads"), "value": current_month_leads, "delta": delta_in_percentage, "deltaSuffix": "%", @@ -124,7 +125,7 @@ def get_ongoing_deals(from_date, to_date, user=""): END) as prev_month_deals FROM `tabCRM Deal` d JOIN `tabCRM Deal Status` s ON d.status = s.name - """, + """, { "from_date": from_date, "to_date": to_date, @@ -142,6 +143,7 @@ def get_ongoing_deals(from_date, to_date, user=""): return { "title": _("Ongoing deals"), + "tooltip": _("Total number of non won/lost deals"), "value": current_month_deals, "delta": delta_in_percentage, "deltaSuffix": "%", @@ -197,10 +199,10 @@ def get_average_ongoing_deal_value(from_date, to_date, user=""): return { "title": _("Avg ongoing deal value"), + "tooltip": _("Average deal value of non won/lost deals"), "value": current_month_avg_value, "delta": avg_value_delta, "prefix": get_base_currency_symbol(), - "tooltip": _("Average deal value of ongoing deals"), } @@ -256,10 +258,10 @@ def get_won_deals(from_date, to_date, user=""): return { "title": _("Won deals"), + "tooltip": _("Total number of won deals based on its closure date"), "value": current_month_deals, "delta": delta_in_percentage, "deltaSuffix": "%", - "tooltip": _("Total number of won deals based on its closure date"), } @@ -313,10 +315,10 @@ def get_average_won_deal_value(from_date, to_date, user=""): return { "title": _("Avg won deal value"), + "tooltip": _("Average deal value of won deals"), "value": current_month_avg_value, "delta": avg_value_delta, "prefix": get_base_currency_symbol(), - "tooltip": _("Average deal value of won deals"), } @@ -370,10 +372,9 @@ def get_average_deal_value(from_date, to_date, user=""): return { "title": _("Avg deal value"), - "value": current_month_avg, "tooltip": _("Average deal value of ongoing & won deals"), + "value": current_month_avg, "prefix": get_base_currency_symbol(), - # "suffix": "K", "delta": delta, "deltaSuffix": "%", } @@ -424,8 +425,8 @@ def get_average_time_to_close_a_lead(from_date, to_date, user=""): return { "title": _("Avg time to close a lead"), - "value": current_avg_lead, "tooltip": _("Average time taken from lead creation to deal closure"), + "value": current_avg_lead, "suffix": " days", "delta": delta_lead, "deltaSuffix": " days", @@ -478,8 +479,8 @@ def get_average_time_to_close_a_deal(from_date, to_date, user=""): return { "title": _("Avg time to close a deal"), - "value": current_avg_deal, "tooltip": _("Average time taken from deal creation to deal closure"), + "value": current_avg_deal, "suffix": " days", "delta": delta_deal, "deltaSuffix": " days", diff --git a/frontend/src/components/Dashboard/DashboardItem.vue b/frontend/src/components/Dashboard/DashboardItem.vue index dfecbce5..fa289163 100644 --- a/frontend/src/components/Dashboard/DashboardItem.vue +++ b/frontend/src/components/Dashboard/DashboardItem.vue @@ -4,7 +4,7 @@ v-if="item.type == 'number_card'" class="rounded shadow overflow-hidden cursor-pointer" > - +