From 4aaecf1421d69a4dbfb5f886e0ade67d3a31b817 Mon Sep 17 00:00:00 2001
From: Simon
Date: Mon, 9 May 2011 15:07:04 +0200
Subject: Datepicker, Timepicker und DaySelect in Filterentry geändert

---
 application/modules/user/forms/FilterEntry.php | 50 ++++++++++++++++++++------
 application/modules/user/layouts/user.phtml    |  1 +
 2 files changed, 40 insertions(+), 11 deletions(-)

(limited to 'application/modules/user')

diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 674667f..12fd00c 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -113,13 +113,6 @@ class user_Form_FilterEntry extends Zend_Form
 					'required' => true,
 					'id' => 'val2'
 				));
-				echo '
-				<script>
-				$(function() {
-					$( "#val1" ).datepicker("option", "dateFormat","dd.mm.yy);
-					$( "#val2" ).datepicker("option", "dateFormat","dd.mm.yy);
-				});
-				</script>';
 				break;
 			case "2":
 				$desc = "You can set one Mac-Adress or an Mac-Range";
@@ -261,6 +254,18 @@ class user_Form_FilterEntry extends Zend_Form
 					'required' => true,
 					'id' => 'val2'
 				));
+				echo '<script type="text/javascript"> 
+				$(function() {
+					$( "#val1" ).timepicker({
+						showPeriod: false,
+						showPeriodLabels: false
+					});
+					$( "#val2" ).timepicker({
+						showPeriod: false,
+						showPeriodLabels: false
+					});
+				});
+				</script>';
 				break;
 			case "8":
 				$desc = "Select a Client";
@@ -293,7 +298,9 @@ class user_Form_FilterEntry extends Zend_Form
 				$label1 = 'Start Day:';
 				$label2 = 'End Day:';
 				
-				$filtervalue1 = $this->createElement('text', 'filtervalue', array(
+				
+				
+				$filtervalue1 = $this->createElement('select','filtervalue', array(
 					'label' => $label1,
 					'validators' => array(
 						array(
@@ -311,7 +318,16 @@ class user_Form_FilterEntry extends Zend_Form
 					'required' => true,
 					'id' => 'val1'
 				));
-				$filtervalue2 = $this->createElement('text', 'filtervalue2', array(
+				$filtervalue1->addMultiOption(1, "Monday")
+							->addMultiOption(2, "Tuesday")
+							->addMultiOption(3, "Wednesday")
+							->addMultiOption(4, "Thursday")
+							->addMultiOption(5, "Friday")
+							->addMultiOption(6, "Saturday")
+							->addMultiOption(7, "Sunday");
+											
+				
+				$filtervalue2 = $this->createElement('select', 'filtervalue2', array(
 					'label' => $label2,
 					'validators' => array(
 						array(
@@ -329,6 +345,13 @@ class user_Form_FilterEntry extends Zend_Form
 					'required' => true,
 					'id' => 'val2'
 				));
+				$filtervalue2->addMultiOption(1, "Monday")
+							->addMultiOption(2, "Tuesday")
+							->addMultiOption(3, "Wednesday")
+							->addMultiOption(4, "Thursday")
+							->addMultiOption(5, "Friday")
+							->addMultiOption(6, "Saturday")
+							->addMultiOption(7, "Sunday");
 				break;
 			case "11":
 				$desc = "Specify the date or a day range of the filter";
@@ -347,8 +370,13 @@ class user_Form_FilterEntry extends Zend_Form
 					'required' => true,					
 					'id' => 'val2'
 				));				
-				$filtervalue2->addValidator('Date',false, array('format'=>'dd.MM.yyyy'));
-				
+				$filtervalue2->addValidator('Date',false, array('format'=>'dd.MM.yyyy'));				
+				echo '<script type="text/javascript"> 
+				$(function() {
+					$( "#val1" ).datepicker({ dateFormat: "dd.mm.yy"});
+					$( "#val2" ).datepicker({ dateFormat: "dd.mm.yy"});
+				});
+				</script>';
 				break;
 		}
 		$filtertypes->setDescription($desc);
diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml
index 526345e..6e29106 100644
--- a/application/modules/user/layouts/user.phtml
+++ b/application/modules/user/layouts/user.phtml
@@ -13,6 +13,7 @@ echo $this->headScript()."\n";
 ?>
 <script type="text/javascript" src='/media/js/jquery.min.js'></script>
 <script type="text/javascript" src='/media/js/jquery-ui.min.js'></script>
+<script type="text/javascript" src='/media/js/jquery.ui.timepicker.js'></script>
 <script type="text/javascript" src='/media/js/script.js'></script>
 <script type="text/javascript" src='/media/js/user.js'></script>
 </head>
-- 
cgit v1.2.3-55-g7522