diff --git a/frappe/desk/page/user_profile/user_profile.js b/frappe/desk/page/user_profile/user_profile.js
index 18faad911e..f3a57a0c0e 100644
--- a/frappe/desk/page/user_profile/user_profile.js
+++ b/frappe/desk/page/user_profile/user_profile.js
@@ -126,7 +126,7 @@ class UserProfile {
render_line_chart() {
this.line_chart_filters = {'user': this.user_id};
- this.line_chart_data = {
+ this.line_chart_config = {
timespan: 'Last Month',
time_interval: 'Daily',
type: 'Line',
@@ -156,10 +156,10 @@ class UserProfile {
}
update_line_chart_data() {
- this.line_chart_data.filters_json = JSON.stringify(this.line_chart_filters);
+ this.line_chart_config.filters_json = JSON.stringify(this.line_chart_filters);
frappe.xcall('frappe.desk.doctype.dashboard_chart.dashboard_chart.get', {
- chart: this.line_chart_data,
+ chart: this.line_chart_config,
no_cache: 1,
}).then(chart => {
this.line_chart.update(chart);
@@ -167,7 +167,7 @@ class UserProfile {
}
render_percentage_chart(field, title) {
- frappe.xcall('frappe.desk.page.user_profile.user_profile.get_energy_points_pie_chart_data', {
+ frappe.xcall('frappe.desk.page.user_profile.user_profile.get_energy_points_percentage_chart_data', {
user: this.user_id,
field: field
}).then(chart => {
@@ -208,7 +208,7 @@ class UserProfile {
label: 'Last Month',
options: ['Last Week', 'Last Month', 'Last Quarter'],
action: (selected_item) => {
- this.line_chart_data.timespan = selected_item;
+ this.line_chart_config.timespan = selected_item;
this.update_line_chart_data();
}
},
@@ -216,7 +216,7 @@ class UserProfile {
label: 'Daily',
options: ['Daily', 'Weekly', 'Monthly'],
action: (selected_item) => {
- this.line_chart_data.time_interval = selected_item;
+ this.line_chart_config.time_interval = selected_item;
this.update_line_chart_data();
}
},
@@ -270,14 +270,14 @@ class UserProfile {
options_html = filter.options.map( option => `
${option}`).join('');
}
- let dropdown_html= chart_filter_html + ``;
+ let dropdown_html = chart_filter_html + ``;
let $chart_filter = $(dropdown_html);
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)=> {
+ $chart_filter.find('.dropdown-menu').on('click', 'li a', (e) => {
let $el = $(e.currentTarget);
let fieldname;
if ($el.attr('data-fieldname')) {
diff --git a/frappe/desk/page/user_profile/user_profile.py b/frappe/desk/page/user_profile/user_profile.py
index 5cb95e1b08..4f3cc7aa9a 100644
--- a/frappe/desk/page/user_profile/user_profile.py
+++ b/frappe/desk/page/user_profile/user_profile.py
@@ -10,19 +10,20 @@ def get_energy_points_heatmap_data(user, date):
user = '{user}' and
type != 'Review'
group by date(creation)
- order by creation asc""".format(user=user, date = date)))
+ order by creation asc""".format(user = user, date = date)))
@frappe.whitelist()
-def get_energy_points_pie_chart_data(user, field):
+def get_energy_points_percentage_chart_data(user, field):
result = frappe.db.get_all('Energy Point Log',
- filters={'user': user, 'type': ['!=', 'Review']},
- group_by=field, order_by = field,
- fields=[field, 'ABS(sum(points)) as points'],
+ filters = {'user': user, 'type': ['!=', 'Review']},
+ group_by = field,
+ order_by = field,
+ fields = [field, 'ABS(sum(points)) as points'],
as_list = True)
return {
- "labels": [r[0] for r in result if r[0]!=None],
+ "labels": [r[0] for r in result if r[0] != None],
"datasets": [{
"values": [r[1] for r in result]
}]
@@ -36,7 +37,7 @@ def get_user_rank(user, date=None):
fields=['user', 'rank() over (order by sum(points) desc) as rank'],
as_list = True)
- return [r for r in result if r[0]==user]
+ return [r for r in result if r[0] == user]
@frappe.whitelist()
@@ -55,7 +56,10 @@ def update_profile_info(profile_info):
@frappe.whitelist()
def get_energy_points_list(start, limit, user):
- return frappe.db.get_list('Energy Point Log',filters = {'user': user, 'type': ['!=', 'Review']},
- fields=['name','user', 'points', 'reference_doctype', 'reference_name', 'reason',
+ return frappe.db.get_list('Energy Point Log',
+ filters = {'user': user, 'type': ['!=', 'Review']},
+ fields = ['name','user', 'points', 'reference_doctype', 'reference_name', 'reason',
'type', 'seen', 'rule', 'owner', 'creation', 'revert_of'],
- start=start, limit=limit, order_by='creation desc')
+ start = start,
+ limit = limit,
+ order_by = 'creation desc')