From 2d5d1eb35ed1f607f12c5fb5b4f8cab5427d013a Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Mon, 12 Feb 2018 12:00:09 +0100
Subject: [PATCH 1/4] Added Apply button to FilterWidget

---
 application/views/widgets/filter/filter.php        | 4 ++++
 application/views/widgets/filter/selectFilters.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index 239bcb194..b63c58688 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -39,6 +39,10 @@
 			$("#filterForm").submit();
 		});
 
+		$("#applyFilter").click(function() {
+			$("#filterForm").submit();
+		});
+
 	});
 </script>
 <div class="row">
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index bb6de317f..50f4d6893 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -62,4 +62,8 @@
 	?>
 		</select>
 	</span>
+
+	<span>
+		<input id="applyFilter" name="applyFilter" type="button" value="Apply">
+	</span>
 </div>

From 0a3b546627937d6ccb34e18c347bd2092daee755 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Mon, 12 Feb 2018 14:06:39 +0100
Subject: [PATCH 2/4] Added functionality to hide or display column selection
 and filter selection in FilterWidget

---
 .../system/infocenter/infocenterData.php      |   4 +-
 application/views/widgets/filter/filter.php   |  11 +-
 .../views/widgets/filter/selectFields.php     | 107 +++++++------
 .../views/widgets/filter/selectFilters.php    | 143 ++++++++++--------
 4 files changed, 147 insertions(+), 118 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index e9371d8a7..28b2d018e 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -94,8 +94,8 @@
 				)
 			ORDER BY "LastAction" DESC
 		',
