.zfproject fix

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

Conflicts:
	.zfproject.xml

1 files changed, 111 insertions, 45 deletions

diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index d066c53..6acaae8 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -8,70 +8,134 @@ class FilterController extends Zend_Controller_Action
     public function init()
     {
         try{		
-			$this->_filtermapper = new Application_Model_FilterMapper();
-		}catch (Zend_Exception $e) {  
-			echo "Error message 1: " . $e->getMessage() . "\n";
+        			$this->_filtermapper = new Application_Model_FilterMapper();
+        		}catch (Zend_Exception $e) {  
+        			echo "Error message 1: " . $e->getMessage() . "\n";
 		}
     }
 
     public function indexAction()
     {
         try{			
-			$this->_filtermapper = new Application_Model_FilterMapper();
-       		$this->view->filters = $this->_filtermapper->fetchAll();                			
-    	}catch (Zend_Exception $e) {  
-			echo "Error message 2: " . $e->getMessage() . "\n";
-		}
+        			$this->_filtermapper = new Application_Model_FilterMapper();
+               		$this->view->filters = $this->_filtermapper->fetchAll();
+        			
+        			$filterentries = new Application_Model_FilterEntriesMapper();
+        			
+        			$this->view->filterentries = $filterentries->fetchAll();
+                     			
+            	}catch (Zend_Exception $e) {  
+        			echo "Error message 2: " . $e->getMessage() . "\n";
+			}
     }
 
     public function addfilterAction()
     {
-        $db = Zend_Db_Table::getDefaultAdapter();
         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()
-    {	
-		$filterID = $_GET['filterID'];
-		// TODO: ACL implementieren ob er den filter löschen darf
-		if(is_numeric($filterID)){
-			// TODO: lösche den aktuellen eintrag
-		}
-        // action body
+    {
+        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');
     }
 
     public function editfilterAction()
     {
-        // action body
+        // TODO: ACL implementieren ob er editieren darf   
+		// TODO: korrigieren, damit man einen filter (priorität und namen ändern kann)
+    }
+
+    public function addfilterentryAction()
+    {
+        // TODO: ACL implementieren ob er editieren darf   
+		if (!isset($_POST["add"])){
+			echo "case1";
+			try{
+				$editfilterform = new Application_Form_FilterEntriesAdd(array('filterID' => $this->_request->getParam('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";	
+			
+			if ($editfilterform->isValid($_POST)) {			
+				
+				$newfilterenty = new Application_Model_FilterEntries();
+				$newfilterenty->setFilterID($_POST['filterID']);
+				$newfilterenty->setFiltertypeID($_POST['filtertype']);
+				$newfilterenty->setFiltervalue($_POST['filtervalue1']);
+				$newfilterenty->setFiltervalue2($_POST['filtervalue2']);	
+				
+				$newfilter2 = new Application_Model_FilterEntriesMapper();
+				
+				$newfilter2->save($newfilterenty);					
+			}
+			$this->_redirect('/filter');
+		}
+    }
+	public function editfilterentryAction()
+    {
+        
+    }
+	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);
+		}
+		#$this->_redirect('/filter');
     }
 
 
@@ -83,3 +147,5 @@ class FilterController extends Zend_Controller_Action
 
 
 
+
+