Analytics report graph fix

This commit is contained in:
deepeshgarg007 2018-12-15 15:36:09 +05:30
parent 871f4e5df5
commit 1ee19e4167
3 changed files with 34 additions and 8 deletions

View File

@ -77,9 +77,20 @@ frappe.query_reports["Purchase Analytics"] = {
events: {
onCheckRow: function(data) {
row_name = data[2].content;
row_values = data.slice(5).map(function (column) {
return column.content;
})
length = data.length;
var tree_type = frappe.query_report.filters[0].value;
if(tree_type == "Supplier" || tree_type == "Item") {
row_values = data.slice(4,length-1).map(function (column) {
return column.content;
})
}
else {
row_values = data.slice(3,length-1).map(function (column) {
return column.content;
})
}
entry = {
'name':row_name,

View File

@ -76,10 +76,21 @@ frappe.query_reports["Sales Analytics"] = {
events: {
onCheckRow: function(data) {
row_name = data[2].content;
length = data.length
row_values = data.slice(4,length-1).map(function (column) {
return column.content;
})
length = data.length;
var tree_type = frappe.query_report.filters[0].value;
if(tree_type == "Customer" || tree_type == "Item") {
row_values = data.slice(4,length-1).map(function (column) {
return column.content;
})
}
else {
row_values = data.slice(3,length-1).map(function (column) {
return column.content;
})
}
entry = {
'name':row_name,
'values':row_values

View File

@ -276,7 +276,11 @@ class Analytics(object):
def get_chart_data(self):
length = len(self.columns)
labels = [d.get("label") for d in self.columns[2:length-1]]
if self.filters.tree_type in ["Customer", "Supplier", "Item"]:
labels = [d.get("label") for d in self.columns[2:length-1]]
else:
labels = [d.get("label") for d in self.columns[1:length-1]]
self.chart = {
"data": {
'labels': labels,