diff options
| -rw-r--r-- | application/modules/user/controllers/FilterController.php | 12 | ||||
| -rw-r--r-- | library/Pbs/Filter.php | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index 37f9307..4aee796 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -338,6 +338,10 @@ class User_FilterController extends Zend_Controller_Action $newfilterenty->setFiltervalue($this->fillup($_POST['filtervalue'],2,':')); $newfilterenty->setFiltervalue2($this->fillup($_POST['filtervalue2'],2,':')); } + elseif($_POST['filtertypeID'] == 11){ + $newfilterenty->setFiltervalue(strtotime($newfilterenty->getFiltervalue())); + $newfilterenty->setFiltervalue2(strtotime($newfilterenty->getFiltervalue())); + } else{ $newfilterenty->setFiltervalue($_POST['filtervalue']); if(isset($_POST['filtervalue2'])){ @@ -378,6 +382,10 @@ class User_FilterController extends Zend_Controller_Action if(isset($_POST['filtertypeID']) && $_POST['filtertypeID'] != $filterentry->getFiltertypeID()){ $filterentry->setFiltertypeID($_POST['filtertypeID']) ; } + if($filterentry->getFiltertypeID() == 11){ + $filterentry->setFiltervalue(date('d.m.Y',$filterentry->getFiltervalue())); + $filterentry->setFiltervalue2(date('d.m.Y',$filterentry->getFiltervalue())); + } $data = $filterentry->toArray(); $editfilterform = new user_Form_FilterEntry(array( 'buttontext' => 'Edit Filterentry', @@ -426,6 +434,10 @@ class User_FilterController extends Zend_Controller_Action $newfilterenty->setFiltervalue($this->fillup($_POST['filtervalue'],2,';')); $newfilterenty->setFiltervalue2($this->fillup($_POST['filtervalue2'],2,':')); } + elseif($_POST['filtertypeID'] == 11){ + $newfilterenty->setFiltervalue(strtotime($newfilterenty->getFiltervalue())); + $newfilterenty->setFiltervalue2(strtotime($newfilterenty->getFiltervalue())); + } else{ $newfilterenty->setFiltervalue($_POST['filtervalue']); $newfilterenty->setFiltervalue2($_POST['filtervalue2']); diff --git a/library/Pbs/Filter.php b/library/Pbs/Filter.php index 5b8e53b..0a62da9 100644 --- a/library/Pbs/Filter.php +++ b/library/Pbs/Filter.php @@ -9,7 +9,7 @@ class Pbs_Filter{ { $this->db = Zend_Db_Table::getDefaultAdapter(); $db = $this->db; - $debuglevel = 0; + $debuglevel = 3; $userIDsNamespace = Zend_Session::namespaceGet('userIDs'); @@ -326,14 +326,14 @@ class Pbs_Filter{ // date $filtertypID = 11; if(!$testFilter){ - $date = date('d.m.Y'); + $date = strtotime(date('d.m.Y')); } try{ $stmt = $db->query("SELECT * FROM pbs_filterentries fe, pbs_filter f WHERE fe.filtertypeID = ".$filtertypID." AND - REPLACE(fe.filtervalue,'.','') <= ".$date." AND - ".$date." <= REPLACE(fe.filtervalue2,'.','') <= AND + fe.filtervalue <= ".$date." AND + ".$date." <= fe.filtervalue2 AND fe.filterID = f.filterID AND f.groupID = '".$groupID."'"); $result = $stmt->fetchAll(); @@ -344,7 +344,7 @@ class Pbs_Filter{ catch(Exception $e){} if($debuglevel >= 3) - print_a('date',$result,$set[$filtertypID]); + print_a('date',$result,$set[$filtertypID],$date); ######################################## $result = array(); // ErgebnisSet auswerten |