partkeepr

commit c65c89daeb75611e74d478afbae2ac6f624878a7
parent 6024b610330a427a7d362ed10cb2405bb028b299
Author: Felicitus <felicitus@felicitus.org>
Date:   Wed,  4 Apr 2012 10:58:51 +0200

Fixed bug in the sum calculator

Diffstat:
M
src/frontend/js/Components/Project/ProjectReport.js
 | 
12
++++--------
M
src/frontend/js/Models/ProjectReport.js
 | 
1
+

2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/frontend/js/Components/Project/ProjectReport.js b/src/frontend/js/Components/Project/ProjectReport.js
@@ -101,14 +101,7 @@ Ext.define('PartKeepr.ProjectReportView', {
 				width: 100
 			},{
 				header: i18n("Sum"),
-				renderer: function (val,p,rec) {
-					if (!isNaN(rec.get("price"))) {
-						return rec.get("quantity") * rec.get("price");	
-					}
-					
-					return 0;
-					
-				},
+				dataIndex: 'sum',
 				summaryType: 'sum',
 				width: 100
 			},{
@@ -222,6 +215,8 @@ Ext.define('PartKeepr.ProjectReportView', {
 					e.record.set("distributor_order_number", distributors.getAt(i).get("orderNumber"));
 					
 					e.record.set("sum_order", e.record.get("missing") * e.record.get("price"));
+					
+					e.record.set("sum", e.record.get("quantity") * e.record.get("price"));
 				}
 			}
 		}
@@ -255,6 +250,7 @@ Ext.define('PartKeepr.ProjectReportView', {
 				activeRecord.set("distributor_order_number", cheapest.get("orderNumber"));
 				activeRecord.set("price", cheapest.get("price"));
 				activeRecord.set("sum_order", activeRecord.get("missing") * activeRecord.get("price"));
+				activeRecord.set("sum", activeRecord.get("quantity") * activeRecord.get("price"));
 			}
 		}
 		
diff --git a/src/frontend/js/Models/ProjectReport.js b/src/frontend/js/Models/ProjectReport.js
@@ -10,6 +10,7 @@ Ext.define("PartKeepr.ProjectReport", {
 	         {	name: 'missing',	type: 'int'},
 	         {	name: 'distributor_order_number',	type: 'string'},
 	         {	name: 'sum_order',	type: 'float'},
+	         {	name: 'sum',	type: 'float'},
 	         {	name: 'projects',	type: 'string'},
 	         {	name: 'remarks',	type: 'string'}
 	         ],