@sapui5/sap.suite.ui.generic.template 1.124.2 → 1.124.4

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_nl.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Cre\u00EBren met filters
 
 
 
+ST_EASY_FILTER_TITLE=Filtermodus\:
+
+ST_MANUAL_FILTER=Klassiek
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Object cre\u00EBren
 
 CREATE_OBJECT=Cre\u00EBren

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_no.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Opprett med filtre
 
 
 
+ST_EASY_FILTER_TITLE=Filtreringsmodus\:
+
+ST_MANUAL_FILTER=Klassisk
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Opprett objekt
 
 CREATE_OBJECT=Opprett

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_pl.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Utw\u00F3rz z filtrami
 
 
 
+ST_EASY_FILTER_TITLE=Tryb filtrowania\:
+
+ST_MANUAL_FILTER=Klasyczny
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Utw\u00F3rz obiekt
 
 CREATE_OBJECT=Utw\u00F3rz

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_pt.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Criar com filtros
 
 
 
+ST_EASY_FILTER_TITLE=Modo de filtro\:
+
+ST_MANUAL_FILTER=Cl\u00E1ssico
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Criar objeto
 
 CREATE_OBJECT=Criar

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_pt_PT.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Criar com filtros
 
 
 
+ST_EASY_FILTER_TITLE=Modo de filtro\:
+
+ST_MANUAL_FILTER=Cl\u00E1ssico
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Criar objeto
 
 CREATE_OBJECT=Criar

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_ro.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Creare cu filtre
 
 
 
+ST_EASY_FILTER_TITLE=Mod filtrare\:
+
+ST_MANUAL_FILTER=Clasic
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Creare obiect
 
 CREATE_OBJECT=Creare

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_ru.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u0441 \u0444\
 
 
 
+ST_EASY_FILTER_TITLE=\u0420\u0435\u0436\u0438\u043C \u0444\u0438\u043B\u044C\u0442\u0440\u0430\u0446\u0438\u0438\:
+
+ST_MANUAL_FILTER=\u041A\u043B\u0430\u0441\u0441\u0438\u0447\u0435\u0441\u043A\u0438\u0439
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442
 
 CREATE_OBJECT=\u0421\u043E\u0437\u0434\u0430\u0442\u044C

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sh.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Kreiraj s filterima
 
 
 
+ST_EASY_FILTER_TITLE=Na\u010Din filtera\:
+
+ST_MANUAL_FILTER=Klasi\u010Dno
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Kreiraj objekat
 
 CREATE_OBJECT=Kreiraj

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sk.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Vytvori\u0165 pomocou filtrov
 
 
 
+ST_EASY_FILTER_TITLE=Re\u017Eim filtrovania\:
+
+ST_MANUAL_FILTER=Klasick\u00E9
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Vytvori\u0165 objekt
 
 CREATE_OBJECT=Vytvori\u0165

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sl.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Kreiranje s filtri
 
 
 
+ST_EASY_FILTER_TITLE=Na\u010Din filtriranja\:
+
+ST_MANUAL_FILTER=Klasi\u010Dno
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Kreiranje objekta
 
 CREATE_OBJECT=Kreiranje

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sr.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 \u0441 \u0444\
 
 
 
+ST_EASY_FILTER_TITLE=\u041D\u0430\u0447\u0438\u043D \u0444\u0438\u043B\u0442\u0435\u0440\u0430\:
+
+ST_MANUAL_FILTER=\u041A\u043B\u0430\u0441\u0438\u0447\u043D\u043E
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u041A\u0440\u0435\u0438\u0440\u0430\u0458 \u043E\u0431\u0458\u0435\u043A\u0430\u0442
 
 CREATE_OBJECT=\u041A\u0440\u0435\u0438\u0440\u0430\u0458

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_sv.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Skapa med filter
 
 
 
+ST_EASY_FILTER_TITLE=Filtreringsl\u00E4ge\:
+
+ST_MANUAL_FILTER=Klassisk
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Skapa objekt
 
 CREATE_OBJECT=Skapa

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_th.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E42\u0E14\u0E22\u0E21\u0
 
 
 
+ST_EASY_FILTER_TITLE=\u0E42\u0E2B\u0E21\u0E14\u0E1F\u0E34\u0E25\u0E40\u0E15\u0E2D\u0E23\u0E4C\:
+
+ST_MANUAL_FILTER=\u0E04\u0E25\u0E32\u0E2A\u0E2A\u0E34\u0E01
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u0E2A\u0E23\u0E49\u0E32\u0E07\u0E2D\u0E2D\u0E1A\u0E40\u0E08\u0E04
 
 CREATE_OBJECT=\u0E2A\u0E23\u0E49\u0E32\u0E07

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_tr.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Filtreler ile yarat
 
 
 
