.zfproject fix

Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

Conflicts:
	.zfproject.xml

4 files changed, 41 insertions, 14 deletions

diff --git a/application/models/DbTable/FilterEntries.php b/application/models/DbTable/FilterEntries.php
index f0f976d..309858d 100644
--- a/application/models/DbTable/FilterEntries.php
+++ b/application/models/DbTable/FilterEntries.php
@@ -4,7 +4,7 @@ class Application_Model_DbTable_FilterEntries extends Zend_Db_Table_Abstract
 {
 
     protected $_name = 'pbs_filterentries';
-
+	protected $_primary = array('filterID','filtertypeID');
 
 }
 
diff --git a/application/models/FilterEntriesMapper.php b/application/models/FilterEntriesMapper.php
index 58ea563..41f1023 100644
--- a/application/models/FilterEntriesMapper.php
+++ b/application/models/FilterEntriesMapper.php
@@ -32,36 +32,59 @@ class Application_Model_FilterEntriesMapper
 	public function save(Application_Model_FilterEntries $filterentries)
 	{
 		
-		$data = array('filterID'=> $filterentries->getFilterID() ,'filtertypeID'=> $filterentries->getFiltertypeID() ,'filtervalue'=> $filterentries->getFiltervalue() ,'filtervalue2'=> $filterentries->getFiltervalue2() );
-
-		if (null === ($id = $filterentries->getID()) ) {
-			unset($data['filterentriesID']);
+		$data = array('filterID'=> $filterentries->getFilterID() ,
+						'filtertypeID'=> $filterentries->getFiltertypeID() ,
+						'filtervalue'=> $filterentries->getFiltervalue() ,
+						'filtervalue2'=> $filterentries->getFiltervalue2() );
+		
+		if (null != ($id1 = $filterentries->getFilterID()) && 
+			null != ($id2 = $filterentries->getFiltertypeID()) && 
+			$this->getDbTable()->find($filterentries->getFilterID(),$filterentries->getFiltertypeID())) {			
 			$this->getDbTable()->insert($data);
+			echo 'fall1';
 		} else {
-			$this->getDbTable()->update($data, array('filterentriesID = ?' => $id));
+			$this->getDbTable()->update($data, array('filterID = ?' => $id1, 'filtertypeID = ?' => $id2));
+			echo 'fall2';
 		}
 	}
 	
 	public function delete(Application_Model_FilterEntries $filterentries)
 	{
-		if (null === ($id = $filterentries->getID()) ) {
+		$id1 = $filterentries->getFilterID();
+		$id2 = $filterentries->getFiltertypeID();
+		var_dump(array($id1,$id2));
+		//TODO: Löschen klappt nicht
+		if ((null != $id1) && (null != $id2) && 
+			$this->getDbTable()->find($filterentries->getFilterID(),$filterentries->getFiltertypeID())) {
 			return;
 		} else {
-			$this->getDbTable()->delete(array('filterentriesID = ?' => $id));
+			$this->getDbTable()->delete(array('filterID = ?' => $id1, 'filtertypeID = ?' => $id2));
 		}
 	}
 
-	public function find($id, Application_Model_FilterEntries $filterentries)
+	public function find($filterID,$filtertypeID, Application_Model_FilterEntries $filterentries)
 	{
-		$result = $this->getDbTable()->find($id);
+		$result = $this->getDbTable()->find($filterID,$filtertypeID);
+		echo 'dump1';	
 		if (0 == count($result)) {
 			return;
 		}
-
+		echo 'dump2';		
 		$row = $result->current();
 		
-		$filterentries->setFilterID($row->filterID)->setFiltertypeID($row->filtertypeID)->setFiltervalue($row->filtervalue)->setFiltervalue2($row->filtervalue2);
+		$filterentries->setFilterID($row->filterID)
+						->setFiltertypeID($row->filtertypeID)
+						->setFiltervalue($row->filtervalue)
+						->setFiltervalue2($row->filtervalue2);
+		return $filterentries;
 	}
+	public function findBy($field,$value)
+    {
+		$db = $this->getAdapter();
+		$where = $db->quoteInto($db->quoteIdentifier($field).' = ?', value);
+		return $this->fetchAll($where);
+
+    }
 
 	public function fetchAll()
 	{
diff --git a/application/models/FilterType.php b/application/models/FilterType.php
index 9601368..a66950a 100644
--- a/application/models/FilterType.php
+++ b/application/models/FilterType.php
@@ -50,6 +50,7 @@ class Application_Model_FilterType
 	public function setID($_filtertypeID)
 	{
 		$this->_filtertypeID = $_filtertypeID;
+		return $this;
 	}
 	public function getFiltertypename()
 	{
@@ -58,6 +59,7 @@ class Application_Model_FilterType
 	public function setFiltertypename($_filtertypename)
 	{
 		$this->_filtertypename = $_filtertypename;
+		return $this;
 	}
 }
 
diff --git a/application/models/FilterTypeMapper.php b/application/models/FilterTypeMapper.php
index f10ee21..8ed2722 100644
--- a/application/models/FilterTypeMapper.php
+++ b/application/models/FilterTypeMapper.php
@@ -60,7 +60,8 @@ class Application_Model_FilterTypeMapper
 
 		$row = $result->current();
 		
-		$filtertype->setID($row->filtertypeID)->setFiltertypename($row->filtertypename);
+		$filtertype->setID($row->filtertypeID)
+			->setFiltertypename($row->filtertypename);
 	}
 
 	public function fetchAll()
@@ -70,7 +71,8 @@ class Application_Model_FilterTypeMapper
 		foreach ($resultSet as $row) {
 			$entry = new Application_Model_FilterType();
 			
-			$entry->setID($row->filtertypeID)->setFiltertypename($row->filtertypename);	
+			$entry->setID($row->filtertypeID)
+			->setFiltertypename($row->filtertypename);	
 
 			$entries[] = $entry;
 		}