DynamicInputResolver, DynamicObjectSelect, ... supports now autoCompletionUrlParam. Cost-Search-Page supports now checkbox "showOnlyActives".

kreinhard · kreinhard · commit 64fe5ce40215 · 2025-09-10T11:05:35.000+02:00
diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/CostSearchPageRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/CostSearchPageRest.kt
@@ -48,6 +48,7 @@ class CostSearchPageRest : AbstractDynamicPageRest() {
     ) : DisplayNameCapable
 
     class SearchData {
+        var onlyActiveEntries: Boolean? = true
         var cost1: CostObject? = null
         var cost2: CostObject? = null
         var cost1Number: Int? = null
@@ -67,14 +68,18 @@ class CostSearchPageRest : AbstractDynamicPageRest() {
         val layout = UILayout("menu.fibu.kostSearch")
 
         layout.add(
+            UICheckbox("onlyActiveEntries", label = "label.onlyActiveEntries")
+        ).add(
             UIRow().add(
                 UICol(sm = 6).add(
                     UIRow().add(
                         UIInput(
                             "cost1",
                             label = "fibu.kost1",
                             dataType = UIDataType.COST1,
-                        )
+                        ).also {
+                            it.autoCompletionUrlParams = mapOf("onlyActiveEntries" to "onlyActiveEntries")
+                        }
                     )
                 ).add(
                     UIRow().add(
@@ -94,7 +99,9 @@ class CostSearchPageRest : AbstractDynamicPageRest() {
                             "cost2",
                             label = "fibu.kost2",
                             dataType = UIDataType.COST2,
-                        )
+                        ).also {
+                            it.autoCompletionUrlParams = mapOf("onlyActiveEntries" to "onlyActiveEntries")
+                        }
                     )
                 ).add(
                     UIRow().add(
diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/Kost1PagesRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/Kost1PagesRest.kt
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 import jakarta.servlet.http.HttpServletRequest
 import org.projectforge.business.fibu.KostFormatter
+import org.projectforge.business.fibu.kost.KostentraegerStatus
 import org.projectforge.business.user.ProjectForgeGroup
 import org.projectforge.framework.persistence.api.BaseSearchFilter
 import org.projectforge.framework.persistence.user.entities.PFUserDO
@@ -81,7 +82,11 @@ class Kost1PagesRest : AbstractDTOPagesRest<Kost1DO, Kost1, Kost1Dao>(Kost1Dao::
     }
 
     override fun queryAutocompleteObjects(request: HttpServletRequest, filter: BaseSearchFilter): List<Kost1DO> {
-        val list = super.queryAutocompleteObjects(request, filter)
+        val onlyActiveEntries = request.getParameter("onlyActiveEntries")?.toBooleanStrictOrNull() ?: true
+        var list = super.queryAutocompleteObjects(request, filter)
+        if (onlyActiveEntries) {
+            list = list.filter { it.kostentraegerStatus == null || it.kostentraegerStatus == KostentraegerStatus.ACTIVE }
+        }
         list.forEach { it.displayName = kostFormatter.formatKost1(it, KostFormatter.FormatType.LONG) }
         return list
     }
diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/Kost2PagesRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/fibu/kost/Kost2PagesRest.kt
@@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletRequest
 import org.projectforge.business.fibu.KostFormatter
 import org.projectforge.business.fibu.kost.Kost2DO
 import org.projectforge.business.fibu.kost.Kost2Dao
+import org.projectforge.business.fibu.kost.KostentraegerStatus
 import org.projectforge.framework.persistence.api.BaseSearchFilter
 import org.projectforge.framework.persistence.api.MagicFilter
 import org.projectforge.rest.config.Rest
@@ -116,7 +117,11 @@ class Kost2PagesRest : AbstractDTOPagesRest<Kost2DO, Kost2, Kost2Dao>(Kost2Dao::
     }
 
     override fun queryAutocompleteObjects(request: HttpServletRequest, filter: BaseSearchFilter): List<Kost2DO> {
-        val list = super.queryAutocompleteObjects(request, filter)
+        val onlyActiveEntries = request.getParameter("onlyActiveEntries")?.toBooleanStrictOrNull() ?: true
+        var list = super.queryAutocompleteObjects(request, filter)
+        if (onlyActiveEntries) {
+            list = list.filter { it.kostentraegerStatus == null || it.kostentraegerStatus == KostentraegerStatus.ACTIVE }
+        }
         list.forEach { it.displayName = kostFormatter.formatKost2(it, KostFormatter.FormatType.LONG) }
         return list.sortedBy { it.displayName }
     }
diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/ui/UIInput.kt b/projectforge-rest/src/main/kotlin/org/projectforge/ui/UIInput.kt
@@ -49,11 +49,11 @@ data class UIInput(
    */
   val autoComplete: AutoCompleteType? = null,
   /**
-   * Input modes for HTML Input fields (e. g. inputmode="numeric").
+   * Input modes for HTML Input fields (e.g. inputmode="numeric").
    */
   val inputMode: InputMode? = null,
   /**
-   * Pattern for HTML Input fields (e. g. pattern="\d*").
+   * Pattern for HTML Input fields (e.g. pattern="\d*").
    */
   val pattern: String? = null,
 ) : UIElement(UIElementType.INPUT), UILabelledElement, IUIId {
diff --git a/projectforge-webapp/src/components/base/dynamicLayout/components/input/DynamicInputResolver.jsx b/projectforge-webapp/src/components/base/dynamicLayout/components/input/DynamicInputResolver.jsx
@@ -46,13 +46,7 @@ function DynamicInputResolver(
         case 'GROUP':
         case 'EMPLOYEE':
         case 'COST1':
-            Tag = DynamicObjectSelect;
-            additionalProps.type = dataType;
-            break;
         case 'COST2':
-            Tag = DynamicObjectSelect;
-            additionalProps.type = dataType;
-            break;
         case 'KONTO':
             Tag = DynamicObjectSelect;
             additionalProps.type = dataType;
diff --git a/projectforge-webapp/src/components/base/dynamicLayout/components/select/DynamicObjectSelect.jsx b/projectforge-webapp/src/components/base/dynamicLayout/components/select/DynamicObjectSelect.jsx
@@ -7,6 +7,7 @@ import DynamicValidationManager from '../input/DynamicValidationManager';
 function DynamicObjectSelect(
     {
         id,
+        urlparams,
         ...props
     },
 ) {
@@ -21,6 +22,7 @@ function DynamicObjectSelect(
                 onSelect={handleSelect}
                 translations={ui.translations}
                 value={data[id] || {}}
+                urlparams={urlparams}
                 {...props}
             />
         </DynamicValidationManager>
@@ -29,6 +31,7 @@ function DynamicObjectSelect(
 
 DynamicObjectSelect.propTypes = {
     id: PropTypes.string.isRequired,
+    urlparams: PropTypes.shape({}),
 };
 
 export default DynamicObjectSelect;
diff --git a/projectforge-webapp/src/components/design/input/autoCompletion/ObjectAutoCompletion.jsx b/projectforge-webapp/src/components/design/input/autoCompletion/ObjectAutoCompletion.jsx
@@ -11,6 +11,7 @@ function ObjectAutoCompletion(
         inputId,
         inputProps,
         onSelect,
+        urlparams,
         value = {},
         ...props
     },
@@ -66,6 +67,7 @@ function ObjectAutoCompletion(
             )}
             onSelect={onSelect}
             search={search}
+            urlparams={urlparams}
             {...props}
         />
     );
@@ -76,6 +78,7 @@ ObjectAutoCompletion.propTypes = {
     onSelect: PropTypes.func.isRequired,
     icon: PropTypes.shape({}),
     inputProps: PropTypes.shape({}),
+    urlparams: PropTypes.shape({}),
     value: PropTypes.shape({
         displayName: PropTypes.string,
     }),
diff --git a/projectforge-webapp/src/components/design/input/autoCompletion/ObjectSelect.jsx b/projectforge-webapp/src/components/design/input/autoCompletion/ObjectSelect.jsx
@@ -16,6 +16,7 @@ function ObjectSelect(
         translations,
         type,
         url,
+        urlparams,
         user,
         value,
         ...props
@@ -65,6 +66,7 @@ function ObjectSelect(
                 inputProps={inputProps}
                 onSelect={onSelect}
                 url={url || `${type.toLowerCase()}/autosearch?search=:search`}
+                urlparams={urlparams}
                 value={value}
                 {...props}
             />
@@ -87,6 +89,7 @@ ObjectSelect.propTypes = {
         'tooltip.selectMe': PropTypes.string,
     }),
     url: PropTypes.string,
+    urlparams: PropTypes.shape({}),
     user: PropTypes.shape({
         id: PropTypes.number.isRequired,
         displayName: PropTypes.string.isRequired,
diff --git a/projectforge-webapp/src/components/design/input/autoCompletion/index.jsx b/projectforge-webapp/src/components/design/input/autoCompletion/index.jsx
@@ -2,10 +2,11 @@ import AwesomeDebouncePromise from 'awesome-debounce-promise';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { colorPropType } from '../../../../utilities/propTypes';
-import { debouncedWaitTime, getServiceURL, handleHTTPErrors } from '../../../../utilities/rest';
+import { debouncedWaitTime, getServiceURL, handleHTTPErrors, evalServiceURL } from '../../../../utilities/rest';
 import AdvancedPopper from '../../popper/AdvancedPopper';
 import styles from './AutoCompletion.module.scss';
 import Completion from './Completion';
+import { DynamicLayoutContext } from '../../../base/dynamicLayout/context';
 
 const loadCompletionsBounced = (
     {
@@ -37,6 +38,7 @@ function AutoCompletion(
         color,
         input,
         url,
+        urlparams,
         onSelect,
         required = false,
         search = '',
@@ -54,6 +56,25 @@ function AutoCompletion(
         () => AwesomeDebouncePromise(loadCompletionsBounced, debouncedWaitTime),
     );
 
+    // Try to get context data, but make it optional for backward compatibility
+    const contextData = React.useContext(DynamicLayoutContext);
+    const data = contextData?.data;
+
+    // Process URL params similar to DynamicAutoCompletion
+    const processedUrl = React.useMemo(() => {
+        if (!url) return url;
+
+        if (urlparams && data) {
+            const autoCompletionData = {};
+            Object.keys(urlparams).forEach((key) => {
+                autoCompletionData[key] = Object.getByString(data, urlparams[key]);
+            });
+            return evalServiceURL(url, autoCompletionData);
+        }
+
+        return url;
+    }, [url, urlparams, data]);
+
     const setIsOpen = (state) => {
         setIsOpenState(state);
 
@@ -102,11 +123,11 @@ function AutoCompletion(
     };
 
     React.useEffect(() => {
-        if (url && wasOpen) {
+        if (processedUrl && wasOpen) {
             const newAbortController = new AbortController();
 
             loadCompletions({
-                url,
+                url: processedUrl,
                 search,
                 setCompletions,
                 searchParameter,
@@ -118,7 +139,7 @@ function AutoCompletion(
         }
 
         return undefined;
-    }, [url, search, wasOpen]);
+    }, [processedUrl, search, wasOpen]);
 
     React.useEffect(() => {
         setSelected(Math.min(completions.length, selected));
@@ -169,6 +190,7 @@ AutoCompletion.propTypes = {
     additionalLabel: PropTypes.string,
     color: colorPropType,
     url: PropTypes.string,
+    urlparams: PropTypes.shape({}),
     required: PropTypes.bool,
     search: PropTypes.string,
     searchParameter: PropTypes.string,
