From 3d04fb75a980dba20e51dc91afd49f0eb9ee43fe Mon Sep 17 00:00:00 2001
From: Simon
Date: Wed, 9 Mar 2011 16:31:58 +0100
Subject: Form-Verhalten geändert & Datenbank korrigiert

---
 application/controllers/PoolController.php | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'application/controllers/PoolController.php')

diff --git a/application/controllers/PoolController.php b/application/controllers/PoolController.php
index cb38a80..7c5092e 100644
--- a/application/controllers/PoolController.php
+++ b/application/controllers/PoolController.php
@@ -25,7 +25,6 @@ class PoolController extends Zend_Controller_Action
 				$assignedclientsArray[] = $c->toArray();
 			}			
 			$freeclients  = $this->arrayDiff($clientsArray,$assignedclientsArray);
-			#print_a($freeclients);
 		
 		$this->view->freeclients = $freeclients;	
 		
@@ -49,6 +48,7 @@ class PoolController extends Zend_Controller_Action
         			echo "Error message 2: " . $e->getMessage() . "\n";  
         		}
 			}
+			$this->view->addpool = $addfilterform;		
 		}
     }
 
@@ -80,8 +80,8 @@ class PoolController extends Zend_Controller_Action
 			$this->view->editpoolform = $editpool;
 		
 		}else {
-			$addpoolform = new Application_Form_Pool($_POST);
-			if ($addpoolform->isValid($_POST)) {			
+			$editpoolform = new Application_Form_Pool($_POST);
+			if ($editpoolform->isValid($_POST)) {			
 				try{
 					$pool = new Application_Model_Pool($_POST);
 					$pool->setID($this->_request->getParam('poolID'));
@@ -92,6 +92,7 @@ class PoolController extends Zend_Controller_Action
         			echo "Error message 2: " . $e->getMessage() . "\n";  
         		}
 			}
+			$this->view->editpoolform = $editpoolform;
 		}
     }
 
@@ -99,10 +100,8 @@ class PoolController extends Zend_Controller_Action
     {
 		$clientID = $this->_request->getParam('clientID');
 		$poolID = $this->_request->getParam('poolID');
-		print_a($clientID,$poolID);
 
 		if(!isset($_POST['clientID']) && ($clientID == '' && $poolID == '')){
-			print_a($_POST);
 			$clientmapper = new Application_Model_ClientMapper();
 			$clients = $clientmapper->fetchAll();
 			foreach($clients as $c){
@@ -117,10 +116,8 @@ class PoolController extends Zend_Controller_Action
 
 			$poolclient = new Application_Form_PoolClient(array('clients'=> $freeclients)); 		
 			$this->view->poolclient = $poolclient;
-		}else {
-			#$_POST['poolID'] = $this->_request->getParam('poolID');			
-			$poolclientform = new Application_Form_PoolClient($_POST);			
-			
+		}else {	
+			$poolclient = new Application_Form_PoolClient($_POST);						
 			try{
 				$pool = new Application_Model_PoolEntries($_POST);
 				$pool->setPoolID($this->_request->getParam('poolID'));
@@ -133,6 +130,7 @@ class PoolController extends Zend_Controller_Action
 			}catch (Zend_Exception $e) {  
     			echo "Error message 2: " . $e->getMessage() . "\n";  
     		}
+			$this->view->poolclient = $poolclient;
 			
 		}
     }
@@ -156,15 +154,11 @@ class PoolController extends Zend_Controller_Action
 			if(is_numeric($poolentriesID)){
 				$deletepoolentries = new Application_Model_PoolEntries();
 				$deletepoolentries->setID($poolentriesID);
-				echo "<pre style='border:1px solid black;background-color:#F5B800'>";
-				print_r($deletepoolentries);
-				echo "</pre>";
 
 				$deletepoolentriesmapper = new Application_Model_PoolEntriesMapper();
 				$deletepoolentriesmapper->delete($deletepoolentries);
 				echo "ok";
 			}
-#			echo "ready";
 			$this->_redirect('/pool');
     }
 
-- 
cgit v1.2.3-55-g7522