From 307c8a44f17f6fc3c1098ad15d6807af276c1fad Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Thu, 12 Apr 2018 11:58:10 +0200
Subject: [PATCH] - Removed parameters hideHeader and hideSave from
 system/infocenter/infocenterData (they do not REALLY need) - Now the JS
 function renderSelectedFilterFields can recognize the metadata text type -
 Filter options panel beautified

---
 .../system/infocenter/infocenterData.php      |  2 --
 application/views/widgets/filter/filter.php   | 33 ++++++++++++++-----
 .../views/widgets/filter/saveFilter.php       |  9 ++++-
 .../views/widgets/filter/selectFields.php     |  2 +-
 .../views/widgets/filter/selectFilters.php    | 26 ++++++++-------
 5 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 4a30c137b..f758ecddc 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -140,8 +140,6 @@
 				)
 			ORDER BY "LastAction" ASC
 		',
-		'hideHeader' => false,
-		'hideSave' => false,
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
 		'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation','Letzte Aktion','Letzter Bearbeiter',
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index 606d19b60..d895b0687 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -1,5 +1,11 @@
 <style>
 
+	.filter-options-span {
+		display: inline-block;
+		width: 130px;
+		font-weight: bold;
+	}
+
 	.filter-name-title {
 		font-family: inherit;
 		font-size: 16px;
@@ -69,26 +75,37 @@
 
 	.select-filter-option {
 		display: inline;
-		width: 90px;
+		width: 100px;
 	}
 
-	#addField {
+	#addField, #customFilterDescription, #addFilter {
 		display: inline;
-		width: 400px;
+		width: 535px;
 	}
 
 	#addFilter {
-		display: inline;
-		width: 400px;
+		margin-right: 12px;
 	}
 
 	#selectedFilters {
 		margin-bottom: 20px;
 	}
 
-	#customFilterDescription {
-		display: inline;
-		width: 400px;
+	#applyFilter, #saveCustomFilterButton, .remove-selected-filter {
+		font-weight: bold;
+	}
+
+	.remove-selected-filter {
+		padding-bottom: 3px;
+	}
+
+	.panel-title {
+		font-weight: bold;
+		padding-top: 3px;
+	}
+
+	.remove-field {
+		font-weight: bold;
 	}
 
 </style>
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
index 1fd9c57af..99f5f5d9d 100644
--- a/application/views/widgets/filter/saveFilter.php
+++ b/application/views/widgets/filter/saveFilter.php
@@ -30,12 +30,19 @@
 
 </script>
 
+<br>
+
 <div>
+	<span class="filter-options-span">
+		Filter description:
+	</span>
 	<span>
-		Filter description: <input type="text" id="customFilterDescription" value="">
+		<input type="text" id="customFilterDescription" value="">
 	</span>
 
 	<span>
 		<input type="button" id="saveCustomFilterButton" value="Save filter">
 	</span>
 </div>
+
+<br>
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 57edda25e..18d5cac02 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -232,7 +232,7 @@
 	<div id="filterSelectFieldsDnd" class="filter-select-fields-dnd-div"></div>
 
 	<div>
-		<span>
+		<span class="filter-options-span">
 			Add field:
 		</span>
 
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 4ffe06e0a..71232b20a 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -120,7 +120,7 @@
 		if (metaData.type.toLowerCase().indexOf("int") >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="equal" ' + (activeFiltersOperation == "equal" ? "selected" : "") + '>equal</option>';
 			html += '		<option value="nequal" ' + (activeFiltersOperation == "nqual" ? "selected" : "") + '>not equal</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
@@ -128,37 +128,37 @@
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="number" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="number" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
-		if (metaData.type.toLowerCase().indexOf('varchar') >= 0)
+		if (metaData.type.toLowerCase().indexOf('varchar') >= 0 || metaData.type.toLowerCase() == 'text')
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="contains" ' + (activeFiltersOperation == "contains" ? "selected" : "") + '>contains</option>';
 			html += '		<option value="ncontains" ' + (activeFiltersOperation == "ncontains" ? "selected" : "") + '>does not contain</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="text" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="text" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('bool') >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="true" ' + (activeFiltersOperation == "true" ? "selected" : "") + '>is true</option>';
 			html += '		<option value="false" ' + (activeFiltersOperation == "false" ? "selected" : "") + '>is false</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="hidden" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
+			html += '	<input type="hidden" value="' + activeFilters + '" class="form-control select-filter-operation-value">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('timestamp') >= 0 || metaData.type.toLowerCase().indexOf('date') >= 0)
 		{
-			var classOperation = 'select-filter-operation-value form-control';
-			var classOption = 'select-filter-option form-control';
+			var classOperation = 'form-control select-filter-operation-value';
+			var classOption = 'form-control select-filter-option';
 			var disabled = "";
 
 			if (activeFiltersOperation == "set" || activeFiltersOperation == "nset")
@@ -169,7 +169,7 @@
 			}
 
 			html = '<span>';
-			html += '	<select class="select-filter-operation form-control">';
+			html += '	<select class="form-control select-filter-operation">';
 			html += '		<option value="lt" ' + (activeFiltersOperation == "lt" ? "selected" : "") + '>less than</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
 			html += '		<option value="set" ' + (activeFiltersOperation == "set" ? "selected" : "") + '>is set</option>';
@@ -215,7 +215,7 @@
 				{
 					var selectedFilters = '<div>';
 
-					selectedFilters += '<span>';
+					selectedFilters += '<span class="filter-options-span">';
 					selectedFilters += data.selectedFiltersAliases[i];
 					selectedFilters += '</span>';
 
@@ -272,10 +272,12 @@
 
 </script>
 
+<br>
+
 <div id="selectedFilters"></div>
 
 <div>
-	<span>
+	<span class="filter-options-span">
 		Add filter:
 	</span>