45582 geo-position field in interest forms (#779)

* 45582 geo-position field in interest forms * 45582 refactor code * 45582 fix bug array splice --------- Co-authored-by: Frederic Alpers <88546396+fredericalpers@users.noreply.github.com>
onOffice-Web-Org · Jul 25, 2024 · 862162f · 862162f
1 parent 94ef65d
commit 862162f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/plugin/DataFormConfiguration/DataFormConfigurationFactory.php b/plugin/DataFormConfiguration/DataFormConfigurationFactory.php
@@ -239,6 +239,7 @@ private function configureGeoFields(array $result): array
 		$geoPositionSettings = $this->_pGeoPositionFieldHandler->getActiveFields();
 		$fieldMapping = (new GeoPosition)->getSearchCriteriaFields();
 
+		$geoPositionFields = [];
 		foreach ($geoPositionSettings as $field) {
 			if ($this->_type === Form::TYPE_APPLICANT_SEARCH && $field === GeoPosition::ESTATE_LIST_SEARCH_RADIUS) {
 				continue;
@@ -253,9 +254,11 @@ private function configureGeoFields(array $result): array
 				'individual_fieldname' => 0,
 			];
 
-			$result []= $geoPositionField;
+			$geoPositionFields []= $geoPositionField;
 		}
 
+		array_splice($result, $arrayPosition, 0, $geoPositionFields);
+
 		return $result;
 	}
 

diff --git a/plugin/Field/OutputFields.php b/plugin/Field/OutputFields.php
@@ -72,18 +72,18 @@ public function getVisibleFilterableFields(
 			unset($fieldsArray[$posGeo]);
 			$pGeoPositionFieldHandler->readValues($pDataView);
 			$geoFields = $pGeoPositionFieldHandler->getActiveFieldsWithValue();
+			array_splice($fieldsArray, $posGeo, 0, array_keys($geoFields));
 		}
 
-		$allFields = array_merge($fieldsArray, array_keys($geoFields));
 		$valuesDefault = array_map(function($field) use ($geoFields, $pInputVariableReader) {
 			$fieldValue = $pInputVariableReader->getFieldValueFormatted($field);
 			if ($fieldValue === false) {
 				return false;
 			}
 			return $fieldValue ?: $geoFields[$field] ?? null;
-		}, $allFields);
+		}, $fieldsArray);
 
-		$resultDefault = array_combine($allFields, $valuesDefault);
+		$resultDefault = array_combine($fieldsArray, $valuesDefault);
 
 		if ($posGeo !== false &&
 			empty($resultDefault[GeoPosition::ESTATE_LIST_SEARCH_CITY]) &&