[charts] update, without new build system
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.js b/erpnext/manufacturing/page/production_analytics/production_analytics.js
index efbd0a5..21b4293 100644
--- a/erpnext/manufacturing/page/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.js
@@ -64,8 +64,7 @@
var chart_data = this.get_chart_data ? this.get_chart_data() : null;
- this.chart = new Chart({
- parent: ".chart",
+ this.chart = new frappeChart.Chart(".chart", {
data: chart_data,
type: 'line'
});
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 060218d..44b0c00 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -266,7 +266,6 @@
task_doc.append('depends_on', {"task": dt_name})
task_doc.save()
-@frappe.whitelist()
def get_timeline_data(doctype, name):
'''Return timeline for attendance'''
return dict(frappe.db.sql('''select unix_timestamp(from_time), count(*)
diff --git a/erpnext/projects/doctype/project/project_dashboard.py b/erpnext/projects/doctype/project/project_dashboard.py
index be33c9d..0ac7d6f 100644
--- a/erpnext/projects/doctype/project/project_dashboard.py
+++ b/erpnext/projects/doctype/project/project_dashboard.py
@@ -4,7 +4,6 @@
return {
'heatmap': True,
'heatmap_message': _('This is based on the Time Sheets created against this project'),
- 'method' : 'erpnext.projects.doctype.project.project.get_timeline_data',
'fieldname': 'project',
'transactions': [
{
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
index 1a9efd5..1c085f2 100644
--- a/erpnext/utilities/page/leaderboard/leaderboard.js
+++ b/erpnext/utilities/page/leaderboard/leaderboard.js
@@ -146,7 +146,6 @@
me.$graph_area.show().empty();
let args = {
- parent: '.leaderboard-graph',
data: {
datasets: [
{
@@ -160,7 +159,7 @@
type: 'bar',
height: 140
};
- new Chart(args);
+ new frappeChart.Chart('.leaderboard-graph', args);
notify(me, r, $container);
}
@@ -280,7 +279,7 @@
fields.map(col => {
let val = item[col];
if(col=="name") {
- var formatted_value = `<a class="grey list-id ellipsis"
+ var formatted_value = `<a class="grey list-id ellipsis"
href="#Form/${me.options.selected_doctype}/${item["name"]}"> ${val} </a>`
} else {
var formatted_value = `<span class="text-muted ellipsis">