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

removed total from graph

Browse Source
This commit is contained in:
deepeshgarg007 2018-11-26 16:52:15 +05:30
parent 9170c2daab
commit 05c2989698
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/report/sales_analytics/sales_analytics.js
View File

@ -73,7 +73,8 @@ frappe.query_reports["Sales Analytics"] = {
events: { events: {
onCheckRow: function(data) { onCheckRow: function(data) {
row_name = data[2].content; row_name = data[2].content;
row_values = data.slice(4).map(function (column) { length = data.length
row_values = data.slice(4,length-1).map(function (column) {
return column.content; return column.content;
}) })
entry = { entry = {
@ -102,12 +103,12 @@ frappe.query_reports["Sales Analytics"] = {
labels: raw_data.labels, labels: raw_data.labels,
datasets: new_datasets datasets: new_datasets
} }
setTimeout(() => { setTimeout(() => {
frappe.query_report.chart.update(new_data) frappe.query_report.chart.update(new_data)
},200) },200)
setTimeout(() => { setTimeout(() => {
frappe.query_report.chart.draw(true); frappe.query_report.chart.draw(true);
}, 800) }, 800)

9
erpnext/selling/report/sales_analytics/sales_analytics.py
View File

@ -166,7 +166,7 @@ class Analytics(object):
for entity, period_data in iteritems(self.entity_periodic_data): for entity, period_data in iteritems(self.entity_periodic_data):
row = { row = {
"entity": entity, "entity": entity,
"entity_name": self.entity_names.get(entity) "entity_name": self.entity_names.get(entity)
} }
total = 0 total = 0
for dummy, end_date in self.periodic_daterange: for dummy, end_date in self.periodic_daterange:
@ -177,7 +177,7 @@ class Analytics(object):
row["total"] = total row["total"] = total
self.data.append(row) self.data.append(row)
def get_rows_by_group(self): def get_rows_by_group(self):
self.get_periodic_data() self.get_periodic_data()
out = [] out = []
@ -185,7 +185,7 @@ class Analytics(object):
for d in reversed(self.group_entries): for d in reversed(self.group_entries):
row = { row = {
"entity": d.name, "entity": d.name,
"indent": self.depth_map.get(d.name) "indent": self.depth_map.get(d.name)
} }
total = 0 total = 0
for dummy, end_date in self.periodic_daterange: for dummy, end_date in self.periodic_daterange:
@ -275,7 +275,8 @@ class Analytics(object):
self.parent_child_map = frappe._dict(frappe.db.sql(""" select name, supplier_group from `tabSupplier`""")) self.parent_child_map = frappe._dict(frappe.db.sql(""" select name, supplier_group from `tabSupplier`"""))
def get_chart_data(self): def get_chart_data(self):
labels = [d.get("label") for d in self.columns[2:]] length = len(self.columns)
labels = [d.get("label") for d in self.columns[2:length-1]]
self.chart = { self.chart = {
"data": { "data": {
'labels': labels, 'labels': labels,

9
erpnext/stock/report/stock_analytics/stock_analytics.js
View File

@ -88,10 +88,9 @@ frappe.query_reports["Stock Analytics"] = {
events: { events: {
onCheckRow: function(data) { onCheckRow: function(data) {
row_name = data[2].content; row_name = data[2].content;
row_values = data.slice(6).map(function (column) { row_values = data.slice(7).map(function (column) {
return column.content; return column.content;
}) })
entry = { entry = {
'name':row_name, 'name':row_name,
'values':row_values 'values':row_values
@ -118,12 +117,12 @@ frappe.query_reports["Stock Analytics"] = {
labels: raw_data.labels, labels: raw_data.labels,
datasets: new_datasets datasets: new_datasets
} }
setTimeout(() => { setTimeout(() => {
frappe.query_report.chart.update(new_data) frappe.query_report.chart.update(new_data)
},200) },200)
setTimeout(() => { setTimeout(() => {
frappe.query_report.chart.draw(true); frappe.query_report.chart.draw(true);
}, 800) }, 800)

6
erpnext/stock/report/stock_analytics/stock_analytics.py
View File

@ -167,13 +167,11 @@ def get_data(filters):
return data return data
def get_chart_data(columns): def get_chart_data(columns):
labels = [d.get("label") for d in columns[4:]] labels = [d.get("label") for d in columns[5:]]
chart = { chart = {
"data": { "data": {
'labels': labels, 'labels': labels,
'datasets':[ 'datasets':[]
{ "values": ['0' for d in columns[4:]] }
]
} }
} }
chart["type"] = "line" chart["type"] = "line"