From e2908cc1d7c1cdf5640231dc78ca1b10e1ee77ef Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Fri, 1 Dec 2017 16:57:18 +0100
Subject: [PATCH] - Sets correctly the selected filter operation - Use enter to
 set a filter - Replaced submit buttons with buttons

---
 application/views/widgets/filter/filter.php   |  9 ++++-
 .../views/widgets/filter/selectFields.php     |  2 +-
 .../views/widgets/filter/selectFilters.php    |  2 +-
 application/widgets/FilterWidget.php          | 38 ++++++++++++++-----
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index 23d3981d7..271b5a224 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -14,6 +14,7 @@
 		$(".remove-field").each(function() {
 			$(this).click(function() {
 				$("#rmField").val($(this).attr('fieldToRemove'));
+				$("#filterForm").submit();
 			});
 		});
 
@@ -24,6 +25,7 @@
 		$(".remove-filter").each(function() {
 			$(this).click(function() {
 				$("#rmFilter").val($(this).attr('filterToRemove'));
+				$("#filterForm").submit();
 			});
 		});
 
@@ -31,8 +33,11 @@
 			$("#filterForm").submit();
 		});
 
-		$(".select-filter-operation-value").keyup(function() {
-			$("#filterForm").submit();
+		$(".select-filter-operation-value").keydown(function(event) {
+			if (event.which == 13)
+			{
+				$("#filterForm").submit();
+			}
 		});
 
 	});
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 94ee75267..8bc988125 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -6,7 +6,7 @@
 	{
 		$selectedField = $selectedFields[$selectedFieldsCounter];
 ?>
-		<input type="submit" value="<?php echo $selectedField; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
+		<input type="button" value="<?php echo $selectedField; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
 <?php
 	}
 ?>
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 4f9d65340..9a4aa0ffd 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -17,7 +17,7 @@
 			<?php echo FilterWidget::renderFilterType($md); ?>
 
 			<span>
-				<input type="submit" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
+				<input type="button" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
 			</span>
 
 		</div>
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index b5e5bb766..0c456365e 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -146,17 +146,18 @@ class FilterWidget extends Widget
 	public static function renderFilterType($filterMetaData)
 	{
 		$html = '';
-		$value = self::_getActiveFilterValue($filterMetaData->name);
+		$activeFilterValue = self::_getActiveFilterValue($filterMetaData->name);
+		$activeFilterOperationValue = self::_getActiveFilterOperationValue($filterMetaData->name);
 
 		if ($filterMetaData->type == 'int4')
 		{
 			$html = '
 				<span>
 					<select name="%s" class="select-filter-operation">
-						<option value="'.self::OP_EQUAL.'">equal</option>
-						<option value="'.self::OP_NOT_EQUAL.'">not equal</option>
-						<option value="'.self::OP_GREATER_THAN.'">greater than</option>
-						<option value="'.self::OP_LESS_THAN.'">less than</option>
+						<option value="'.self::OP_EQUAL.'" '.($activeFilterOperationValue == self::OP_EQUAL ? 'selected' : '').'>equal</option>
+						<option value="'.self::OP_NOT_EQUAL.'" '.($activeFilterOperationValue == self::OP_NOT_EQUAL ? 'selected' : '').'>not equal</option>
+						<option value="'.self::OP_GREATER_THAN.'" '.($activeFilterOperationValue == self::OP_GREATER_THAN ? 'selected' : '').'>greater than</option>
+						<option value="'.self::OP_LESS_THAN.'" '.($activeFilterOperationValue == self::OP_LESS_THAN ? 'selected' : '').'>less than</option>
 					</select>
 				</span>
 				<span>
@@ -169,8 +170,8 @@ class FilterWidget extends Widget
 			$html = '
 				<span>
 					<select name="%s" class="select-filter-operation">
-						<option value="'.self::OP_CONTAINS.'">contains</option>
-						<option value="'.self::OP_NOT_CONTAIN.'">does not contain</option>
+						<option value="'.self::OP_CONTAINS.'" '.($activeFilterOperationValue == self::OP_CONTAINS ? 'selected' : '').'>contains</option>
+						<option value="'.self::OP_NOT_CONTAIN.'" '.($activeFilterOperationValue == self::OP_NOT_CONTAIN ? 'selected' : '').'>does not contain</option>
 					</select>
 				</span>
 				<span>
@@ -183,8 +184,8 @@ class FilterWidget extends Widget
 			$html = '
 				<span>
 					<select name="%s" class="select-filter-operation">
-						<option value="'.self::OP_IS_TRUE.'">is true</option>
-						<option value="'.self::OP_IS_FALSE.'">is false</option>
+						<option value="'.self::OP_IS_TRUE.'" '.($activeFilterOperationValue == self::OP_IS_TRUE ? 'selected' : '').'>is true</option>
+						<option value="'.self::OP_IS_FALSE.'" '.($activeFilterOperationValue == self::OP_IS_FALSE ? 'selected' : '').'>is false</option>
 					</select>
 				</span>
 				<span>
@@ -193,7 +194,7 @@ class FilterWidget extends Widget
 			';
 		}
 
-		return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $value);
+		return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $activeFilterValue);
 	}
 
 	/**
@@ -246,6 +247,23 @@ class FilterWidget extends Widget
 		return $getActiveFilterValue;
 	}
 
+	/**
+	 *
+	 */
+	private static function _getActiveFilterOperationValue($filterName)
+	{
+		$getActiveFilterOperationValue = '';
+
+		$activeFieldsOperation = self::_getFromSession(self::ACTIVE_FILTERS_OPERATION);
+
+		if (isset($activeFieldsOperation[$filterName]))
+		{
+			$getActiveFilterOperationValue = $activeFieldsOperation[$filterName];
+		}
+
+		return $getActiveFilterOperationValue;
+	}
+
 	/**
 	 *
 	 */