partkeepr

commit 4c9ea446b51812bd74195a05a715178906938d41
parent 03cd83fbeb974d8b60265f83a38801830f85218e
Author: Felicitus <felicitus@felicitus.org>
Date:   Tue, 12 Jul 2011 14:49:34 +0200

Added part status in the status grid as well as in the detail view

Diffstat:
M
frontend/js/Components/Part/PartDisplay.js
 | 
8
++++++--
M
frontend/js/Components/Part/PartsGrid.js
 | 
4
++++
M
src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php
 | 
2
+-

3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/frontend/js/Components/Part/PartDisplay.js b/frontend/js/Components/Part/PartDisplay.js
@@ -45,8 +45,12 @@ Ext.define('PartKeepr.PartDisplay', {
 					'<td class="o">{createDate}</td>',
 				'</tr>',
 				'<tr>',
-					'<td class="e">'+i18n("Needs Review")+':</td>',
-					'<td class="e">{needsReview}</td>',
+					'<td class="e">'+i18n("Status")+':</td>',
+					'<td class="e">{status}</td>',
+				'</tr>',
+				'<tr>',
+					'<td class="o">'+i18n("Needs Review")+':</td>',
+					'<td class="o">{needsReview}</td>',
 					'</tr>',
 				'</table>');
 		
diff --git a/frontend/js/Components/Part/PartsGrid.js b/frontend/js/Components/Part/PartsGrid.js
@@ -24,6 +24,7 @@ Ext.define('PartKeepr.PartsGrid', {
     enableDragDrop   : true,
     stripeRows       : true,
     multiSelect		 : true,
+    autoScroll: false,
     invalidateScrollerOnRefresh: true,
 	initComponent: function () {
 		
@@ -75,6 +76,9 @@ Ext.define('PartKeepr.PartsGrid', {
 		        	  header: i18n("Storage Location"),
 		        	  dataIndex: 'storageLocationName'
 		          },{
+		        	  header: i18n("Status"),
+		        	  dataIndex: "status"
+		          },{
 		        	  header: i18n("Stock"),
 		        	  dataIndex: 'stockLevel',
 		        	  renderer: this.stockLevelRenderer
diff --git a/src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php b/src/de/RaumZeitLabor/PartKeepr/Part/PartManager.php
@@ -96,7 +96,7 @@ class PartManager extends Singleton {
 		
 		
 		
-		$qb->select("p.averagePrice, p.name, p.needsReview, p.createDate, p.id, p.stockLevel, p.minStockLevel, p.comment, st.id AS storageLocation_id, p.categoryPath, st.name as storageLocationName, f.id AS footprint_id, f.name AS footprintName, c.id AS category_id, c.name AS categoryName, pu.id AS partUnit, pu.name AS partUnitName, pu.is_default AS partUnitDefault");
+		$qb->select("p.averagePrice, p.status, p.name, p.needsReview, p.createDate, p.id, p.stockLevel, p.minStockLevel, p.comment, st.id AS storageLocation_id, p.categoryPath, st.name as storageLocationName, f.id AS footprint_id, f.name AS footprintName, c.id AS category_id, c.name AS categoryName, pu.id AS partUnit, pu.name AS partUnitName, pu.is_default AS partUnitDefault");
 		if ($sort === null) {
 			$qb->addOrderBy("p.name", "ASC");
 		} else {