vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

update charts to latest (#4472)

Browse source
This commit is contained in:
Prateeksha Singh 2017-11-13 17:21:13 +05:30 • committed by Rushabh Mehta
parent c02a7469aa
commit 3bb628ffdb
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/page/activity/activity.js
View file

@ -186,7 +186,8 @@ frappe.activity.render_heatmap = function(page) {
height: 100,
start: new Date(moment().subtract(1, 'year').toDate()),
count_label: "actions",
discrete_domains: 0
discrete_domains: 0,
data: {}
});
heatmap.update(r.message);

2
frappe/public/build.json
View file

@ -142,7 +142,7 @@
"public/js/frappe/translate.js",
"public/js/lib/datepicker/datepicker.min.js",
"public/js/lib/datepicker/locale-all.js",
"public/js/lib/frappe-charts/frappe-charts.min.js",
"public/js/lib/frappe-charts/frappe-charts.min.iife.js",
"public/js/lib/jquery.jrumble.min.js",
"public/js/lib/webcam.min.js",
"public/js/lib/leaflet/leaflet.js",

3
frappe/public/js/frappe/form/dashboard.js
View file

@ -340,7 +340,8 @@ frappe.ui.form.Dashboard = Class.extend({
height: 100,
start: new Date(moment().subtract(1, 'year').toDate()),
count_label: frappe.model.scrub(this.frm.doctype) + "s",
discrete_domains: 0
discrete_domains: 0,
data: {}
});
// center the heatmap

1
frappe/public/js/lib/frappe-charts/frappe-charts.min.iife.js Executable file
View file

File diff suppressed because one or more lines are too long

2
frappe/public/js/lib/frappe-charts/frappe-charts.min.js vendored
View file

File diff suppressed because one or more lines are too long

4
frappe/utils/goal.py
View file

@ -136,10 +136,10 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
'formatted': values_formatted
}
],
'labels': months
'labels': months,
'specific_values': specific_values,
},
'specific_values': specific_values,
'summary': summary_values
}