+ST_EASY_FILTER_TITLE=Filtre modu\:
+
+ST_MANUAL_FILTER=Klasik
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Nesne yarat
 
 CREATE_OBJECT=Yarat

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_uk.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u0437 \
 
 
 
+ST_EASY_FILTER_TITLE=\u0420\u0435\u0436\u0438\u043C \u0444\u0456\u043B\u044C\u0442\u0440\u0443\u0432\u0430\u043D\u043D\u044F\:
+
+ST_MANUAL_FILTER=\u041A\u043B\u0430\u0441\u0438\u0447\u043D\u0438\u0439
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438 \u043E\u0431'\u0454\u043A\u0442
 
 CREATE_OBJECT=\u0421\u0442\u0432\u043E\u0440\u0438\u0442\u0438

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_vi.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=Ta\u0323o co\u0301 b\u00F4\u0323 lo\u0323c
 
 
 
+ST_EASY_FILTER_TITLE=Ch\u00EA\u0301 \u0111\u00F4\u0323 lo\u0323c\:
+
+ST_MANUAL_FILTER=C\u00F4\u0309 \u0111i\u00EA\u0309n
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=Ta\u0323o \u0111\u00F4\u0301i t\u01B0\u01A1\u0323ng
 
 CREATE_OBJECT=Ta\u0323o

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_zh_CN.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u4F7F\u7528\u8FC7\u6EE4\u5668\u521B\u5EFA
 
 
 
+ST_EASY_FILTER_TITLE=\u8FC7\u6EE4\u6A21\u5F0F\uFF1A
+
+ST_MANUAL_FILTER=\u7ECF\u5178
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u521B\u5EFA\u5BF9\u8C61
 
 CREATE_OBJECT=\u521B\u5EFA

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_zh_TW.properties

@@ -100,6 +100,16 @@ ST_CREATE_WITH_FILTERS=\u4F7F\u7528\u7BE9\u9078\u5EFA\u7ACB
 
 
 
+ST_EASY_FILTER_TITLE=\u7BE9\u9078\u6A21\u5F0F\uFF1A
+
+ST_MANUAL_FILTER=\u5178\u578B
+
+ST_EASY_FILTER=SAP Business AI
+
+
+
+
+
 CREATE_NEW_OBJECT=\u5EFA\u7ACB\u7269\u4EF6
 
 CREATE_OBJECT=\u5EFA\u7ACB

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.124.2"
+			"version": "1.124.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/DefaultVariant.fragment.xml

@@ -4,11 +4,26 @@
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 
 	<f:heading>
-		<!--if worklist, then hide execute on select/apply automatically option in variant management-->
-		<variants:SmartVariantManagement id="template::PageVariant" persistencyKey="{= ${parameter>/settings/smartVariantManagement} ? '_ST_SmartVariantManagement' : 'searchListReportVariant'}"
-			showShare="true" showExecuteOnSelection="{= !${parameter>/settings/isWorklist} }" displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" headerLevel="H2"/>
+			<!--if worklist, then hide execute on select/apply automatically option in variant management-->
+			<variants:SmartVariantManagement id="template::PageVariant" persistencyKey="{= ${parameter>/settings/smartVariantManagement} ? '_ST_SmartVariantManagement' : 'searchListReportVariant'}"
+				showShare="true" showExecuteOnSelection="{= !${parameter>/settings/isWorklist} }" displayTextForExecuteOnSelectionForStandardVariant="{= (${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === 'ifAnyFilterExist' || ${parameter>/settings/dataLoadSettings/loadDataOnAppLaunch} === undefined) ? '{i18n>ST_LIST_DISPLAY_TEXT_FOR_EXECUTE_ON_SELECTION}' : undefined}" headerLevel="H2"/>
 	</f:heading>
 	<f:actions>
