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

Got proper cumulative data working

Browse Source
This commit is contained in:
Ben Cornwell-Mott 2017-02-05 13:39:39 -08:00
parent 943124275d
commit b4a2c2f047
1 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,11 +55,22 @@ erpnext.ProductionAnalytics = frappe.views.GridReportWithPlot.extend({
this.show_zero_check() this.show_zero_check()
this.setup_chart_check(); this.setup_chart_check();
}, },
init_filter_values: function() { init_filter_values: function() {
this._super(); this._super();
this.filter_inputs.range.val('Monthly'); this.filter_inputs.range.val('Monthly');
}, },
setup_chart: function() {
var me = this;
var chart_data = this.get_chart_data ? this.get_chart_data() : null;
this.chart = new frappe.ui.Chart({
wrapper: this.chart_area,
data: chart_data
});
},
prepare_data: function() { prepare_data: function() {
// add Opening, Closing, Totals rows // add Opening, Closing, Totals rows
@ -76,37 +87,43 @@ erpnext.ProductionAnalytics = frappe.views.GridReportWithPlot.extend({
var completed = {name:"Completed", "id":"completed-pos", var completed = {name:"Completed", "id":"completed-pos",
checked:true}; checked:true};
$.each(frappe.report_dump.data["Production Order"], function(i, d) { $.each(frappe.report_dump.data["Production Order"], function(i, d) {
var dateobj = dateutil.str_to_obj(d.creation); var dateobj = dateutil.str_to_obj(d.creation);
var date = d.creation.split(" ")[0]; var date = dateutil.str_to_user(d.creation.split(" ")[0]);
var col = me.column_map[date];
if(col) { $.each(me.columns, function(i,col) {
var start_period = dateutil.str_to_obj(col.name); if (i > 1){
var end_period = dateutil.str_to_obj(col.id); if (i == 14){
all_open_orders[col.field] = flt(all_open_orders[col.field]) + 1; var temp = 0;
if(d.status=="Completed") {
completed[col.field] = flt(completed[col.field]) + 1;
}else if(d.status=="In Process") {
pending[col.field] = flt(pending[col.field]) + 1;
}else if(d.status=="Not Started") {
if (d.planned_start_date > start_period) {
not_started[col.field] = flt(not_started[col.field]) + 1;
}else if (d.planned_start_date < end_period) {
overdue[col.field] = flt(overdue[col.field]) + 1;
}else if (d.planned_start_date < d.actual_start_date) {
not_started[col.field] = flt(not_started[col.field]) + 1;
}else if (d.planned_start_date > dateutil.now_datetime()) {
not_started[col.field] = flt(not_started[col.field]) + 1;
} }
else{ var start_period = dateutil.user_to_obj(dateutil.str_to_user(col.id));
overdue[col.field] = flt(overdue[col.field]) + 1; var end_period = dateutil.user_to_obj(dateutil.str_to_user(col.name));
if (dateobj <= start_period || end_period >= dateobj){
all_open_orders[col.field] = flt(all_open_orders[col.field]) + 1;
if(d.status=="Completed") {
completed[col.field] = flt(completed[col.field]) + 1;
}else if(d.status=="In Process") {
pending[col.field] = flt(pending[col.field]) + 1;
}else if(d.status=="Not Started") {
if (d.planned_start_date > start_period) {
not_started[col.field] = flt(not_started[col.field]) + 1;
}else if (d.planned_start_date < end_period) {
overdue[col.field] = flt(overdue[col.field]) + 1;
}else if (d.planned_start_date < d.actual_start_date) {
not_started[col.field] = flt(not_started[col.field]) + 1;
}else if (d.planned_start_date > dateutil.now_datetime()) {
not_started[col.field] = flt(not_started[col.field]) + 1;
}
else{
overdue[col.field] = flt(overdue[col.field]) + 1;
}
}
} }
} }
} });
}); });
this.chart_area.toggle(true);
this.data = [all_open_orders, not_started, overdue, pending, completed]; this.data = [all_open_orders, not_started, overdue, pending, completed];
} }
}); });