filtertypen hinzugefügt, Zeit, Datum und Wochentage können in Filtern definiert werden, Formular wird automatisch aktualisiert

2 files changed, 117 insertions, 24 deletions

diff --git a/application/forms/FilterEntriesAdd.php b/application/forms/FilterEntriesAdd.php
index 3b051f5..9f9c642 100644
--- a/application/forms/FilterEntriesAdd.php
+++ b/application/forms/FilterEntriesAdd.php
@@ -2,35 +2,101 @@
 
 class Application_Form_FilterEntriesAdd extends Zend_Form
 {
-
-   	private $filterID  = null;
+	private $filterID = 0;
 
     public function init()
     {
 		$this->setName("Add Filterentry");
 		$this->setMethod('post');
+		$this->setAttrib('id','filterentryform');
+		#print_a($this->data);
 
 		try{		
 			$filtertypemapper = new Application_Model_FilterTypeMapper();
 	       	$filtertype = $filtertypemapper->fetchAll();
-		}catch (Zend_Exception $e) {  
-			echo "Error message 1: " . $e->getMessage() . "\n";
-		}
+		
 		$filtertypes = $this->createElement('select','filtertypeID');
         $filtertypes ->setLabel('Type:');
+        $filtertypes ->setAttrib('id','filtertype');
+        $filtertypes->addMultiOption('','');
 		foreach($filtertype as $f){
 			$filtertypes->addMultiOption($f->getID(),$f->getFiltertypename());
-		}            	
-		$this->addElement($filtertypes);
-
+		}
+		$filterentry = $filtertypes->getMultiOption($this->data['filtertypeID']);
+		$filterentryID = $this->data['filtertypeID'];
+		}catch (Zend_Exception $e) {  
+			echo "Error message 1: " . $e->getMessage() . "\n";
+		}
+		switch($filterentryID){
+			default:
+				$desc = "Select the filtertype";
+				$label1 = 'Value 1:';
+				$label2 = 'Value 2:';
+				break;
+			case "1":
+				$desc = "You can set one IP or an IP-Range";
+				$label1 = 'Start:';
+				$label2 = 'End:';
+				break;
+			case "2":
+				$desc = "You can set one Mac-Adress or an Mac-Range";
+				$label1 = 'Start:';
+				$label2 = 'End:';
+				break;
+			case "3":
+				$desc = "Select your Pool";
+				$label1 = 'PoolID:';
+				break;
+			case "4":
+				$desc = "Select your BootIso";
+				$label1 = 'BootIsoID:';
+				break;
+			case "5":
+				$desc = "Select a Membership";
+				$label1 = 'Membership:';
+				break;
+			case "6":
+				$desc = "Select a Group";
+				$label1 = 'Group:';
+				break;
+			case "7":
+				$desc = "Specify a time-range";
+				$label1 = 'Start:';
+				$label2 = 'End:';
+				break;
+			case "8":
+				$desc = "Select a Client";
+				$label1 = 'Client:';
+				break;
+			case "9":
+				$desc = "Define a Hardwarehash";
+				$label1 = 'Hardwarehash:';
+				break;
+			case "10":
+				$desc = "Specify the Weekday (Monday:1, Tuesday:2 ... Sunday:7) or a range";
+				$label1 = 'Start Day:';
+				$label2 = 'End Day:';
+				break;
+			case "11":
+				$desc = "Specify the date or a day range of the filter";
+				$label1 = 'Start Date:';
+				$label2 = 'End Date:';
+				break;
+		}
+		$filtertypes->setDescription($desc);
+		$this->addElement($filtertypes);    
 		
 		$this->addElement('text', 'filtervalue', array(
-			'label' => 'Value1:'
-		));
-
-		$this->addElement('text', 'filtervalue2', array(
-			'label' => 'Value2:'
+			'label' => $label1,
+			'id' => 'val1'
 		));
+		
+		if(!in_array($filterentryID,array(3,4,5,6,8,9))){
+			$this->addElement('text', 'filtervalue2', array(
+				'label' => $label2,
+				'id' => 'val2'
+			));
+		}
 
         $this->addElement('submit', 'add', array(
             'required' => false,
@@ -41,19 +107,39 @@ class Application_Form_FilterEntriesAdd extends Zend_Form
         $this->addElement('button', 'Cancel', array(
             'onclick' => 'self.location="/filter"'
         ));  
+        
+         $this->addElement('hidden', 'filterID', array(
+            'value' => $this->filterID
+        ));  
 		
-		$this->addElement('hidden', 'filterID', array(
-			'value' => $this->filterID
-		));
+	
     }
-	public function setFilterID($id)
-	{
-		$this->filterID = $id;
-	}
+
 	private $buttontext = 'Save';
 	function setButtontext($v){
 		$this->buttontext = $v;
 	}
-
+	private $data ;
+	function setData($v){
+		$this->data = $v;
+	}
+	function setFilterID($v){
+		$this->filterID = $v;
+	}
 }
 
+?>
+<script>
+	$('#filtertype').change(function(){
+		//alert($("#filtertype option:selected").val());
+		$('#filterentryform').submit();
+	});
+	$('#val1').focusout(function(){
+		if($("#filtertype option:selected").val() == 1 && $('#val2').val() == ""){
+			$('#val2').val($('#val1').val());
+		}
+		if($("#filtertype option:selected").val() == 2 && $('#val2').val() == ""){
+			$('#val2').val($('#val1').val());
+		}
+	});
+</script>
diff --git a/application/forms/FilterEvaluate.php b/application/forms/FilterEvaluate.php
index 28dd848..b7c2b51 100644
--- a/application/forms/FilterEvaluate.php
+++ b/application/forms/FilterEvaluate.php
@@ -95,7 +95,16 @@ class Application_Form_FilterEvaluate extends Zend_Form
         }
 		$clientfield->setRegisterInArrayValidator(false);
 		$this->addElement($clientfield);
-
+		######################################
+		 $this->addElement('text', 'hardwarehash', array(
+			'filters' => array('StringTrim'),
+			'validators' => array(
+				array('StringLength', false, array(0, 50)),
+			),
+			'required' => false,
+			'label' => 'Hardwarehash:',
+		));
+		
 		$this->addElement('submit', 'submit', array(
             'required' => false,
             'ignore'   => true,
@@ -117,7 +126,5 @@ class Application_Form_FilterEvaluate extends Zend_Form
 	function setClients($v){
 		$this->clients = $v;
 	}
-
-
 }