Remove unnecessary columns Analytics Reports (#13344)
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index de3d337..442a8bb 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -67,10 +67,7 @@
this.tree_grid = this.tree_grids[this.tree_type];
var std_columns = [
- {id: "_check", name: __("Plot"), field: "_check", width: 30,
- formatter: this.check_formatter},
- {id: "name", name: this.tree_grid.label, field: "name", width: 300,
- formatter: this.tree_formatter},
+ {id: "name", name: this.tree_grid.label, field: "name", width: 300},
{id: "total", name: "Total", field: "total", plot: false,
formatter: this.currency_formatter}
];
@@ -103,8 +100,7 @@
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
- this.show_zero_check()
- this.setup_chart_check();
+ this.show_zero_check();
},
init_filter_values: function() {
this._super();
diff --git a/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js b/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js
index 971d810..aeab4fc 100644
--- a/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js
+++ b/erpnext/healthcare/page/appointment_analytic/appointment_analytic.js
@@ -42,10 +42,7 @@
this.tree_grid = this.tree_grids[this.tree_type];
var std_columns = [
- {id: "_check", name: __("Plot"), field: "_check", width: 40,
- formatter: this.check_formatter},
- {id: "name", name: this.tree_grid.label, field: "name", width: 300,
- formatter: this.tree_formatter},
+ {id: "name", name: this.tree_grid.label, field: "name", width: 300},
{id: "total", name: "Total", field: "total", plot: false,
formatter: this.currency_formatter}
];
@@ -87,7 +84,6 @@
this.trigger_refresh_on_change(["tree_type", "physician", "department", "status", "type"]);
// this.show_zero_check()
- this.setup_chart_check();
},
init_filter_values: function() {
this._super();
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.js b/erpnext/manufacturing/page/production_analytics/production_analytics.js
index f75bccf..1647313 100644
--- a/erpnext/manufacturing/page/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.js
@@ -26,9 +26,7 @@
setup_columns: function() {
var std_columns = [
- {id: "_check", name: __("Plot"), field: "_check", width: 30,
- formatter: this.check_formatter},
- {id: "name", name: __("Status"), field: "name", width: 100},
+ {id: "name", name: __("Status"), field: "name", width: 100}
];
this.make_date_range_columns();
@@ -51,8 +49,7 @@
this.trigger_refresh_on_change(["company"]);
this.trigger_refresh_on_change(["range"]);
- this.show_zero_check()
- this.setup_chart_check();
+ this.show_zero_check();
},
init_filter_values: function() {
@@ -64,7 +61,9 @@
var chart_data = this.get_chart_data ? this.get_chart_data() : null;
- this.chart = new Chart(".chart", {
+ const parent = this.wrapper.find('.chart')[0];
+ this.chart = new Chart(parent, {
+ height: 200,
data: chart_data,
type: 'line'
});
diff --git a/erpnext/public/js/account_tree_grid.js b/erpnext/public/js/account_tree_grid.js
index 5769298..757f33e 100644
--- a/erpnext/public/js/account_tree_grid.js
+++ b/erpnext/public/js/account_tree_grid.js
@@ -36,8 +36,7 @@
},
setup_columns: function() {
this.columns = [
- {id: "name", name: __("Account"), field: "name", width: 300, cssClass: "cell-title",
- formatter: this.tree_formatter},
+ {id: "name", name: __("Account"), field: "name", width: 300, cssClass: "cell-title"},
{id: "opening_dr", name: __("Opening (Dr)"), field: "opening_dr", width: 100,
formatter: this.currency_formatter},
{id: "opening_cr", name: __("Opening (Cr)"), field: "opening_cr", width: 100,
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index 74f5c03..140c9dc 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -34,10 +34,7 @@
},
setup_columns: function() {
var std_columns = [
- {id: "_check", name: __("Plot"), field: "_check", width: 30,
- formatter: this.check_formatter},
- {id: "name", name: __("Item"), field: "name", width: 300,
- formatter: this.tree_formatter},
+ {id: "name", name: __("Item"), field: "name", width: 300},
{id: "brand", name: __("Brand"), field: "brand", width: 100},
{id: "stock_uom", name: __("UOM"), field: "stock_uom", width: 100},
{id: "opening", name: __("Opening"), field: "opening", hidden: true,
@@ -77,7 +74,6 @@
this.trigger_refresh_on_change(["value_or_qty", "brand", "warehouse", "range"]);
this.show_zero_check();
- this.setup_chart_check();
},
init_filter_values: function() {
this._super();
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
index 5e603ba..f5caf1d 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.js
@@ -34,7 +34,7 @@
item_key: "customer",
parent_field: "parent_customer_group",
formatter: function(item) {
- return item.customer_name? item.customer_name + " (" + item.name + ")" : item.name;
+ return item.customer_name? item.customer_name + " (" + item.name + ")" : item.name;
}
},
"Customer": {
@@ -77,10 +77,7 @@
this.tree_grid = this.tree_grids[this.tree_type];
var std_columns = [
- {id: "check", name: "Plot", field: "check", width: 30,
- formatter: this.check_formatter},
- {id: "name", name: this.tree_grid.label, field: "name", width: 300,
- formatter: this.tree_formatter},
+ {id: "name", name: this.tree_grid.label, field: "name", width: 300},
{id: "total", name: "Total", field: "total", plot: false,
formatter: this.currency_formatter}
];
@@ -114,8 +111,7 @@
this.trigger_refresh_on_change(["value_or_qty", "tree_type", "based_on", "company"]);
- this.show_zero_check()
- this.setup_chart_check();
+ this.show_zero_check();
},
init_filter_values: function() {
this._super();
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index bca5987..4db5c73 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -33,7 +33,7 @@
{fieldname: "range", fieldtype:"Select", label: __("Range"),
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"], default_value: "Monthly"}
],
-
+
init_filter_values: function() {
this._super();
this.filter_inputs.range.val('Monthly');
@@ -41,8 +41,6 @@
setup_columns: function() {
var std_columns = [
- {id: "_check", name: __("Plot"), field: "_check", width: 30,
- formatter: this.check_formatter},
{id: "name", name: __("Status"), field: "name", width: 100},
];
this.make_date_range_columns();