From 8c7e9527087d4f429e7d1c63909e57c8bd4be384 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 26 Aug 2021 21:43:44 +0530 Subject: [PATCH 1/4] fix: Show Document Status (docstatus) in list view through status indicator pill --- frappe/public/icons/timeless/symbol-defs.svg | 10 ++++++++++ frappe/public/js/frappe/list/list_view.js | 4 +++- frappe/public/js/frappe/utils/utils.js | 7 +++++-- frappe/public/scss/common/indicator.scss | 10 ++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index f216374526..533edc962a 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -709,4 +709,14 @@ + + + + + + + + + + diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 8a0e43c8f3..6c6e59c248 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -950,9 +950,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { get_indicator_html(doc) { const indicator = frappe.get_indicator(doc, this.doctype); + const icon = doc.docstatus == 1 ? 'submitted' : doc.docstatus == 2 ? 'cancelled' : 'dot'; if (indicator) { - return ` + ${frappe.utils.icon(icon, 'xs', '', indicator[1])} ${__(indicator[0])} `; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 21841296dc..12b883a552 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1114,14 +1114,17 @@ Object.assign(frappe.utils, { } }, - icon(icon_name, size="sm", icon_class="") { + icon(icon_name, size="sm", icon_class="", stroke_color="") { let size_class = ""; let icon_style = ""; if (typeof size == "object") { - icon_style = `width: ${size.width}; height: ${size.height}`; + icon_style = `width: ${size.width}; height: ${size.height};`; } else { size_class = `icon-${size}`; } + if (stroke_color) { + icon_style += `stroke: ${stroke_color};`; + } return ` `; diff --git a/frappe/public/scss/common/indicator.scss b/frappe/public/scss/common/indicator.scss index 62d7cacc9d..600373baec 100644 --- a/frappe/public/scss/common/indicator.scss +++ b/frappe/public/scss/common/indicator.scss @@ -176,3 +176,13 @@ @keyframes blink { 50% { opacity: 0.5; } } + +.indicator-pill-icon { + margin-right: 3px; +} + +.list-indicator-pill::before { + content: ''; + width: unset; + margin-right: unset; +} From 4f31f9c501f9deb6febe22d23b27cfcc211c846e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 30 Aug 2021 11:48:39 +0530 Subject: [PATCH 2/4] fix: Show Document Status (docstatus) as a title on hovering the Status Indicator Pill --- frappe/public/icons/timeless/symbol-defs.svg | 10 ---------- frappe/public/js/frappe/list/list_view.js | 8 ++++---- frappe/public/js/frappe/utils/utils.js | 7 ++----- frappe/public/scss/common/indicator.scss | 12 +----------- 4 files changed, 7 insertions(+), 30 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 1732548bbc..b2f1428967 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -709,14 +709,4 @@ - - - - - - - - - - diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 914807f57a..f304d313b4 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -952,11 +952,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { get_indicator_html(doc) { const indicator = frappe.get_indicator(doc, this.doctype); - const icon = doc.docstatus == 1 ? 'submitted' : doc.docstatus == 2 ? 'cancelled' : 'dot'; + const title = doc.docstatus == 1 ? 'Document has been submitted' : doc.docstatus == 2 ? + 'Document has been cancelled' : 'Document is in draft state'; if (indicator) { - return ` - ${frappe.utils.icon(icon, 'xs', '', indicator[1])} + return ` ${__(indicator[0])} `; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 12b883a552..21841296dc 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1114,17 +1114,14 @@ Object.assign(frappe.utils, { } }, - icon(icon_name, size="sm", icon_class="", stroke_color="") { + icon(icon_name, size="sm", icon_class="") { let size_class = ""; let icon_style = ""; if (typeof size == "object") { - icon_style = `width: ${size.width}; height: ${size.height};`; + icon_style = `width: ${size.width}; height: ${size.height}`; } else { size_class = `icon-${size}`; } - if (stroke_color) { - icon_style += `stroke: ${stroke_color};`; - } return ` `; diff --git a/frappe/public/scss/common/indicator.scss b/frappe/public/scss/common/indicator.scss index 600373baec..13162ab6b1 100644 --- a/frappe/public/scss/common/indicator.scss +++ b/frappe/public/scss/common/indicator.scss @@ -175,14 +175,4 @@ @keyframes blink { 50% { opacity: 0.5; } -} - -.indicator-pill-icon { - margin-right: 3px; -} - -.list-indicator-pill::before { - content: ''; - width: unset; - margin-right: unset; -} +} \ No newline at end of file From f84344592a29a3eb2a60b961e595d0ea04322dfd Mon Sep 17 00:00:00 2001 From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> Date: Mon, 30 Aug 2021 13:31:07 +0530 Subject: [PATCH 3/4] Apply suggestions from code review Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/list/list_view.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index f304d313b4..c35b5e2d51 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -952,11 +952,16 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { get_indicator_html(doc) { const indicator = frappe.get_indicator(doc, this.doctype); - const title = doc.docstatus == 1 ? 'Document has been submitted' : doc.docstatus == 2 ? - 'Document has been cancelled' : 'Document is in draft state'; + // sequence is important + const docstatus_description = [ + __('Document is in draft state'), + __('Document has been submitted'), + __('Document has been cancelled') + ] + const title = docstatus_description[doc.docstatus || 0] if (indicator) { return ` + data-filter='${indicator[2]}' title='${title}'> ${__(indicator[0])} `; } From 7c7eb68e4df5990ec75a8cbdf84cb6f717c69fe2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 30 Aug 2021 14:00:40 +0530 Subject: [PATCH 4/4] fix: sider fix --- frappe/public/js/frappe/list/list_view.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index c35b5e2d51..503309515c 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -957,8 +957,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { __('Document is in draft state'), __('Document has been submitted'), __('Document has been cancelled') - ] - const title = docstatus_description[doc.docstatus || 0] + ]; + const title = docstatus_description[doc.docstatus || 0]; if (indicator) { return `