partkeepr

commit 7f5edad011a2c95415eaf930184580707cea1f09
parent 72bd3f9756a9bea8dc37aca7c40f78e79031b78c
Author: Timo A. Hummel <timo@netraver.de>
Date:   Mon,  6 Jun 2011 15:53:30 +0200

A footprint for a part is optional from now on.

Diffstat:
M
src/de/RaumZeitLabor/PartDB2/Part/Part.php
 | 
6
+-----
M
src/de/RaumZeitLabor/PartDB2/Part/PartManager.php
 | 
11
++++++++---

2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/de/RaumZeitLabor/PartDB2/Part/Part.php b/src/de/RaumZeitLabor/PartDB2/Part/Part.php
@@ -95,14 +95,10 @@ class Part {
 		$this->name = $name;
 	}
 	
-	public function setFootprint (\de\RaumZeitLabor\PartDB2\Footprint\Footprint $footprint) {
+	public function setFootprint (\de\RaumZeitLabor\PartDB2\Footprint\Footprint $footprint = null) {
 		$this->footprint = $footprint;
 	}
 	
-	public function setManufacturer (\de\RaumZeitLabor\PartDB2\Manufacturer\Manufacturer $manufacturer) {
-		$this->manufacturer = $manufacturer;
-	}
-	
 	public function setComment ($comment) {
 		$this->comment = $comment;
 	}
diff --git a/src/de/RaumZeitLabor/PartDB2/Part/PartManager.php b/src/de/RaumZeitLabor/PartDB2/Part/PartManager.php
@@ -28,7 +28,7 @@ class PartManager extends Singleton {
 		$qb = PartDB2::getEM()->createQueryBuilder();
 		$qb->select("COUNT(p.id)")->from("de\RaumZeitLabor\PartDB2\Part\Part","p")
 		->join("p.storageLocation", "st")
-		->join("p.footprint", "f")
+		->leftJoin("p.footprint", "f")
 		->join("p.category", "c");
 
 		$qb->where("1=1");
@@ -121,8 +121,13 @@ class PartManager extends Singleton {
 		}
 		
 		if (array_key_exists("footprint", $aParameters)) {
-			$footprint = FootprintManager::getInstance()->getOrCreateFootprint($aParameters["footprint"]);
-			$part->setFootprint($footprint);	
+			
+			if ($aParameters["footprint"] === null) {
+				$part->setFootprint(null);	
+			} else {
+				$footprint = FootprintManager::getInstance()->getOrCreateFootprint($aParameters["footprint"]);
+				$part->setFootprint($footprint);
+			}
 		}
 		
 		if (array_key_exists("storagelocation", $aParameters)) {