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 239bcb194..c6df10073 100644 --- a/application/views/widgets/filter/filter.php +++ b/application/views/widgets/filter/filter.php @@ -1,3 +1,14 @@ +
@@ -48,14 +63,10 @@
-
-
-
-
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 @@ -
- +
+
+

+ Select columns +

+
+
+
+
+ - - - -
-
- - Add field: - - - + + +
+
+ + Add field: + + + - -
+ if ($columnsAliases != null) + { + $listFieldAlias = $columnsAliases[$listFieldsCounter]; + } + ?> + + + + +
+
+
+
+ diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php index bb6de317f..82986d064 100644 --- a/application/views/widgets/filter/selectFilters.php +++ b/application/views/widgets/filter/selectFilters.php @@ -1,65 +1,82 @@ -
-name; - - if ($columnsAliases != null) - { - $indx = array_search($selectedFilter, $listFields); - if ($indx !== false) - { - $selectedFieldAlias = $columnsAliases[$indx]; - } - } - -?> -
- - - - - - - - - - - +
+
+ - - -
-
- - Add filter: - - - - + 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]; + } + } + + ?> +
+ + + + + + + + + + + +
+ + +
+
+ + Add filter: + + + + + + + + +
+
+
+
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 = ' - + - 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" - + Official Notification Staatsbürgerschaft nicht angegeben Datum der Abschlussprüfung nicht gesetzt