From c1c862b8d5206155fc116ce2fbaf9a759fc4f44c Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 17:42:11 +0200
Subject: globales Datumsformat

---
 application/modules/user/controllers/SessionController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'application/modules/user/controllers/SessionController.php')

diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index d149f22..018e738 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -18,6 +18,7 @@ class User_SessionController extends Zend_Controller_Action
 		} else {
 			$this->_helper->redirector('login', 'auth');
 		}
+
 		$this->page = $this->_request->getParam('page');
     }
 
@@ -53,7 +54,8 @@ class User_SessionController extends Zend_Controller_Action
 					$personMapper->find($personID,$p);
 					$session->setMembershipID("[".$session->getMembershipID()."] ".$p->getFirstname()." ".$p->getName());
 						
-				}
+				}				
+				$session->setTime(date(Zend_Registry::get('dateformat'),$session->getTime()));
 				$mySessions[] =$session;
 			}			
 		}
-- 
cgit v1.2.3-55-g7522


From 79d04a0f4e443735c5c4790ac57e9e2b6b264a13 Mon Sep 17 00:00:00 2001
From: Simon
Date: Tue, 5 Apr 2011 18:03:13 +0200
Subject: Datumsformat eingebettet und Datum in Filter hinzugefügt

---
 application/modules/user/controllers/FilterController.php  | 3 ++-
 application/modules/user/controllers/SessionController.php | 2 +-
 pbs-newdata.sql                                            | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'application/modules/user/controllers/SessionController.php')

diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index da42b76..ead81ab 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -48,7 +48,7 @@ class User_FilterController extends Zend_Controller_Action
 			$this->view->notification = $pbsNotifier->notify('modify',$result);
 		}
 			
-		$filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID()),true,array('priority'=>'DESC'));
+		$filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID(),'membershipID'=>null),true,array('priority'=>'DESC'));
 		$bootmenuMapper = new Application_Model_BootMenuMapper();
 		foreach($filters as $filter){
 			$ff = new Application_Model_Filter();
@@ -133,6 +133,7 @@ class User_FilterController extends Zend_Controller_Action
 					$filterentry = new Application_Model_FilterEntries();
 					$filterentry->setFilterID($id);
 					$filterentry->setFiltertypeID(6);
+					$filterentry->setCreated(time());
 					$filterentry->setFiltervalue($this->membership->getGroupID());
 					$filterentriesMapper->save($filterentry);
 
diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php
index 018e738..3768af9 100644
--- a/application/modules/user/controllers/SessionController.php
+++ b/application/modules/user/controllers/SessionController.php
@@ -62,7 +62,7 @@ class User_SessionController extends Zend_Controller_Action
 		// Sort after date/id
 		usort($mySessions, function($func_a, $func_b) {
 			if($func_a->getID() == $func_b->getID()) return 0;
-			return ($func_a->getID() < $func_b->getID()) ? -1 : 1;
+			return ($func_a->getID() < $func_b->getID()) ? 1 : -1;
 		  });
 		
 		// Search
diff --git a/pbs-newdata.sql b/pbs-newdata.sql
index 968a92a..c8a5f55 100644
--- a/pbs-newdata.sql
+++ b/pbs-newdata.sql
@@ -152,9 +152,9 @@ INSERT INTO `pbs_session` (`sessionID`, `alphasessionID`,`clientID`, `bootmenuen
 
 -- Adding Filter
 INSERT INTO `pbs_filter` (`filterID`, `membershipID`, `groupID`, `bootmenuID`, `title`, `description`, `created`, `priority`) VALUES
-(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '', 1),
-(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '', 1),
-(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '', 10);
+(1, NULL, 1, 1, 'Filter 1', 'Innerhalb der Uni', '1300022113', 1),
+(2, NULL, 1, 2, 'Filter 2', 'Ausserhalb der Uni', '1302000113', 1),
+(3, NULL, 1, 3, 'Filter 3', 'Montags-Freitag \r\nvon 8 bis 16 Uhr \r\nInnerhalb der Uni', '1302022113', 10);
 
 -- Adding Filterentries
 INSERT INTO `pbs_filterentries` (`filterentriesID`, `filterID`, `filtertypeID`, `filtervalue`, `filtervalue2`) VALUES
-- 
cgit v1.2.3-55-g7522