Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13270 from pratu16x7/charts-fix

Browse Source 
Update Charts to v1
This commit is contained in:
Prateeksha Singh 2018-03-12 10:56:49 +05:30 committed by GitHub
commit 71166d46f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/balance_sheet/balance_sheet.py
View File

@ -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": {

6
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@ -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": {

2
erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
View File

@ -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])
}]
},

4
erpnext/hr/report/vehicle_expenses/vehicle_expenses.py
View File

@ -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 = {

3
erpnext/manufacturing/page/production_analytics/production_analytics.js
View File

@ -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'
});

2
erpnext/support/report/minutes_to_first_response_for_issues/minutes_to_first_response_for_issues.js
View File

@ -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])
}]
},

5
erpnext/utilities/page/leaderboard/leaderboard.js
View File

@ -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);
}
@ -280,7 +279,7 @@ frappe.Leaderboard = Class.extend({
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">