-		'hideHeader' => true,
-		'hideSave' => true,
+		'hideHeader' => false,
+		'hideSave' => false,
 		'checkboxes' => array('PersonId'),
 		'additionalColumns' => array('Details'),
 		'formatRaw' => function($fieldName, $fieldValue, $datasetRaw) {
diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index b63c58688..fdcd2d343 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -1,3 +1,10 @@
+<style>
+
+	.filters-hidden-panel {
+		margin: 0 10px 10px 10px;
+	}
+
+</style>
 <script language="Javascript" type="text/javascript">
 	$(document).ready(function() {
 
@@ -52,14 +59,10 @@
 				<?php FilterWidget::loadViewSelectFields($listFields); ?>
 			</div>
 
-			<br>
-
 			<div>
 				<?php FilterWidget::loadViewSelectFilters($metaData); ?>
 			</div>
 
-			<br>
-
 			<div>
 				<?php FilterWidget::loadViewSaveFilter(); ?>
 			</div>
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 729cfedc4..c94168d6f 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -1,50 +1,63 @@
-<div>
-<?php
-	$selectedFields = FilterWidget::getSelectedFields();
-	$columnsAliases = FilterWidget::getColumnsAliases();
+	<div class="panel-group">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title">
+					<a data-toggle="collapse" href="#collapseSelectFields">Select columns</a>
+				</h4>
+			</div>
+			<div id="collapseSelectFields" class="panel-collapse collapse">
+				<div class="filters-hidden-panel">
+					<div>
+					<?php
+						$selectedFields = FilterWidget::getSelectedFields();
+						$columnsAliases = FilterWidget::getColumnsAliases();
 
-	for ($selectedFieldsCounter = 0; $selectedFieldsCounter < count($selectedFields); $selectedFieldsCounter++)
-	{
-		$selectedField = $selectedFields[$selectedFieldsCounter];
-		$selectedFieldAlias = $selectedField;
+						for ($selectedFieldsCounter = 0; $selectedFieldsCounter < count($selectedFields); $selectedFieldsCounter++)
+						{
+							$selectedField = $selectedFields[$selectedFieldsCounter];
+							$selectedFieldAlias = $selectedField;
 
-		if ($columnsAliases != null)
-		{
-			$indx = array_search($selectedField, $listFields);
-			if ($indx !== false)
-			{
-				$selectedFieldAlias = $columnsAliases[$indx];
-			}
-		}
-?>
-		<input type="button" value="<?php echo $selectedFieldAlias; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
-<?php
-	}
-?>
-	<input type="hidden" id="<?php echo FilterWidget::CMD_REMOVE_FIELD; ?>" name="<?php echo FilterWidget::CMD_REMOVE_FIELD; ?>" value="">
-</div>
-<div>
-	<span>
-		Add field:
-	</span>
-	<span>
-		<select id="<?php echo FilterWidget::CMD_ADD_FIELD; ?>" name="<?php echo FilterWidget::CMD_ADD_FIELD; ?>">
-			<option value="">Select a field to add..</option>
-		<?php
-			for ($listFieldsCounter = 0; $listFieldsCounter < count($listFields); $listFieldsCounter++)
-			{
-				$listField = $listFields[$listFieldsCounter];
-				$listFieldAlias = $listField;
+							if ($columnsAliases != null)
+							{
+								$indx = array_search($selectedField, $listFields);
+								if ($indx !== false)
+								{
+									$selectedFieldAlias = $columnsAliases[$indx];
+								}
+							}
+					?>
+							<input type="button" value="<?php echo $selectedFieldAlias; ?> X" class="remove-field" fieldToRemove="<?php echo $selectedField; ?>">
+					<?php
+						}
+					?>
+						<input type="hidden" id="<?php echo FilterWidget::CMD_REMOVE_FIELD; ?>" name="<?php echo FilterWidget::CMD_REMOVE_FIELD; ?>" value="">
+					</div>
+					<div>
+						<span>
+							Add field:
+						</span>
+						<span>
+							<select id="<?php echo FilterWidget::CMD_ADD_FIELD; ?>" name="<?php echo FilterWidget::CMD_ADD_FIELD; ?>">
+								<option value="">Select a field to add..</option>
+							<?php
+								for ($listFieldsCounter = 0; $listFieldsCounter < count($listFields); $listFieldsCounter++)
+								{
+									$listField = $listFields[$listFieldsCounter];
+									$listFieldAlias = $listField;
 
-				if ($columnsAliases != null)
-				{
-					$listFieldAlias = $columnsAliases[$listFieldsCounter];
-				}
-		?>
-			<option value="<?php echo $listField; ?>"><?php echo $listFieldAlias; ?></option>
-		<?php
-			}
-		?>
-		</select>
-	</span>
-</div>
+									if ($columnsAliases != null)
+									{
+										$listFieldAlias = $columnsAliases[$listFieldsCounter];
+									}
+							?>
+								<option value="<?php echo $listField; ?>"><?php echo $listFieldAlias; ?></option>
+							<?php
+								}
+							?>
+							</select>
+						</span>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 50f4d6893..82986d064 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -1,69 +1,82 @@
-<div>
-<?php
-	$selectedFilters = FilterWidget::getSelectedFilters();
-	$columnsAliases = FilterWidget::getColumnsAliases();
-
-	for ($filtersCounter = 0; $filtersCounter < count($selectedFilters); $filtersCounter++)
-	{
-		$selectedFilter = $selectedFilters[$filtersCounter];
-
-		$md = FilterWidget::getFilterMetaData($selectedFilter, $metaData);
-		$selectedFieldAlias = $md->name;
-
-		if ($columnsAliases != null)
-		{
-			$indx = array_search($selectedFilter, $listFields);
-			if ($indx !== false)
-			{
-				$selectedFieldAlias = $columnsAliases[$indx];
-			}
-		}
-
-?>
-		<div>
-
-			<span>
-				<?php echo $selectedFieldAlias; ?>
-			</span>
-
-			<?php echo FilterWidget::renderFilterType($md); ?>
-
-			<span>
-				<input type="button" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
-			</span>
-
+<div class="panel-group">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				<a data-toggle="collapse" href="#collapseSelectFilters">Select filters</a>
+			</h4>
 		</div>
-<?php
-	}
-?>
-	<input type="hidden" id="<?php echo FilterWidget::CMD_REMOVE_FILTER; ?>" name="<?php echo FilterWidget::CMD_REMOVE_FILTER; ?>" value="">
-</div>
-<div>
-	<span>
-		Add filter:
-	</span>
-	<span>
-		<select id="<?php echo FilterWidget::CMD_ADD_FILTER; ?>" name="<?php echo FilterWidget::CMD_ADD_FILTER; ?>">
-			<option value="">Select a filter to add...</option>
-	<?php
-		for ($listFieldsCounter = 0; $listFieldsCounter < count($listFields); $listFieldsCounter++)
-		{
-			$field = $listFields[$listFieldsCounter];
-			$listFieldAlias = $field;
+		<div id="collapseSelectFilters" class="panel-collapse collapse">
+			<div class="filters-hidden-panel">
+				<div>
+				<?php
+					$selectedFilters = FilterWidget::getSelectedFilters();
+					$columnsAliases = FilterWidget::getColumnsAliases();
 
-			if ($columnsAliases != null)
-			{
-				$listFieldAlias = $columnsAliases[$listFieldsCounter];
-			}
-	?>
-			<option value="<?php echo $field; ?>"><?php echo $listFieldAlias; ?></option>
-	<?php
-		}
-	?>
-		</select>
-	</span>
+					for ($filtersCounter = 0; $filtersCounter < count($selectedFilters); $filtersCounter++)
+					{
+						$selectedFilter = $selectedFilters[$filtersCounter];
 
-	<span>
-		<input id="applyFilter" name="applyFilter" type="button" value="Apply">
-	</span>
+						$md = FilterWidget::getFilterMetaData($selectedFilter, $metaData);
+						$selectedFieldAlias = $md->name;
+
+						if ($columnsAliases != null)
+						{
+							$indx = array_search($selectedFilter, $listFields);
+							if ($indx !== false)
+							{
+								$selectedFieldAlias = $columnsAliases[$indx];
+							}
+						}
+
+				?>
+						<div>
+
+							<span>
+								<?php echo $selectedFieldAlias; ?>
+							</span>
+
+							<?php echo FilterWidget::renderFilterType($md); ?>
+
+							<span>
+								<input type="button" value="X" class="remove-filter" filterToRemove="<?php echo $md->name; ?>">
+							</span>
+
+						</div>
+				<?php
+					}
+				?>
+					<input type="hidden" id="<?php echo FilterWidget::CMD_REMOVE_FILTER; ?>" name="<?php echo FilterWidget::CMD_REMOVE_FILTER; ?>" value="">
+				</div>
+				<div>
+					<span>
+						Add filter:
+					</span>
+					<span>
+						<select id="<?php echo FilterWidget::CMD_ADD_FILTER; ?>" name="<?php echo FilterWidget::CMD_ADD_FILTER; ?>">
+							<option value="">Select a filter to add...</option>
+					<?php
+						for ($listFieldsCounter = 0; $listFieldsCounter < count($listFields); $listFieldsCounter++)
+						{
+							$field = $listFields[$listFieldsCounter];
+							$listFieldAlias = $field;
+
+							if ($columnsAliases != null)
+							{
+								$listFieldAlias = $columnsAliases[$listFieldsCounter];
+							}
+					?>
+							<option value="<?php echo $field; ?>"><?php echo $listFieldAlias; ?></option>
+					<?php
+						}
+					?>
+						</select>
+					</span>
+
+					<span>
+						<input id="applyFilter" name="applyFilter" type="button" value="Apply">
+					</span>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>

From d5415773dd7215482bf42a821fee7bd03894a929 Mon Sep 17 00:00:00 2001
From: cris-technikum <31620366+cris-technikum@users.noreply.github.com>
Date: Mon, 12 Feb 2018 14:52:24 +0100
Subject: [PATCH 3/4] FAS Bescheid English: title modified

---
 system/xsl/bescheidEng_0.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/xsl/bescheidEng_0.xsl b/system/xsl/bescheidEng_0.xsl
index 30ddca3d8..0c06f1a64 100644
--- a/system/xsl/bescheidEng_0.xsl
+++ b/system/xsl/bescheidEng_0.xsl
@@ -68,7 +68,7 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
 				<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
 				<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
 			</text:sequence-decls>
-			<text:p text:style-name="Seitenumbruch"><xsl:value-of select="titel" /></text:p>
+			<text:p text:style-name="Seitenumbruch">Official Notification</text:p>
 				<!-- Ueberprueft ob benoetigte Datenfelder leer sind -->
 				<xsl:if test="staatsbuergerschaft = ''"><text:p text:style-name="P4">Staatsbürgerschaft nicht angegeben</text:p></xsl:if>
 				<xsl:if test="datum = ''"><text:p text:style-name="P4">Datum der Abschlussprüfung nicht gesetzt</text:p></xsl:if>

From c2b328c69f2c7b5c2e32a6fdfa19ed7d3fb738bd Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Tue, 13 Feb 2018 13:52:45 +0100
Subject: [PATCH 4/4] FilterWidget: if "is set" is chosen in the operation
 dropdown, then the operation value field and the option field will be hidden

---
 application/views/widgets/filter/filter.php |  4 ++++
 application/widgets/FilterWidget.php        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index fdcd2d343..c6df10073 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -4,6 +4,10 @@
 		margin: 0 10px 10px 10px;
 	}
 
+	.hidden-control {
+		display: none !important;
+	}
+
 </style>
 <script language="Javascript" type="text/javascript">
 	$(document).ready(function() {
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index db519686d..41f55d1df 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -323,6 +323,14 @@ class FilterWidget extends Widget
 		}
 		elseif ($filterMetaData->type == 'timestamp')
 		{
+			$classOperation = 'select-filter-operation-value';
+			$classOption = 'select-filter-option';
+			if ($activeFilterOperationValue == self::OP_SET)
+			{
+				$classOperation .= ' hidden-control';
+				$classOption .= ' hidden-control';
+			}
+
 			$html = '
 				<span>
 					<select name="%s" class="select-filter-operation">
@@ -333,9 +341,9 @@ class FilterWidget extends Widget
 					</select>
 				</span>
 				<span>
-					<input type="text" name="%s" value="%s" class="select-filter-operation-value">
+					<input type="text" name="%s" value="%s" class="'.$classOperation.'">
 				</span>
-				<select name="%s" class="select-filter-option">
+				<select name="%s" class="'.$classOption.'">
 					<option value="'.self::OPT_DAYS.'" '.($activeFilterOptionValue == self::OPT_DAYS ? 'selected' : '').'>Days</option>
 					<option value="'.self::OPT_MONTHS.'" '.($activeFilterOptionValue == self::OPT_MONTHS ? 'selected' : '').'>Months</option>
 				</select>