From 0364789690d4b178f40b565ecef0099454609e6d Mon Sep 17 00:00:00 2001 From: pateljannat Date: Fri, 5 Mar 2021 12:36:17 +0530 Subject: [PATCH 1/4] fix: display progress on the bar for gantt --- frappe/public/js/frappe/views/gantt/gantt_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index 0bc82d3f70..f67ab7c73c 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -51,7 +51,7 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView { // title var label; if (meta.title_field) { - label = $.format("{0} ({1})", [item[meta.title_field], item.name]); + label = $.format("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]); } else { label = item[field_map.title]; } From b21e73cf00e89e67bbc7d6bc9b21602e0c584c57 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Wed, 10 Mar 2021 10:39:40 +0530 Subject: [PATCH 2/4] fix: handled no progress field scenario --- frappe/public/js/frappe/views/gantt/gantt_view.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index f67ab7c73c..985de5ef3e 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -50,8 +50,10 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView { // title var label; - if (meta.title_field) { + if (meta.title_field && item.progress) { label = $.format("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]); + } else if (meta.title_field) { + label = $.format("{0} ({1})", [item[meta.title_field], item.name]); } else { label = item[field_map.title]; } From 9e6946417e90a0b8f5a3f5b9d9f056c3b1314f5c Mon Sep 17 00:00:00 2001 From: pateljannat Date: Wed, 10 Mar 2021 15:39:45 +0530 Subject: [PATCH 3/4] fix: conditions --- frappe/public/js/frappe/views/gantt/gantt_view.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index 985de5ef3e..01cca3c765 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -50,10 +50,10 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView { // title var label; - if (meta.title_field && item.progress) { - label = $.format("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]); - } else if (meta.title_field) { - label = $.format("{0} ({1})", [item[meta.title_field], item.name]); + if (meta.title_field) { + label = item.progress + ? __("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]) + : __("{0} ({1})", [item[meta.title_field], item.name]); } else { label = item[field_map.title]; } From deec4c4681d778112363839f50bdf82db34e7f92 Mon Sep 17 00:00:00 2001 From: pateljannat Date: Thu, 11 Mar 2021 11:19:43 +0530 Subject: [PATCH 4/4] fix: indentation --- frappe/public/js/frappe/views/gantt/gantt_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/gantt/gantt_view.js b/frappe/public/js/frappe/views/gantt/gantt_view.js index 01cca3c765..8e181157f9 100644 --- a/frappe/public/js/frappe/views/gantt/gantt_view.js +++ b/frappe/public/js/frappe/views/gantt/gantt_view.js @@ -52,8 +52,8 @@ frappe.views.GanttView = class GanttView extends frappe.views.ListView { var label; if (meta.title_field) { label = item.progress - ? __("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]) - : __("{0} ({1})", [item[meta.title_field], item.name]); + ? __("{0} ({1}) - {2}%", [item[meta.title_field], item.name, item.progress]) + : __("{0} ({1})", [item[meta.title_field], item.name]); } else { label = item[field_map.title]; }