globales Datumsformat

5 files changed, 10 insertions, 2 deletions

diff --git a/application/Bootstrap.php b/application/Bootstrap.php
index 4963705..d876dce 100644
--- a/application/Bootstrap.php
+++ b/application/Bootstrap.php
@@ -53,6 +53,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
        
         $view->headTitle('pbs²')
              ->setSeparator(' :: ');
+        Zend_Registry::set('dateformat' , 'Y-m-d H:i:s');
     }
     protected function _initPlugins()
 	{
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index e9850a9..da42b76 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -49,10 +49,13 @@ class User_FilterController extends Zend_Controller_Action
 		}
 			
 		$filters = $this->filterMapper->findBy(array('groupID' => $this->membership->getGroupID()),true,array('priority'=>'DESC'));
+		$bootmenuMapper = new Application_Model_BootMenuMapper();
 		foreach($filters as $filter){
 			$ff = new Application_Model_Filter();
 			$ff->setOptions($filter);
 			$ff->setID($filter['filterID']);
+			$ff->setBootmenuID("[".$ff->getBootmenuID()."] ".$bootmenuMapper->find($ff->getBootmenuID())->getTitle());
+			$ff->setCreated(date(Zend_Registry::get('dateformat'),$ff->getCreated()));
 			$allFilter[] = $ff;
 		}
     	
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;
 			}			
 		}
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 7f8bad8..aa615e4 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -13,6 +13,7 @@
 			<th>Description <span class='code'>description</span></th>
 			<th>Priority <span class='code'>priority</span></th>
 			<th>TargetBootMenu <span class='code'>bootmenuID</span></th>
+			<th>Created <span class='code'>created</span></th>
  			<th colspan=3>Actions</th>
         </tr>
 	<?php foreach ($this->filters as $filter): ?>
@@ -22,6 +23,7 @@
 			<td><?php echo $this->escape($filter->Description) ?></td>
 			<td><?php echo $this->escape($filter->priority) ?></td>
 			<td><?php echo $this->escape($filter->bootmenuID) ?></td>
+			<td><?php echo $this->escape($filter->created) ?></td>
 			<td class='action'><a href="<?php echo $this->url(
 					array(
 						'module'	=> 'user',
diff --git a/application/modules/user/views/scripts/session/index.phtml b/application/modules/user/views/scripts/session/index.phtml
index bb9f1e2..32c8e04 100644
--- a/application/modules/user/views/scripts/session/index.phtml
+++ b/application/modules/user/views/scripts/session/index.phtml
@@ -22,7 +22,7 @@
 		<td><?php echo $this->escape($session->getBootosID()) ?></td>
 		<td><?php echo $this->escape($session->getBootisoID()) ?></td>
 		<td><?php echo $this->escape($session->getMembershipID()) ?></td>		
-		<td><?php echo date('d.m.Y H:i',$this->escape($session->getTime())) ?></td>
+		<td><?php echo $this->escape($session->getTime()) ?></td>
 		<td><?php echo $this->escape($session->getIp()) ?></td>
 		<td><?php echo $this->escape($session->getIp6()) ?></td>		
 	</tr>