[charts] update charts API
This commit is contained in:
parent
fd75d554d2
commit
9362cf37e0
@ -132,11 +132,11 @@ def get_chart_data(filters, columns, asset, liability, equity):
|
||||
|
||||
datasets = []
|
||||
if asset_data:
|
||||
datasets.append({'title':'Assets', 'values': asset_data})
|
||||
datasets.append({'name':'Assets', 'values': asset_data})
|
||||
if liability_data:
|
||||
datasets.append({'title':'Liabilities', 'values': liability_data})
|
||||
datasets.append({'name':'Liabilities', 'values': liability_data})
|
||||
if equity_data:
|
||||
datasets.append({'title':'Equity', 'values': equity_data})
|
||||
datasets.append({'name':'Equity', 'values': equity_data})
|
||||
|
||||
chart = {
|
||||
"data": {
|
||||
|
@ -75,11 +75,11 @@ def get_chart_data(filters, columns, income, expense, net_profit_loss):
|
||||
|
||||
datasets = []
|
||||
if income_data:
|
||||
datasets.append({'title': 'Income', 'values': income_data})
|
||||
datasets.append({'name': 'Income', 'values': income_data})
|
||||
if expense_data:
|
||||
datasets.append({'title': 'Expense', 'values': expense_data})
|
||||
datasets.append({'name': 'Expense', 'values': expense_data})
|
||||
if net_profit:
|
||||
datasets.append({'title': 'Net Profit/Loss', 'values': net_profit})
|
||||
datasets.append({'name': 'Net Profit/Loss', 'values': net_profit})
|
||||
|
||||
chart = {
|
||||
"data": {
|
||||
|
@ -23,7 +23,7 @@ frappe.query_reports["Minutes to First Response for Opportunity"] = {
|
||||
data: {
|
||||
labels: result.map(d => d[0]),
|
||||
datasets: [{
|
||||
title: 'Mins to first response',
|
||||
name: 'Mins to first response',
|
||||
values: result.map(d => d[1])
|
||||
}]
|
||||
},
|
||||
|
@ -69,12 +69,12 @@ def get_chart_data(data,period_list):
|
||||
datasets = []
|
||||
if fuel_exp_data:
|
||||
datasets.append({
|
||||
'title': 'Fuel Expenses',
|
||||
'name': 'Fuel Expenses',
|
||||
'values': fuel_exp_data
|
||||
})
|
||||
if service_exp_data:
|
||||
datasets.append({
|
||||
'title': 'Service Expenses',
|
||||
'name': 'Service Expenses',
|
||||
'values': service_exp_data
|
||||
})
|
||||
chart = {
|
||||
|
@ -64,8 +64,7 @@ erpnext.ProductionAnalytics = frappe.views.GridReportWithPlot.extend({
|
||||
|
||||
var chart_data = this.get_chart_data ? this.get_chart_data() : null;
|
||||
|
||||
this.chart = new Chart({
|
||||
parent: ".chart",
|
||||
this.chart = new Chart(".chart", {
|
||||
data: chart_data,
|
||||
type: 'line'
|
||||
});
|
||||
|
@ -20,7 +20,7 @@ frappe.query_reports["Minutes to First Response for Issues"] = {
|
||||
data: {
|
||||
labels: result.map(d => d[0]),
|
||||
datasets: [{
|
||||
title: 'Mins to first response',
|
||||
name: 'Mins to first response',
|
||||
values: result.map(d => d[1])
|
||||
}]
|
||||
},
|
||||
|
@ -146,7 +146,6 @@ frappe.Leaderboard = Class.extend({
|
||||
|
||||
me.$graph_area.show().empty();
|
||||
let args = {
|
||||
parent: '.leaderboard-graph',
|
||||
data: {
|
||||
datasets: [
|
||||
{
|
||||
@ -160,7 +159,7 @@ frappe.Leaderboard = Class.extend({
|
||||
type: 'bar',
|
||||
height: 140
|
||||
};
|
||||
new Chart(args);
|
||||
new Chart('.leaderboard-graph', args);
|
||||
|
||||
notify(me, r, $container);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user