+		<!--Enable the filter switch only if the easy filter is enabled-->
+		<FlexBox renderType="Bare" visible="{= ${_templPriv>/listReport/isHeaderExpanded} &amp;&amp; ${_templPrivGlobal>/generic/fioriAI/isEasyFilterEnabled} }">
+				<Label text="{i18n>ST_EASY_FILTER_TITLE}" class="sapSmartTemplateEasyFilterInputPadding"></Label>
+				<SegmentedButton id = "template::FilterSwitchButton"
+					selectedKey="{_templPriv>/listReport/filterMode}"
+					selectionChange="._templateEventHandlers.onFilterSwitch">
+					<layoutData>
+						<OverflowToolbarLayoutData priority="NeverOverflow"/>
+					</layoutData>
+					<items>
+						<SegmentedButtonItem text="{i18n>ST_MANUAL_FILTER}" key="classic"/>
+						<SegmentedButtonItem text="{i18n>ST_EASY_FILTER}" key="easyFilter"/>
+					</items>
+				</SegmentedButton>
+			</FlexBox>
 		<ToolbarSpacer/>
 		<!-- global breakout actions-->
 		<template:repeat list="{parameter>/manifest/sap.ui5/extends/extensions/sap.ui.controllerExtensions/sap.suite.ui.generic.template.ListReport.view.ListReport/sap.ui.generic.app}" var="tmpEntitySet">

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/FullscreenPage.fragment.xml

@@ -38,6 +38,7 @@
 						visible="{= !${parameter>/settings/isWorklist}}">
 						<f:content>
 							<core:Fragment fragmentName="sap.suite.ui.generic.template.ListReport.view.fragments.SmartFilterBar" type="XML"/>
+							<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.EasyFilter" type="XML"/>
 						</f:content>
 					</f:DynamicPageHeader>
 				</f:header>
@@ -58,7 +59,6 @@
 					</template:else>
 					</template:if>
 				</f:content>
-
 				<f:footer>
 					<OverflowToolbar id="template::FooterToolbar">
 						<ToolbarSpacer/>

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -32,7 +32,6 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/ObjectPage/controller/CtxMenuHandler",
 	"sap/suite/ui/generic/template/ObjectPage/controller/inlineCreationRows/InlineCreationRowsHelper",
 	"sap/suite/ui/generic/template/ObjectPage/controller/RelatedAppsHandler",
-	"sap/ui/core/Lib",
 	"sap/suite/ui/generic/template/ObjectPage/controller/PasteHandler",
 	"sap/suite/ui/generic/template/lib/insights/InsightsHandler",
 	"sap/suite/ui/generic/template/lib/cards/DTCardHelper"
