diff --git a/frappe/desk/page/user_profile/user_profile.css b/frappe/desk/page/user_profile/user_profile.css index ac68c79b65..c05a52ada2 100644 --- a/frappe/desk/page/user_profile/user_profile.css +++ b/frappe/desk/page/user_profile/user_profile.css @@ -32,6 +32,12 @@ .heatmap-container { height: 170px } + +.performance-heatmap { + width: 80%; + display: inline-block; +} + .performance-heatmap .chart-container { margin-left: 30px; } @@ -57,6 +63,10 @@ height: 130px; } +.line-chart-container .chart-filter { + z-index: 1; +} + .recent-activity { margin: 20px; font-size: 12px; diff --git a/frappe/desk/page/user_profile/user_profile.js b/frappe/desk/page/user_profile/user_profile.js index 5a3daf47c3..0a26778dc0 100644 --- a/frappe/desk/page/user_profile/user_profile.js +++ b/frappe/desk/page/user_profile/user_profile.js @@ -224,7 +224,7 @@ class UserProfile { } }, ] - this.render_chart_filters(filters, '.line-chart-container'); + this.render_chart_filters(filters, '.line-chart-container', 1); } create_percentage_chart_filters() { @@ -255,7 +255,7 @@ class UserProfile { this.render_chart_filters(filters, '.heatmap-container'); } - render_chart_filters(filters, container) { + render_chart_filters(filters, container, append) { console.log(this.wrapper.find(container)); filters.forEach(filter => { let chart_filter_html = `
`; let $chart_filter = $(dropdown_html); - $chart_filter.prependTo(this.wrapper.find(container)); + + if (append) { + $chart_filter.prependTo(this.wrapper.find(container)); + } else $chart_filter.appendTo(this.wrapper.find(container)); + $chart_filter.find('.dropdown-menu').on('click', 'li a', (e)=> { let $el = $(e.currentTarget); let fieldname;