diff options
author | michael pereira | 2011-04-04 17:14:53 +0200 |
---|---|---|
committer | michael pereira | 2011-04-04 17:14:53 +0200 |
commit | b1a3923f98348f5145713315180b8e80e6ee89c0 (patch) | |
tree | bff2b1b25fc41d1581d78c9b858897419780c7a0 /application/modules/user/controllers | |
parent | WICHTIG findBy Methode geändert & alles angepasst, siehe Ticket (diff) | |
parent | client-suche verändert (diff) | |
download | pbs2-b1a3923f98348f5145713315180b8e80e6ee89c0.tar.gz pbs2-b1a3923f98348f5145713315180b8e80e6ee89c0.tar.xz pbs2-b1a3923f98348f5145713315180b8e80e6ee89c0.zip |
merges
Diffstat (limited to 'application/modules/user/controllers')
8 files changed, 99 insertions, 112 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index 63a5e38..a6fbe9e 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -79,21 +79,19 @@ class user_BootisoController extends Zend_Controller_Action $this->view->bootisolist = array_reverse($this->view->bootisolist); - // Pagination - $perpage = 2; - $req_page = $this->_request->getParam('page'); - $all = count($this->view->bootisolist); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; + + // Pagination + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(2); + $pagination->setElement($this->view->bootisolist); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/bootiso/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $this->view->bootisolist = $pagination->getElements(); - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/bootiso/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->bootisolist = array_slice($this->view->bootisolist,$startitem,$perpage); + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->bootisolist= $this->view->bootisolist; + $prebootMapper = new Application_Model_PreBootMapper(); diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index 2356515..7843b3f 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -89,23 +89,18 @@ class user_BootmenuController extends Zend_Controller_Action } // Pagination - $perpage = 2; - $req_page = $this->_request->getParam('page'); - $all = count($bootmenu); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(2); + $pagination->setElement($bootmenu); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/bootmenu/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $bootmenu = $pagination->getElements(); - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/bootmenu/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->bootmenulist = array_slice($bootmenu,$startitem,$perpage); - - - $this->view->bootmenuentrylist = $bootmenuentries; + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->bootmenulist = $bootmenu; + + $this->view->bootmenuentrylist = $bootmenuentries; } diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php index 69f3140..8f602fe 100644 --- a/application/modules/user/controllers/BootosController.php +++ b/application/modules/user/controllers/BootosController.php @@ -66,22 +66,17 @@ class user_BootosController extends Zend_Controller_Action $this->view->bootoslist = $this->bootosMapper->findBy(array("groupID" => $groupID)); $this->view->update = array(); - // Pagination - $perpage = 5; - $req_page = $this->_request->getParam('page'); - $all = count($this->view->bootoslist); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(5); + $pagination->setElement($this->view->bootoslist); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/bootos/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $this->view->bootoslist = $pagination->getElements(); - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/bootos/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->bootoslist = array_slice($this->view->bootoslist,$startitem,$perpage); + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->bootoslist = $this->view->bootoslist; $update = $this->_request->getParam('checkupdate'); diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php index e26075b..87e764d 100644 --- a/application/modules/user/controllers/ClientController.php +++ b/application/modules/user/controllers/ClientController.php @@ -49,23 +49,32 @@ class User_ClientController extends Zend_Controller_Action $clientMapper = new Application_Model_ClientMapper(); $clientsInGroup = $clientMapper->findBy(array('groupID' => $this->membership->getGroupID()),true); + // Search + $search = $this->_request->getParam('search'); + $mySearch = new Pbs_Search(); + $mySearch->setSearchTerm($search); + $this->view->searchform = $mySearch->searchForm(); + if($search != ''){ + $this->view->search = $search; + $clientsInGroup = $mySearch->search($clientsInGroup); + } - $perpage = 10; - $req_page = $this->_request->getParam('page'); - $all = count($clientsInGroup); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; - + // Pagination $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/client/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->clients = array_slice($clientsInGroup,$startitem,$perpage); + $pagination->setPerPage(10); + $pagination->setElement($clientsInGroup); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/client/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $clientsInGroup = $pagination->getElements(); + + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->clients = $clientsInGroup; } + public function searchAction(){ + $this->_redirect('/user/client/index/search/'.$_GET['search']); + } public function addclientAction() { diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index f00d1bc..83ff804 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -66,22 +66,17 @@ class user_ConfigController extends Zend_Controller_Action $config->setGroupID("[".$config->getGroupID()."] ".$groupMapper->find($config->getGroupID())->getTitle()); } - // Pagination - $perpage = 5; - $req_page = $this->_request->getParam('page'); - $all = count($this->view->configlist); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(2); + $pagination->setElement($this->view->configlist); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/config/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $this->view->configlist = $pagination->getElements(); - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/config/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->configlist = array_slice($this->view->configlist,$startitem,$perpage); + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->configlist = $this->view->configlist; } diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 83ccdc4..d4ddeae 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -55,21 +55,19 @@ class User_FilterController extends Zend_Controller_Action $ff->setID($filter['filterID']); $allFilter[] = $ff; } - $perpage = 2; - $req_page = $this->_request->getParam('page'); - $all = count($allFilter); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/filter/index',$req_page,$numpages); - $this->view->page = $req_page; - - $this->view->filters = array_slice($allFilter,$startitem,$perpage); + // Pagination + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(2); + $pagination->setElement($allFilter); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/filter/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $allFilter = $pagination->getElements(); + + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->filters = $allFilter; + } public function addfilterAction() @@ -79,8 +77,10 @@ class User_FilterController extends Zend_Controller_Action $this->_redirect('/user'); $bmmapper = new Application_Model_BootMenuMapper(); + $result = $bmmapper->findBy(array('groupID' => $this->membership->getGroupID()),true); print_a($result); + foreach($result as $rr){ $bm = new Application_Model_BootMenu(); @@ -301,7 +301,7 @@ class User_FilterController extends Zend_Controller_Action 'data' => $_POST, 'page' => $this->page)); if ($addform->isValid($_POST)) { - print_a('valid'); + # print_a('valid'); $newfilterenty = new Application_Model_FilterEntries(); $newfilterenty->setFilterID($filterID); $newfilterenty->setFiltertypeID($_POST['filtertypeID']); diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php index 7bf3446..e5fea8c 100644 --- a/application/modules/user/controllers/PoolController.php +++ b/application/modules/user/controllers/PoolController.php @@ -64,20 +64,19 @@ class User_PoolController extends Zend_Controller_Action $ff->setID($pool['poolID']); $yourpools[] = $ff; } - $perpage = 4; - $req_page = $this->_request->getParam('page'); - $all = count($yourpools); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/pool/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->pools = array_slice($yourpools,$startitem,$perpage); + // Pagination + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(4); + $pagination->setElement($yourpools); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/pool/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $yourpools = $pagination->getElements(); + + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->pools = $yourpools; + // Get all Clients from this group $clientmapper = new Application_Model_ClientMapper(); diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php index 73e838d..6944e27 100644 --- a/application/modules/user/controllers/PrebootController.php +++ b/application/modules/user/controllers/PrebootController.php @@ -65,20 +65,16 @@ class User_PrebootController extends Zend_Controller_Action $this->view->prebootlist = $this->prebootMapper->findBy(array("groupID" => $groupID)); // Pagination - $perpage = 2; - $req_page = $this->_request->getParam('page'); - $all = count($this->view->prebootlist); - $numpages = ceil($all/$perpage); - if($req_page < 0 || !is_numeric($req_page) ) - $req_page = 0; - if($req_page >= $numpages) - $req_page = $numpages-1; - $startitem = $req_page * $perpage; + $pagination = new Pbs_Pagination(); + $pagination->setPerPage(2); + $pagination->setElement($this->view->prebootlist); + $pagination->setRequestPage($this->_request->getParam('page')); + $pagination->setPageUrl('/user/preboot/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); + $this->view->prebootlist = $pagination->getElements(); - $pagination = new Pbs_Pagination(); - $this->view->pagination = $pagination->pagination('/user/preboot/index',$req_page,$numpages); - $this->view->page = $req_page; - $this->view->prebootlist = array_slice($this->view->prebootlist,$startitem,$perpage); + $this->view->pagination = $pagination->pagination($pageurl); + $this->view->page = $pagination->getRequestPage(); + $this->view->prebootlist= $this->view->prebootlist; |