filter-oberffäche fertig, nun zur auswahl des bootmenus && funktion toArray bei jedem Mapper hinzugefügt, um populate bei Formularen nutzen zu können

1 files changed, 134 insertions, 57 deletions

diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 6acaae8..3f7fa73 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -32,55 +32,86 @@ class FilterController extends Zend_Controller_Action
     public function addfilterAction()
     {
         if (!isset($_POST["add"])){
-            		$addfilterform = new Application_Form_FilterAdd();    		
-        			$this->view->addfilterform = $addfilterform;		
-        		}else {
-        			$addfilterform = new Application_Form_FilterAdd($_POST);
-        			if ($addfilterform->isValid($_POST)) {			
-        				try{
-        					$newfilter = new Application_Model_Filter();
-        					$newfilter->setTitle($_POST['title']);
-        					$newfilter->setCreated(time());
-        					$newfilter->setDescription($_POST['description']);
-        					$newfilter->setPriority($_POST['priority']);
-        
-        					// TODO: Ändere mit ACL
-        					$newfilter->setGroupID('1');
-        					$newfilter->setMembershipID('1');
-        					$newfilter->setBootmenuID('1');					
-        
-        					$newfilter2 = new Application_Model_FilterMapper();
-        					$newfilter2->save($newfilter);
-        
-        					$this->_redirect('/filter');
-        			    	return;
-        				}catch (Zend_Exception $e) {  
-                			echo "Error message 2: " . $e->getMessage() . "\n";  
-                		}
-        			}
+    		$addfilterform = new Application_Form_FilterAdd();    		
+			$this->view->addfilterform = $addfilterform;		
+		}else {
+			$addfilterform = new Application_Form_FilterAdd($_POST);
+			if ($addfilterform->isValid($_POST)) {			
+				try{
+					$newfilter = new Application_Model_Filter();
+					$newfilter->setTitle($_POST['title']);
+					$newfilter->setCreated(time());
+					$newfilter->setDescription($_POST['description']);
+					$newfilter->setPriority($_POST['priority']);
+
+					// TODO: Ändere mit ACL
+					$newfilter->setGroupID('1');
+					$newfilter->setMembershipID('1');
+					$newfilter->setBootmenuID('1');					
+
+					$newfilter2 = new Application_Model_FilterMapper();
+					$newfilter2->save($newfilter);
+
+					$this->_redirect('/filter');
+			    	return;
+				}catch (Zend_Exception $e) {  
+        			echo "Error message 2: " . $e->getMessage() . "\n";  
+        		}
+			}
 		}
     }
 
     public function removefilterAction()
     {
-        echo 'test';
-        		print_r($_GET);
-        		$filterID = $this->_request->getParam('filterID');
-        		// TODO: ACL implementieren ob er den filter löschen darf
-        		if(is_numeric($filterID)){
-        			// TODO: lösche den aktuellen eintrag
-        			$deletefilter = new Application_Model_Filter();
-        			$deletefilter->setID($filterID);
-        			$filtermapper = new Application_Model_FilterMapper();
-        			$filtermapper->delete($deletefilter);
-        		}
-        		$this->_redirect('/filter');
+        
+		$filterID = $this->_request->getParam('filterID');
+		// TODO: ACL implementieren ob er den filter löschen darf
+		if(is_numeric($filterID)){
+			$deletefilter = new Application_Model_Filter();
+			$deletefilter->setID($filterID);
+			$filtermapper = new Application_Model_FilterMapper();
+			$filtermapper->delete($deletefilter);
+		}
+		$this->_redirect('/filter');
     }
 
     public function editfilterAction()
     {
-        // TODO: ACL implementieren ob er editieren darf   
-		// TODO: korrigieren, damit man einen filter (priorität und namen ändern kann)
+		if (!isset($_POST["add"])){
+		    // TODO: ACL implementieren ob er editieren darf
+			$filterID = $this->_request->getParam('filterID');
+			$filter = new Application_Model_Filter();
+
+			$filtermapper = new Application_Model_FilterMapper();
+			$filtermapper->find($filterID,$filter);		
+			$filter2 = $filter->toArray();
+
+			$editfilterform = new Application_Form_FilterAdd();  
+			$editfilterform->populate($filter2);
+			$this->view->editfilterform = $editfilterform;
+		
+		} else{
+			try{
+				echo "<pre>";print_r($_POST);echo "</pre>";
+				$editfilterform = new Application_Form_FilterAdd();
+				//TODO: ACL integrieren				
+				$_POST['groupID'] = 1;
+				$_POST['membershipID'] = 1;
+				$_POST['bootmenuID'] = 1;
+				$_POST['created'] = time();
+
+				if ($editfilterform->isValid($_POST)) {	
+					$newfilterenty = new Application_Model_Filter($_POST);
+					$newfilterenty->setID($this->_request->getParam('filterID'));
+					$newfilter2 = new Application_Model_FilterMapper();				
+					$newfilter2->save($newfilterenty);	
+				}				
+
+			}catch (Zend_Exception $e) {  
+    			echo "Error message 2: " . $e->getMessage() . "\n";  
+    		}
+			$this->_redirect('/filter');
+		}		
     }
 
     public function addfilterentryAction()