@@ -42,7 +41,7 @@ sap.ui.define([
 	ResponsiveTable, ShareUtils, FeLogger, MultipleViewsHandler, MessageUtils, KeyCodes, merge, FilterProcessor,
 	StableIdHelper, extend, isEmptyObject, FeError,
 	CreateWithDialogHandler, Device, whitespaceReplacer, deepExtend, CtxMenuHandler,
-	InlineCreationRowsHelper, RelatedAppsHandler, Lib, PasteHandler, InsightsHandler, DTCardHelper
+	InlineCreationRowsHelper, RelatedAppsHandler, PasteHandler, InsightsHandler, DTCardHelper
 	) {
 	"use strict";
 	var sClassName = "ObjectPage.controller.ControllerImplementation";
@@ -392,16 +391,23 @@ sap.ui.define([
 					var oBindingParams = oEvent.getParameter("bindingParams");
 					if (oBindingParams.filters && oBindingParams.filters.length) {
 						/*
-						 * Add a new filter condition to always show all items that are just created. In case we are in a draft,
-						 * that just means to add "or HasActiveEntity = false". For active documents however, that condition
-						 * would always be true. Thus, we have to add
-						 * "or (HasActiveEntity = false and IsActiveEntity = false)".
-						 * However, this condition is not evaluated correctly by gateway, so we have to transform it to
-						 * (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
-						 * where x is the condition provided by the user
+						 *Handling of the filter condition during edit or display:
+						 * 	Add a new filter condition to always show all items that are just created. In case we are in a draft,
+						 * 	that just means to add "or HasActiveEntity = false". For active documents however, that condition
+						 * 	would always be true. Thus, we have to add
+						 * 	"or (HasActiveEntity = false and IsActiveEntity = false)".
+						 * 	However, this condition is not evaluated correctly by gateway, so we have to transform it to
+						 *  (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
+						 * 	where x is the condition provided by the user
+
+						 * Handling of the filter condition during create:
+						 *  checking the value of dispaly Mode , iDisplayMode = 4 for create 
+						 *  if it is a create the filter condition evaluates to the user filter x 
 						 */
 						var oUserFilter = FilterProcessor.groupFilters(oBindingParams.filters);
-						if (!oEvent.getParameter("messageFilterActive")) {
+						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+						var iDisplayMode = oTemplatePrivateModel.getProperty("/objectPage/displayMode");
+						if (!oEvent.getParameter("messageFilterActive") && !(iDisplayMode === 4) ){
 							oBindingParams.filters = new Filter({
 								filters: [
 									new Filter({
@@ -2394,12 +2400,7 @@ sap.ui.define([
 					},
 
 					onSummarize: function () {
-						var sUrl = oTemplateUtils.oServices.oApplication.getSummarizationLibraryUrl();
-						Lib.load({name: "ux.eng.fioriai.reuse", url: sUrl}).then(function() {
-							sap.ui.require(["ux/eng/fioriai/reuse/library"], function(fioriaiLib) {
-								fioriaiLib.summarize({view: oController.getView()});
-							});
-						});
+						oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.summarize({view: oController.getView()});
 					},
 
 					onEdit: function (oEvent) {

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.2"
+			"version": "1.124.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Actions.fragment.xml

@@ -130,7 +130,7 @@
 		ariaHasPopup="Dialog"
 		fesr:press="fe:sum:summarize"
 		type="Ghost"
-		visible="{_templPrivGlobal>/generic/isSummarizationEnabled}" />
+		visible="{_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled}" />
 
 	<template:if test="{parameter>/settings/showRelatedApps}">
 		<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'RelatedApps'}) }"

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.2"
+			"version": "1.124.4"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.124.2"
+		"version": "1.124.4"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/fragments/EasyFilter.fragment.xml

@@ -0,0 +1,24 @@
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
+    <VBox  visible="{= ${_templPriv>/listReport/filterMode} === 'easyFilter'}">
+        <MessageStrip
+            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
+            showIcon="true"
+            showCloseButton="true"
+            class="sapUiSmallMarginBottom"/>
+        <FlexBox renderType="Bare">
+            <Input id="easyFilter"
+            width="100%" class="sapUiSmallMarginEnd"
+            placeholder="{i18n>ST_EASY_FILTER_INPUT_PLACEHOLDER}"
+            change="._templateEventHandlers.onEasyFilterChange"
+            showClearIcon="true"
+            maxLength="100"
+            submit="._templateEventHandlers.onEasyFilterEnterPress">
+            </Input>
+            <Button text="{i18n>ST_EASY_FILTER_GO_BUTTON_TEXT}"
+                    type="Emphasized"
+                    icon="sap-icon://ai"
+                    press="._templateEventHandlers.onEasyFilterGoButtonPress">
+            </Button>
+        </FlexBox>
+    </VBox>
+</core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/genericUtilities/filterHelper.js

@@ -192,10 +192,9 @@ sap.ui.define([
      */
 	function getFilterInfoForPropertyFilters(oParams, sProperty, aFiltersForProperty, sLogicalOperator) {
 		var oValue1, oValue2, sOperator, oProperty = metadataAnalyser.getPropertyMetadata(oParams.oMetaModel, oParams.sEntityTypeName, sProperty);
-		// for navigation properties
-		sProperty = sProperty.replaceAll("/", ".");
+		var sPropertyForFilterData = sProperty.replaceAll("/", ".");
 		// If Custom filter is implemented date field for smart filter bar then we make static tile
-		if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && !oParams.oFilterData[sProperty]) {
+		if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && !oParams.oFilterData[sPropertyForFilterData]) {
 			oParams.bIsStatic = true;
 			return {
 				stringRep: "",
@@ -207,12 +206,12 @@ sap.ui.define([
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sProperty].conditionTypeInfo && oParams.oFilterData[sProperty].conditionTypeInfo.data.operation !== "DATE") {
-				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sProperty].conditionTypeInfo.data.operation)) {
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation !== "DATE") {
+				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 					oParams.bIsStatic = true;
 					return;
 				}
-				var oValue = getSematicDateFormat(oParams.oFilterData[sProperty], oProperty.type);
+				var oValue = getSematicDateFormat(oParams.oFilterData[sPropertyForFilterData], oProperty.type);
 				oValue1 = oValue.oValue1;
 				oValue2 = oValue.oValue2;
 				sOperator = oValue.operator;
@@ -280,6 +279,7 @@ sap.ui.define([
 		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
 		return sFilterParams;
 	}
+	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
     return {
 		getFilterParams: getFilterParams