Merge branch 'develop' into 52n-private/develop

KomMonitor · Apr 24, 2023 · d0a8c28 · d0a8c28
2 parents e8ceb36 + 775e721
commit d0a8c28
Show file tree

Hide file tree

Showing 26 changed files with 2,943 additions and 1,483 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,68 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v2.1.12](https://github.com/KomMonitor/web-client/compare/v2.1.11...v2.1.12)
+
+- implement prefilling of role based access data tables; prefilled with roles of currently loggid in user in order to guarantee that he/she has access rights [`00d9df3`](https://github.com/KomMonitor/web-client/commit/00d9df380d1e39f96d943f47cc095f5e5bcda8eb)
+- add version info for version 2.1.12 [`a2868f3`](https://github.com/KomMonitor/web-client/commit/a2868f3440ef11df13bc402316e26868722d9e8f)
+
+#### [v2.1.11](https://github.com/KomMonitor/web-client/compare/v2.1.10...v2.1.11)
+
+> 21 March 2023
+
+- fix issues with data grid tables where false datasets were opened after editing other datasets; fixes #40 [`#40`](https://github.com/KomMonitor/web-client/issues/40)
+- add version info for v.2.1.11 [`21a8b9a`](https://github.com/KomMonitor/web-client/commit/21a8b9ab70f984f3891f0f7bc3fd506dbb4414ed)
+- Release 2.1.11 [`94fd844`](https://github.com/KomMonitor/web-client/commit/94fd8446088dac9630fd6995ed270f21c814839c)
+
+#### [v2.1.10](https://github.com/KomMonitor/web-client/compare/v2.1.9...v2.1.10)
+
+> 20 March 2023
+
+- fix bug in points in polygon analysis causing found POI features to not be displayed on map; fixes #39 [`#39`](https://github.com/KomMonitor/web-client/issues/39)
+- add version info for v2.1.10 [`798da1e`](https://github.com/KomMonitor/web-client/commit/798da1e7b3f929728533ab187dbc70d2aa91a8a1)
+- Release 2.1.10 [`450e94d`](https://github.com/KomMonitor/web-client/commit/450e94d9f3384bbdc64173e40f38b0b82aa823df)
+
+#### [v2.1.9](https://github.com/KomMonitor/web-client/compare/v2.1.8...v2.1.9)
+
+> 20 March 2023
+
+- fix georesource export due to additional / in path to logo; fixes #36 [`#36`](https://github.com/KomMonitor/web-client/issues/36)
+- fix various field issues with batch update wrt converter encoding and mimeType not being processed properly; fixes #38 [`#38`](https://github.com/KomMonitor/web-client/issues/38)
+- add version info for v 2.1.9 [`77015d5`](https://github.com/KomMonitor/web-client/commit/77015d5676df340bb0ac835b9e824d47a354781d)
+- Release 2.1.9 [`973a987`](https://github.com/KomMonitor/web-client/commit/973a987f4e6742d35ecb951c4506402d675af72a)
+
+#### [v2.1.8](https://github.com/KomMonitor/web-client/compare/v2.1.7...v2.1.8)
+
+> 5 March 2023
+
+- fix bug in regression diagram when x and y axis have different number of displayable features, fixes #37 [`#37`](https://github.com/KomMonitor/web-client/issues/37)
+- add version info for v 2.1.8 [`c432aef`](https://github.com/KomMonitor/web-client/commit/c432aef8854bb3fb4defddf5f406ec428f4bb889)
+- Release 2.1.8 [`6d4e1aa`](https://github.com/KomMonitor/web-client/commit/6d4e1aae9a89e111d852f7340b1dfb5b9c52d230)
+
+#### [v2.1.7](https://github.com/KomMonitor/web-client/compare/v2.1.6...v2.1.7)
+
+> 2 March 2023
+
+- fix bug where admin data tables did not show up when switching between admin and map interface while staying logged in, fixes #35 [`#35`](https://github.com/KomMonitor/web-client/issues/35)
+- fix bug in batch update where HTTP URL field and INLINE PAYLOAD fields where not properly taken into account when exporting batch list and performing batch update itself, fixes #34 [`#34`](https://github.com/KomMonitor/web-client/issues/34)
+- apply version info for version 2.1.7 [`60f0cb9`](https://github.com/KomMonitor/web-client/commit/60f0cb934049edabe5aa60ae24c42eaa811de09f)
+- prevent loading screen of regression and radar charts to overlap other sidebar content and thus allow menu clicking [`db4431f`](https://github.com/KomMonitor/web-client/commit/db4431f39133d119ff77330157603df2606ea5a6)
+- ensure collapse trigger logic for georesources topic hierarchy [`64e0faf`](https://github.com/KomMonitor/web-client/commit/64e0faf79c1b578aad33c3d6a93416fc7cb0660c)
+
+#### [v2.1.6](https://github.com/KomMonitor/web-client/compare/v2.1.5...v2.1.6)
+
+> 6 February 2023
+
+- update package-lock [`5b9486b`](https://github.com/KomMonitor/web-client/commit/5b9486b8cdcfbd010e8b6ae9b2b9b4c5412911af)
+- improve spatial unit fitler and also improve visuals [`a0d496f`](https://github.com/KomMonitor/web-client/commit/a0d496fc66fc624bf0ab74554204d61657cb2ed2)
+- add version info for v 2.1.6 [`1d10d73`](https://github.com/KomMonitor/web-client/commit/1d10d7306961c8107e01e126d64adc46a282e2db)
+
 #### [v2.1.5](https://github.com/KomMonitor/web-client/compare/v2.1.4...v2.1.5)
 
+> 21 November 2022
+
 - add version info 2.1.5 [`79255ad`](https://github.com/KomMonitor/web-client/commit/79255ade5c0ff7a946749e1bb2b9619361bed8f2)
+- Release 2.1.5 [`95e32d1`](https://github.com/KomMonitor/web-client/commit/95e32d1241dfa39858d614d375e9672053bd1b64)
 - when renaming spatial units ensure that indicator metadata is fetched as well, as joins between indicators and spatial units may have been modified [`7419534`](https://github.com/KomMonitor/web-client/commit/741953473460831212f135cc9b6794b63d506479)
 
 #### [v2.1.4](https://github.com/KomMonitor/web-client/compare/v2.1.3...v2.1.4)

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -192,7 +192,8 @@ module.exports = function (grunt) {
             'icons/**/*',
             'logos/**/*',
             'components/**/*.template.html',
-            'config/**/*'           
+            'config/**/*',
+            'favicon.ico'           
         ],
 
         // babel: {

diff --git a/...rAdmin/adminGeoresourcesManagement/georesourceAddModal/georesource-add-modal.component.js b/...rAdmin/adminGeoresourcesManagement/georesourceAddModal/georesource-add-modal.component.js
@@ -112,7 +112,7 @@ angular.module('georesourceAddModal').component('georesourceAddModal', {
 		});
 
 		function refreshRoles() {	
-			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('georesourceAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, null);	
+			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('georesourceAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, kommonitorDataExchangeService.getCurrentKomMonitorLoginRoleIds());	
 		}
 
 		$scope.georesourceTopic_mainTopic = undefined;

diff --git a/...ourcesManagement/georesourceBatchUpdateModal/georesource-batch-update-modal.template.html b/...ourcesManagement/georesourceBatchUpdateModal/georesource-batch-update-modal.template.html
@@ -35,6 +35,7 @@ <h4 class="modal-title">Batch-Update</h4>
 											<th>G&uuml;ltigkeitszeitraum bis</th>
 											<th>Geodaten-Quellformat*</th>
 											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length">Quellformat*</th>
+											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length">Encoding*</th>
 											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('GeoJSON') ||
 											$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('Shapefile (ZIP-Ordner mit .shp, .dbf, .prj)') ||
 											$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('Tabelle_XY_Koordinate_zu_Punkt') ||
@@ -132,6 +133,14 @@ <h4 class="modal-title">Batch-Update</h4>
 												</select>
 											</td>
 
+											<!-- Encoding -->
+											<td ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length>0">
+												<select class="form-control" ng-model="georesource.mappingObj.converter.encoding" 
+													ng-options="encoding for encoding in georesource.selectedConverter.encodings" required>
+													<option disabled selected value> -- Encoding w&auml;hlen -- </option>
+												</select>
+											</td>
+
 											<!-- CRS -->
 											<td ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('GeoJSON') ||
 														$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('Shapefile (ZIP-Ordner mit .shp, .dbf, .prj)') ||
@@ -238,7 +247,7 @@ <h4 class="modal-title">Batch-Update</h4>
 
 											<!-- URL -->
 											<td ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkIfSelectedDatasourceTypeIsHttp(batchList)">
-												<input class="form-control" type="text" ng-model="georesource.mappingObj.dataSource.url"
+												<input class="form-control" type="text" ng-model="georesource.mappingObj.dataSource.URL"
 												ng-disabled="!georesource.selectedDatasourceType.type.includes('HTTP')" required>
 											</td>
 
@@ -349,6 +358,7 @@ <h4 class="modal-title">Batch-Update</h4>
 										<option value="mappingObj.periodOfValidity.endDate">G&uuml;ltigkeitszeitraum bis</option>
 										<option value="selectedConverter">Geodaten-Quellformat*</option>
 										<option value="mappingObj.converter.mimeType">Quellformat*</option>
+										<option value="mappingObj.converter.encoding">Encoding*</option>
 										<option value="mappingObj.converter.crs">CRS*</option>
 										<option value="mappingObj.converter.hnrColumnName">Hausnummer_Spaltenname*</option>
 										<option value="mappingObj.converter.streetColumnName">Strasse_Spaltenname*</option>
@@ -364,7 +374,7 @@ <h4 class="modal-title">Batch-Update</h4>
 										<option value="mappingObj.converter.separator">Trennzeichen</option>
 										<option value="selectedDatasourceType">Datenquelltyp*</option>
 										<!-- File is not supported here -->
-										<option value="mappingObj.dataSource.url">URL*</option>
+										<option value="mappingObj.dataSource.URL">URL*</option>
 										<option value="mappingObj.dataSource.payload">Payload*</option>
 										<option value="mappingObj.propertyMapping.identifierProperty">ID Attributname*</option>
 										<option value="mappingObj.propertyMapping.nameProperty">NAME Attributname*</option>
@@ -411,6 +421,15 @@ <h4 class="modal-title">Batch-Update</h4>
 										<option disabled selected value> -- Quellformat w&auml;hlen -- </option>
 									</select>
 
+									<!-- Encoding* -->
+									<!-- Only enable this field if every row has the same converter selected.
+										This is why we can use the values of the converter of the first row here, because all other rows should be the same. -->
+										<select ng-show="colDefaultFunctionSelectedColumn=='mappingObj.converter.encoding'" class="form-control" ng-model="colDefaultFunctionNewValue"
+										ng-options="encoding for encoding in $ctrl.kommonitorBatchUpdateHelperServiceInstance.getConverterObjectByName(batchList[0].selectedConverter.name).encodings"
+										ng-disabled="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length != 1">
+										<option disabled selected value> -- Encoding w&auml;hlen -- </option>
+									</select>
+
 									<!-- CRS* -->
 									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.converter.crs'" type="text" class="form-control"
 										ng-model="colDefaultFunctionNewValue" placeholder="z.B. EPSG:4326"
@@ -504,7 +523,7 @@ <h4 class="modal-title">Batch-Update</h4>
 											<option disabled selected value> -- Quelltyp w&auml;hlen -- </option>
 									</select>
 									<!-- URL* -->
-									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.dataSource.url'" type="text" class="form-control"
+									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.dataSource.URL'" type="text" class="form-control"
 										ng-model="colDefaultFunctionNewValue" ng-disabled="!$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkIfSelectedDatasourceTypeIsHttp(batchList)">
 									</input>
 									<!-- Payload* -->

diff --git a/...monitorAdmin/adminIndicatorsManagement/indicatorAddModal/indicator-add-modal.component.js b/...monitorAdmin/adminIndicatorsManagement/indicatorAddModal/indicator-add-modal.component.js
@@ -167,7 +167,7 @@ angular.module('indicatorAddModal').component('indicatorAddModal', {
 		});
 
 		function refreshRoles() {
-			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, null);
+			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, kommonitorDataExchangeService.getCurrentKomMonitorLoginRoleIds());
 		}
 
 		$scope.datasetName = undefined;
@@ -265,7 +265,7 @@ angular.module('indicatorAddModal').component('indicatorAddModal', {
 			$scope.metadata.lastUpdate = undefined;
 			$scope.metadata.description = undefined;
 
-			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, null);			
+			$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorAddRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, kommonitorDataExchangeService.getCurrentKomMonitorLoginRoleIds());			
 
 			$scope.datasetName = undefined;
 			$scope.indicatorAbbreviation = undefined;

diff --git a/...IndicatorsManagement/indicatorBatchUpdateModal/indicator-batch-update-modal.template.html b/...IndicatorsManagement/indicatorBatchUpdateModal/indicator-batch-update-modal.template.html
@@ -36,6 +36,7 @@ <h4 class="modal-title">Batch-Update</h4>
 											<th>Zeitreihen-Mapping*</th>
 											<th>Datensatz-Quellformat*</th>
 											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length">Quellformat*</th>
+											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length">Encoding*</th>
 											<th ng-show="false">CRS*</th>
 											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('Tabelle_Zeitreihe_zu_Indikator')">Trennzeichen*</th>
 											<th ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).includes('WFS_v1')">Schema*</th>
@@ -100,6 +101,14 @@ <h4 class="modal-title">Batch-Update</h4>
 												</select>
 											</td>
 
+											<!-- Encoding -->
+											<td ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length>0">
+												<select class="form-control" ng-model="indicator.mappingObj.converter.encoding" 
+													ng-options="encoding for encoding in indicator.selectedConverter.encodings" required>
+													<option disabled selected value> -- Encoding w&auml;hlen -- </option>
+												</select>
+											</td>
+
 											<!-- CRS -->
 											<!-- Not shown to user and preset to EPSG:4326 -->
 											<td ng-show="false">
@@ -157,7 +166,7 @@ <h4 class="modal-title">Batch-Update</h4>
 
 											<!-- URL -->
 											<td ng-show="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkIfSelectedDatasourceTypeIsHttp(batchList)">
-												<input class="form-control" type="text" ng-model="indicator.mappingObj.dataSource.url"
+												<input class="form-control" type="text" ng-model="indicator.mappingObj.dataSource.URL"
 												ng-disabled="!indicator.selectedDatasourceType.type.includes('HTTP')" required>
 											</td>
 
@@ -244,13 +253,14 @@ <h4 class="modal-title">Batch-Update</h4>
 										<option value="mappingObj.propertyMapping.timeseriesMappings">Zeitreihen-Mapping*</option>
 										<option value="selectedConverter">Datensatz-Quellformat*</option>
 										<option value="mappingObj.converter.mimeType">Quellformat*</option>
+										<option value="mappingObj.converter.encoding">Encoding*</option>
 										<option value="mappingObj.converter.separator">Trennzeichen*</option>
 										<option value="mappingObj.converter.schema">Schema*</option>
 										<option value="mappingObj.converter.schemaNamespace">NAMESPACE</option>
 										<option value="mappingObj.converter.schemaLocation">SCHEMA_LOCATION</option>
 										<option value="selectedDatasourceType">Datenquelltyp*</option>
 										<!-- File is not supported here -->
-										<option value="mappingObj.dataSource.url">URL*</option>
+										<option value="mappingObj.dataSource.URL">URL*</option>
 										<option value="mappingObj.dataSource.payload">Payload*</option>
 										<option value="mappingObj.propertyMapping.spatialReferenceKeyProperty">ID Attributname der Raumeinheiten-Features*</option>
 										<option value="selectedTargetSpatialUnit">Ziel-Raumebene*</option>
@@ -280,6 +290,15 @@ <h4 class="modal-title">Batch-Update</h4>
 										ng-disabled="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length != 1">
 										<option disabled selected value> -- Quellformat w&auml;hlen -- </option>
 									</select>
+
+									<!-- Encoding* -->
+									<!-- Only enable this field if every row has the same converter selected.
+										This is why we can use the values of the converter of the first row here, because all other rows should be the same. -->
+										<select ng-show="colDefaultFunctionSelectedColumn=='mappingObj.converter.encoding'" class="form-control" ng-model="colDefaultFunctionNewValue"
+										ng-options="encoding for encoding in $ctrl.kommonitorBatchUpdateHelperServiceInstance.getConverterObjectByName(batchList[0].selectedConverter.name).encodings"
+										ng-disabled="$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkColumnsToShow_selectedConverter(batchList).length != 1">
+										<option disabled selected value> -- Encoding w&auml;hlen -- </option>
+									</select>
 
 									<!-- Trennzeichen* -->
 									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.converter.separator'" type="text" class="form-control"
@@ -313,7 +332,7 @@ <h4 class="modal-title">Batch-Update</h4>
 									</select>
 
 									<!-- URL* -->
-									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.dataSource.url'" type="text" class="form-control"
+									<input ng-show="colDefaultFunctionSelectedColumn=='mappingObj.dataSource.URL'" type="text" class="form-control"
 										ng-model="colDefaultFunctionNewValue" ng-disabled="!$ctrl.kommonitorBatchUpdateHelperServiceInstance.checkIfSelectedDatasourceTypeIsHttp(batchList)">
 									</input>
 

diff --git a/...ndicatorsManagement/indicatorEditFeaturesModal/indicator-edit-features-modal.component.js b/...ndicatorsManagement/indicatorEditFeaturesModal/indicator-edit-features-modal.component.js
@@ -256,7 +256,7 @@ angular.module('indicatorEditFeaturesModal').component('indicatorEditFeaturesMod
 					}					
 				}
 
-				$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorEditFeaturesRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, null);
+				$scope.roleManagementTableOptions = kommonitorDataGridHelperService.buildRoleManagementGrid('indicatorEditFeaturesRoleManagementTable', $scope.roleManagementTableOptions, kommonitorDataExchangeService.accessControl, kommonitorDataExchangeService.getCurrentKomMonitorLoginRoleIds());
 
 				$scope.spatialUnitRefKeyProperty = undefined;
 				$scope.targetSpatialUnitMetadata = undefined;