From c12f4bc0995ab9fe6c7cf542afb6addad6a3a8c4 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Tue, 18 Jun 2019 12:53:20 +0530 Subject: [PATCH 1/6] feat(Sidebar): Add group by to list sidebar --- frappe/desk/listview.py | 23 ++++- frappe/public/build.json | 1 + .../public/js/frappe/list/list_sidebar.html | 19 +++- frappe/public/js/frappe/list/list_sidebar.js | 99 +++++++++++++++++++ .../js/frappe/list/list_sidebar_group_by.html | 15 +++ 5 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 frappe/public/js/frappe/list/list_sidebar_group_by.html diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index f31aae401e..7bac07e357 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -49,4 +49,25 @@ def get_user_assignments_and_count(doctype, current_filters): count desc limit 50""".format(subquery_condition = subquery_condition), as_dict=True) - return todo_list \ No newline at end of file + return todo_list + +@frappe.whitelist() +def get_group_by_count(doctype, current_filters, field): + current_filters = json.loads(current_filters) + subquery= '' + if current_filters: + subquery = frappe.get_all(doctype, + filters=current_filters, return_query = True) + subquery = subquery[subquery.index('where'):subquery.index('order')] + + group_by_list = frappe.db.sql("""select `tab{doctype}`.{field} as name, count(*) as count + from + `tab{doctype}` + {subquery} + group by + `tab{doctype}`.{field} + order by + count desc + limit 50""".format(subquery= subquery, doctype = doctype, field = field), as_dict=True) + + return group_by_list diff --git a/frappe/public/build.json b/frappe/public/build.json index 203a642195..e36b29f9dd 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -276,6 +276,7 @@ "public/js/frappe/list/list_sidebar.js", "public/js/frappe/list/list_sidebar.html", "public/js/frappe/list/list_sidebar_stat.html", + "public/js/frappe/list/list_sidebar_group_by.html", "public/js/frappe/list/list_view_permission_restrictions.html", "public/js/frappe/views/gantt/gantt_view.js", diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html index c8c2239b03..09a58251a7 100644 --- a/frappe/public/js/frappe/list/list_sidebar.html +++ b/frappe/public/js/frappe/list/list_sidebar.html @@ -52,8 +52,15 @@ -
  • {{ __("Help") }}
    • + {% } %} + + + + `; - } + }; let html = this.group_by_fields.map(get_item_html).join(''); this.$wrapper.find('.list-group-by-fields').html(html); } @@ -91,7 +91,7 @@ frappe.views.ListGroupBy = class ListGroupBy { }); } - get_group_by_dropdown_fields() { + get_group_by_dropdown_fields() { let group_by_fields = []; let fields = this.list_view.meta.fields.filter((f)=> ["Select", "Link"].includes(f.fieldtype)); group_by_fields.push({ @@ -115,7 +115,7 @@ frappe.views.ListGroupBy = class ListGroupBy { doctype: this.doctype, current_filters: this.list_view.get_filters_for_args(), field: field, - } + }; return frappe.call('frappe.desk.listview.get_group_by_count', args).then((data) => { if(field === 'assigned_to') { let current_user = data.message.find(user => user.name === frappe.session.user); @@ -139,7 +139,7 @@ frappe.views.ListGroupBy = class ListGroupBy { ${name} ${field.count} `; - } + }; let standard_html = `
    @@ -151,7 +151,7 @@ frappe.views.ListGroupBy = class ListGroupBy { setup_filter_by() { this.$wrapper.on("click", ".group-by-item", (e) => { - let field = $(e.currentTarget).parents('.group-by-field').find('a').attr('data-fieldname');å + let field = $(e.currentTarget).parents('.group-by-field').find('a').attr('data-fieldname'); let value = $(e.currentTarget).find($('.group-by-value')).text().trim(); let fieldname = field === 'assigned_to'? '_assign': field; this.list_view.filter_area.remove(field); @@ -164,4 +164,4 @@ frappe.views.ListGroupBy = class ListGroupBy { }); } -} \ No newline at end of file +}; \ No newline at end of file From 5c7cf6d0666c3c22d851caa3ae9033832a84ae8e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 10 Jul 2019 13:51:15 +0530 Subject: [PATCH 6/6] fix: Simplify count, dropdown rendering and filter --- .../js/frappe/list/list_sidebar_group_by.js | 70 +++++++++++-------- frappe/public/less/sidebar.less | 1 + 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/frappe/public/js/frappe/list/list_sidebar_group_by.js b/frappe/public/js/frappe/list/list_sidebar_group_by.js index aaab5a1422..288f95b511 100644 --- a/frappe/public/js/frappe/list/list_sidebar_group_by.js +++ b/frappe/public/js/frappe/list/list_sidebar_group_by.js @@ -80,8 +80,8 @@ frappe.views.ListGroupBy = class ListGroupBy { this.$wrapper.on('click', '.group-by-field', (e)=> { let dropdown = $(e.currentTarget).find('.group-by-dropdown'); let fieldname = $(e.currentTarget).find('a').attr('data-fieldname'); - this.get_group_by_count(fieldname).then((field_count_list)=> { - if(field_count_list.length) { + this.get_group_by_count(fieldname).then(field_count_list => { + if (field_count_list.length) { this.render_dropdown_items(field_count_list, dropdown); this.sidebar.setup_dropdown_search(dropdown, '.group-by-value'); } else { @@ -110,39 +110,39 @@ frappe.views.ListGroupBy = class ListGroupBy { } get_group_by_count(field) { - let field_list = []; let args = { doctype: this.doctype, current_filters: this.list_view.get_filters_for_args(), field: field, }; - return frappe.call('frappe.desk.listview.get_group_by_count', args).then((data) => { - if(field === 'assigned_to') { - let current_user = data.message.find(user => user.name === frappe.session.user); - if(current_user) { - field_list = [{'name':'Me', 'count':current_user.count}]; - } - field_list = field_list.concat( - data.message.filter(user => !['Guest', frappe.session.user, 'Administrator'].includes(user.name) && user.count!==0) - ); - } else { - field_list = data.message.filter(field => field.count!==0); + return frappe.call('frappe.desk.listview.get_group_by_count', args).then((r) => { + let field_counts = r.message || []; + field_counts = field_counts.filter(f => f.count !== 0); + if (field === 'assigned_to') { + field_counts = field_counts.filter(f => !['Guest', 'Administrator'].includes(f.name)); } - return field_list; + return field_counts; }); } render_dropdown_items(fields, dropdown) { let get_dropdown_html = (field) => { - let name = field.name === null ? 'Not Specified': field.name; - return `
  • - ${name} - ${field.count} -
    • `; + let label = field.name == null ? __('Not Specified') : field.name; + if (label === frappe.session.user) { + label = __('Me'); + } + let value = field.name == null ? '' : encodeURIComponent(field.name); + + return `
  • + + ${label} + ${field.count} + +
    • `; }; let standard_html = `
    - +
    `; let dropdown_html = standard_html + fields.map(get_dropdown_html).join(''); @@ -150,17 +150,25 @@ frappe.views.ListGroupBy = class ListGroupBy { } setup_filter_by() { - this.$wrapper.on("click", ".group-by-item", (e) => { - let field = $(e.currentTarget).parents('.group-by-field').find('a').attr('data-fieldname'); - let value = $(e.currentTarget).find($('.group-by-value')).text().trim(); - let fieldname = field === 'assigned_to'? '_assign': field; - this.list_view.filter_area.remove(field); - if(value === 'Not Specified') { - this.list_view.filter_area.add(this.doctype, fieldname, "like", ''); - } else { - if(value === 'Me') value = frappe.session.user; - this.list_view.filter_area.add(this.doctype, fieldname, "like", `%${value}%`); + this.$wrapper.on('click', '.group-by-item', (e) => { + let $target = $(e.currentTarget); + let fieldname = $target.parents('.group-by-field').find('a').data('fieldname'); + let value = decodeURIComponent($target.data('value').trim()); + fieldname = fieldname === 'assigned_to' ? '_assign': fieldname; + + this.list_view.filter_area.remove(fieldname); + + let operator = '='; + if (value === '') { + operator = 'is'; + value = 'not set'; } + if (fieldname === '_assign') { + operator = 'like'; + value = `%${value}%`; + } + + this.list_view.filter_area.add(this.doctype, fieldname, operator, value); }); } diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index 9bb05123d5..ee9f607d80 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -376,6 +376,7 @@ body[data-route^="Module"] .main-menu { color: @text-muted; text-transform: uppercase; margin-bottom: 0; + font-size: @text-small; } .group-by-count {