@@ -104,8 +135,8 @@ class FilterController extends Zend_Controller_Action
 				
 				$newfilterenty = new Application_Model_FilterEntries();
 				$newfilterenty->setFilterID($_POST['filterID']);
-				$newfilterenty->setFiltertypeID($_POST['filtertype']);
-				$newfilterenty->setFiltervalue($_POST['filtervalue1']);
+				$newfilterenty->setFiltertypeID($_POST['filtertypeID']);
+				$newfilterenty->setFiltervalue($_POST['filtervalue']);
 				$newfilterenty->setFiltervalue2($_POST['filtervalue2']);	
 				
 				$newfilter2 = new Application_Model_FilterEntriesMapper();
@@ -117,25 +148,71 @@ class FilterController extends Zend_Controller_Action
     }
 	public function editfilterentryAction()
     {
-        
+        if (!isset($_POST["add"])){
+			echo "case1";
+			try{
+				$filterID 		= $this->_request->getParam('filterID');
+				$filtertypeID = $this->_request->getParam('filtertypeID');
+				
+				
+				$filterentry = new Application_Model_FilterEntries();
+
+				$filterentriesmapper = new Application_Model_FilterEntriesMapper();
+				$filterentriesmapper->find($filterID,$filtertypeID,$filterentry);		
+
+				$editfilterform = new Application_Form_FilterEntriesAdd();
+				echo "<pre style='border:1px solid black;background-color:#F5B800'>";
+				print_r($filterentry->toArray());
+				echo "</pre>";
+				$editfilterform->populate($filterentry->toArray());
+				$editfilterform->setFilterID($filterID);
+				$this->view->editfilterform = $editfilterform;
+				echo "case 1.1";
+
+			}catch (Zend_Exception $e) {  
+				echo "Error message 2: " . $e->getMessage() . "\n";  
+			}
+		} else{
+			$editfilterform = new Application_Form_FilterEntriesAdd($_POST);
+			echo "case2";	
+			echo "<pre style='border:1px solid black;background-color:#F5B800'>";
+			print_r($_POST);
+			echo "</pre>";
+			if ($editfilterform->isValid($_POST)) {			
+				echo "valid\n";	
+				$newfilterenty = new Application_Model_FilterEntries($_POST);				
+				$newfilter2 = new Application_Model_FilterEntriesMapper();				
+				$newfilter2->save($newfilterenty);
+								
+			}
+			else{
+				echo 'nö';
+			}
+			$this->_redirect('/filter');
+		}
     }
 	public function removefilterentryAction()
     {
-       echo 'test';        		
-		$filterID = $this->_request->getParam('filterID');
-		$filtertypeID = $this->_request->getParam('filtertypeID');
-		var_dump(array($filterID,$filtertypeID));
-		// TODO: ACL implementieren ob er den filter löschen darf
-		if(is_numeric($filterID)){
-			// TODO: lösche den aktuellen eintrag
-			$deletefilterentry = new Application_Model_FilterEntries();
-			$deletefilterentry->setFilterID($filterID);
-			$deletefilterentry->setFiltertypeID($filtertypeID);
-
-			$filterentriesmapper = new Application_Model_FilterEntriesMapper();
-			$filterentriesmapper->delete($deletefilterentry);
+		      
+		try{    		
+			$filterID = $this->_request->getParam('filterID');
+			$filtertypeID = $this->_request->getParam('filtertypeID');
+			echo "<pre>";
+			var_dump(array($filterID,$filtertypeID));
+			echo "</pre>";
+			// TODO: ACL implementieren ob er den filter löschen darf
+			if(is_numeric($filterID)){
+				$deletefilterentry = new Application_Model_FilterEntries();
+				$deletefilterentry->setFilterID($filterID);
+				$deletefilterentry->setFiltertypeID($filtertypeID);
+
+				$filterentriesmapper = new Application_Model_FilterEntriesMapper();
+				$filterentriesmapper->delete($deletefilterentry);
+			}
+			$this->_redirect('/filter');
+		}catch (Zend_Exception $e) {  
+			echo "Error message 2: " . $e->getMessage() . "\n";  
 		}
-		#$this->_redirect('/filter');
     }