@openui5/sap.ui.mdc 1.99.0 → 1.100.1

package/src/sap/ui/mdc/condition/FilterOperatorUtil.js

@@ -56,7 +56,7 @@ function(
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.1
 		 * @since 1.73.0
 		 * @alias sap.ui.mdc.condition.FilterOperatorUtil
 		 *
@@ -70,7 +70,7 @@ function(
 				_mOperators: {
 					equal: new Operator({
 						name: "EQ",
-						alias: "DATE",
+						alias: {Date: "DATE", DateTime: "DATETIME"},
 						filterOperator: ModelOperator.EQ,
 						tokenParse: "^=([^=].*)$",
 						tokenFormat: "{1} ({0})", // all placeholder should use the {x} format - the text could be store in the resourcebundel file.
@@ -207,7 +207,7 @@ function(
 					}),
 					between: new Operator({
 						name: "BT",
-						alias: "DATERANGE",
+						alias: {Date: "DATERANGE", DateTime:"DATETIMERANGE"},
 						filterOperator: ModelOperator.BT,
 						tokenParse: "^([^!].*)\\.\\.\\.(.+)$", // TODO: does this work?? At least also matches crap like ".....". I guess validation of value types needs to get rid of those.
 						tokenFormat: "{0}...{1}",
@@ -276,7 +276,7 @@ function(
 					}),
 					lessEqual: new Operator({
 						name: "LE",
-						alias: "TO",
+						alias: {Date: "TO", DateTime: "TODATETIME"},
 						filterOperator: ModelOperator.LE,
 						tokenParse: "^<=(.+)$",
 						tokenFormat: "<={0}",
@@ -292,7 +292,7 @@ function(
 					}),
 					greaterEqual: new Operator({
 						name: "GE",
-						alias: "FROM",
+						alias: {Date: "FROM", DateTime: "FROMDATETIME"},
 						filterOperator: ModelOperator.GE,
 						tokenParse: "^>=(.+)$",
 						tokenFormat: ">={0}",
@@ -365,7 +365,7 @@ function(
 						tokenParse: "^<#tokenText#>$",
 						tokenFormat: "<#tokenText#>",
 						valueTypes: [],
-						getModelFilter: function(oCondition, sFieldPath, oType, bCaseSensitive) {
+						getModelFilter: function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
 							var isNullable = false;
 							if (oType) {
 								var vResult = oType.parseValue("", "string");
@@ -397,7 +397,7 @@ function(
 						tokenFormat: "!(<#tokenText#>)",
 						valueTypes: [],
 						exclude: true,
-						getModelFilter: function(oCondition, sFieldPath, oType, bCaseSensitive) {
+						getModelFilter: function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
 							var isNullable = false;
 							if (oType) {
 								var vResult = oType.parseValue("", "string");
@@ -544,7 +544,6 @@ function(
 						}
 					}),
 					todayFromTo: new RangeOperator({
-						alias: "TODAYXYDAYS",
 						name: "TODAYFROMTO",
 						valueTypes: [
 							{name: "sap.ui.model.type.Integer", formatOptions: { emptyString: null }},
@@ -581,7 +580,6 @@ function(
 						}
 					}),
 					thisWeek: new RangeOperator({
-						alias: "CURRENTWEEK",
 						name: "THISWEEK",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -621,7 +619,6 @@ function(
 						}
 					}),
 					thisMonth: new RangeOperator({
-						alias: "CURRENTMONTH",
 						name: "THISMONTH",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -661,7 +658,6 @@ function(
 						}
 					}),
 					thisQuarter: new RangeOperator({
-						alias: "CURRENTQUARTER",
 						name: "THISQUARTER",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -694,7 +690,6 @@ function(
 						}
 					}),
 					quarter1: new RangeOperator({
-						alias: "FIRSTQUARTER",
 						name: "QUARTER1",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -702,7 +697,6 @@ function(
 						}
 					}),
 					quarter2: new RangeOperator({
-						alias: "SECONDQUARTER",
 						name: "QUARTER2",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -710,7 +704,6 @@ function(
 						}
 					}),
 					quarter3: new RangeOperator({
-						alias: "THIRDQUARTER",
 						name: "QUARTER3",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -718,7 +711,6 @@ function(
 						}
 					}),
 					quarter4: new RangeOperator({
-						alias: "FOURTHQUARTER",
 						name: "QUARTER4",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -733,7 +725,6 @@ function(
 						}
 					}),
 					thisYear: new RangeOperator({
-						alias: "CURRENTYEAR",
 						name: "THISYEAR",
 						valueTypes: [Operator.ValueType.Static],
 						calcRange: function() {
@@ -1223,14 +1214,7 @@ function(
 
 					for (var sName in FilterOperatorUtil._mOperators) {
 						var oOperator = FilterOperatorUtil._mOperators[sName];
-						if ( oOperator.name === sOperator) {
-							return oOperator;
-						}
-					}
-
-					for (var sName in FilterOperatorUtil._mOperators) {
-						var oOperator = FilterOperatorUtil._mOperators[sName];
-						if ( oOperator.alias === sOperator) {
+						if (oOperator.name === sOperator) {
 							return oOperator;
 						}
 					}
@@ -1477,6 +1461,81 @@ function(
 						oOperator.checkValidated(oCondition);
 					}
 
+				},
+
+				/**
+				 * Returns the operator object for the given <code>DynamicDateOption</code> name.
+				 * @param {string} sOption Name of the operator
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @returns {sap.ui.mdc.condition.Operator} the operator object, or undefined if the operator with the requested name does not exist
+				 *
+				 * @protected
+				 * @since: 1.100.0
+				 */
+				 getOperatorForDynamicDateOption: function(sOption, sBaseType) {
+
+					var oOperator;
+
+					// determine operator name if used as custom DynamicDateOption created in DateContent using getCustomDynamicDateOptionForOperator
+					if (sBaseType && sOption.startsWith(sBaseType)) {
+						oOperator = this.getOperator(sOption.slice(sBaseType.length + 1));
+					} else {
+						oOperator = this.getOperator(sOption);
+					}
+
+					if (!oOperator && sBaseType) {
+						for (var sName in FilterOperatorUtil._mOperators) {
+							var oCheckOperator = FilterOperatorUtil._mOperators[sName];
+							if (oCheckOperator.alias && oCheckOperator.alias[sBaseType] === sOption) {
+								oOperator = oCheckOperator;
+								break;
+							}
+						}
+					}
+
+					return oOperator;
+
+				},
+
+				/**
+				 * Determines the corresponding <code>DynamicDateOption</code> for an <code>Operator</code>
+				 * from a map of known keys
+				 *
+				 * @param {sap.ui.mdc.condition.Operator} oOperator Condition to check
+				 * @param {object} oDynamicDateRangeKeys Keys for <code>DynamicDateOption</code>
+				 * @param {sap.ui.mdc.enum.BaseType} sBaseType Basic type
+				 * @returns {string} <code>DynamicDateOption</code>
+				 * @protected
+				 * @since: 1.100.0
+				 */
+				 getDynamicDateOptionForOperator: function(oOperator, oDynamicDateRangeKeys, sBaseType) {
+
+					var sOption;
+					if (oOperator) {
+						if (oDynamicDateRangeKeys[oOperator.name]) {
+							sOption = oOperator.name;
+						} else if (oOperator.alias && oDynamicDateRangeKeys[oOperator.alias[sBaseType]]) {
+							sOption = oOperator.alias[sBaseType];
+						}
+					}
+
+					return sOption;
+
+				},
+
+				/**
+				 * Determines the corresponding custom <code>DynamicDateOption</code> for an <code>Operator</code>
+				 *
+				 * @param {sap.ui.mdc.condition.Operator} oOperator Condition to check
+				 * @param {sap.ui.mdc.enum.BaseType} sBaseType Basic type
+				 * @returns {string} <code>DynamicDateOption</code>
+				 * @protected
+				 * @since: 1.100.0
+				 */
+				 getCustomDynamicDateOptionForOperator: function(oOperator, sBaseType) {
+
+					return sBaseType + "-" + oOperator.name;
+
 				}
 		};
 
@@ -1591,7 +1650,56 @@ function(
 				 FilterOperatorUtil._mOperators.notLessThan,
 				 FilterOperatorUtil._mOperators.notLessEqual,
 				 FilterOperatorUtil._mOperators.notGreaterThan,
-				 FilterOperatorUtil._mOperators.notGreaterEqual
+				 FilterOperatorUtil._mOperators.notGreaterEqual,
+
+				 FilterOperatorUtil._mOperators.today,
+				 FilterOperatorUtil._mOperators.yesterday,
+				 FilterOperatorUtil._mOperators.tomorrow,
+				 FilterOperatorUtil._mOperators.firstDayWeek,
+				 FilterOperatorUtil._mOperators.lastDayWeek,
+				 FilterOperatorUtil._mOperators.firstDayMonth,
+				 FilterOperatorUtil._mOperators.lastDayMonth,
+				 FilterOperatorUtil._mOperators.firstDayQuarter,
+				 FilterOperatorUtil._mOperators.lastDayQuarter,
+				 FilterOperatorUtil._mOperators.firstDayYear,
+				 FilterOperatorUtil._mOperators.lastDayYear,
+				 FilterOperatorUtil._mOperators.todayFromTo,
+				 FilterOperatorUtil._mOperators.lastDays,
+				 FilterOperatorUtil._mOperators.nextDays,
+
+				 FilterOperatorUtil._mOperators.thisWeek,
+				 FilterOperatorUtil._mOperators.lastWeek,
+				 FilterOperatorUtil._mOperators.lastWeeks,
+				 FilterOperatorUtil._mOperators.nextWeek,
+				 FilterOperatorUtil._mOperators.nextWeeks,
+
+				 FilterOperatorUtil._mOperators.specificMonth,
+				 FilterOperatorUtil._mOperators.specificMonthInYear,
+				 FilterOperatorUtil._mOperators.thisMonth,
+				 FilterOperatorUtil._mOperators.lastMonth,
+				 FilterOperatorUtil._mOperators.lastMonths,
+				 FilterOperatorUtil._mOperators.nextMonth,
+				 FilterOperatorUtil._mOperators.nextMonths,
+
+				 FilterOperatorUtil._mOperators.thisQuarter,
+				 FilterOperatorUtil._mOperators.lastQuarter,
+				 FilterOperatorUtil._mOperators.lastQuarters,
+				 FilterOperatorUtil._mOperators.nextQuarter,
+				 FilterOperatorUtil._mOperators.nextQuarters,
+
+				 FilterOperatorUtil._mOperators.quarter1,
+				 FilterOperatorUtil._mOperators.quarter2,
+				 FilterOperatorUtil._mOperators.quarter3,
+				 FilterOperatorUtil._mOperators.quarter4,
+
+				 FilterOperatorUtil._mOperators.thisYear,
+				 FilterOperatorUtil._mOperators.lastYear,
+				 FilterOperatorUtil._mOperators.lastYears,
+				 FilterOperatorUtil._mOperators.nextYear,
+				 FilterOperatorUtil._mOperators.nextYears,
+
+				 FilterOperatorUtil._mOperators.yearToDate,
+				 FilterOperatorUtil._mOperators.dateToYear
 				]
 		);
 		FilterOperatorUtil.setOperatorsForType(

package/src/sap/ui/mdc/condition/Operator.js

@@ -46,6 +46,7 @@ sap.ui.define([
 		 * @extends sap.ui.base.Object
 		 * @param {object} oConfiguration Properties of the operator
 		 * @param {string} oConfiguration.name Name of the operator used in the condition
+		 * @param {object} [oConfiguration.alias] Alias names based on <code>BaseType</code>, used to map to <code>DynamicDateOption</code> if <code>DynamicDateRange</code> is used
 		 * @param {string} oConfiguration.filterOperator The operator's default filter operator that is created as defined in {@link sap.ui.model.FilterOperator FilterOperator}
 		 * @param {string} oConfiguration.tokenParse The string representation of the regular expression that is used by the operator to parse a value
 		 *                 to eliminate the operator and get the data string. A placeholder that refers to the translated tokenText can be used. <code>#tokenText#</code> refers to the
@@ -83,7 +84,7 @@ sap.ui.define([
 		 * @param {string} [oConfiguration.additionalInfo] additionalInfo text for the operator. Will be shown in the operator suggest as second column. If not used (undefined) the Include or Exclude information of the operator is used.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.1
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
@@ -287,11 +288,12 @@ sap.ui.define([
 		 * @param {string} sFieldPath Path of filter
 		 * @param {sap.ui.model.Type} oType Data type of the used filter field
 		 * @param {boolean} [bCaseSensitive] creates a caseSensitive filter
+		 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
 		 * @returns {sap.ui.model.Filter} filter object
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 */
-		Operator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive) {
+		Operator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
 
 			var vValue = oCondition.values[0];
 			var oFilter;

package/src/sap/ui/mdc/condition/OperatorDynamicDateOption.js

@@ -8,9 +8,11 @@ sap.ui.define([
 	'sap/m/DynamicDateOption',
 	'sap/m/DynamicDateValueHelpUIType',
 	'sap/m/Input',
-	'sap/m/DatePicker',
 	'sap/ui/mdc/condition/Operator',
+	"sap/ui/mdc/enum/BaseType",
+	'sap/ui/mdc/enum/FieldDisplay',
 	'sap/ui/mdc/util/DateUtil',
+	'sap/ui/mdc/util/loadModules',
 	'sap/ui/model/json/JSONModel',
 	'sap/ui/model/FormatException',
 	'sap/ui/model/ParseException',
@@ -20,9 +22,11 @@ sap.ui.define([
 		DynamicDateOption,
 		DynamicDateValueHelpUIType,
 		Input,
-		DatePicker,
 		Operator,
+		BaseType,
+		FieldDisplay,
 		DateUtil,
+		loadModules,
 		JSONModel,
 		FormatException,
 		ParseException,
@@ -32,6 +36,8 @@ sap.ui.define([
 		"use strict";
 
 		var ValueState = coreLibrary.ValueState;
+		var DatePicker;
+		var DateTimePicker;
 
 		/**
 		 * Constructor for a new OperatorDynamicDateOption.
@@ -45,7 +51,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.1
 		 *
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
@@ -61,20 +67,25 @@ sap.ui.define([
 					/**
 					 * Operator used in the corresponding filter field.
 					 *
-					 * <b>Note:</b> A condition must be an instance of {@link sap.ui.mdc.condition.Operator Operator}.
+					 * <b>Note:</b> An operator must be an instance of {@link sap.ui.mdc.condition.Operator Operator}.
 					 */
 					operator: { type: "object" },
 					/**
 					 * Data type of the corresponding filter field.
 					 *
-					 * <b>Note:</b> A condition must  be an instance of {@link sap.ui.model.Type Type}.
+					 * <b>Note:</b> A type must  be an instance of {@link sap.ui.model.Type Type}.
 					 */
-					type: { type: "object" }
+					type: { type: "object" },
+					/**
+					 * Basic type of the corresponding filter field.
+					 */
+					baseType: { type: "sap.ui.mdc.enum.BaseType" }
 				}
 			}
 		});
 
 		OperatorDynamicDateOption.prototype.exit = function() {
+			DynamicDateOption.prototype.exit.apply(this, arguments);
 			if (this._oModel) {
 				this._oModel.destroy();
 				this._oModel = undefined;
@@ -90,6 +101,31 @@ sap.ui.define([
 			// _removeControls.call(this);
 		};
 
+		OperatorDynamicDateOption.prototype.applySettings = function() {
+			DynamicDateOption.prototype.applySettings.apply(this, arguments);
+
+			// load needed pickers
+			// TODO: request in DateContent to be sure that loaded? But needed only on opening, so async loading on initialization should be ok
+			var aModules = [];
+			var sBaseType = this.getBaseType();
+			if (sBaseType === BaseType.DateTime && !DateTimePicker) {
+				aModules.push("sap/m/DateTimePicker");
+			} else if (!DatePicker) {
+				aModules.push("sap/m/DatePicker");
+			}
+
+			if (aModules.length > 0) {
+				return loadModules(aModules).then(function (aModules) {
+					if (sBaseType === BaseType.DateTime) {
+						DateTimePicker = aModules[0];
+					} else {
+						DatePicker = aModules[0];
+					}
+				});
+			}
+
+		};
+
 		OperatorDynamicDateOption.prototype.validateProperty = function(sPropertyName, oValue) {
 
 			if (sPropertyName === "operator" && oValue && (typeof oValue !== "object" || !oValue.isA || !oValue.isA("sap.ui.mdc.condition.Operator"))) {
@@ -104,13 +140,6 @@ sap.ui.define([
 
 		};
 
-		OperatorDynamicDateOption.prototype.getKey = function() {
-
-			var oOperator = this.getOperator();
-			return oOperator.name;
-
-		};
-
 		OperatorDynamicDateOption.prototype.isRange = function() {
 
 			var oOperator = this.getOperator();
@@ -130,15 +159,22 @@ sap.ui.define([
 			if (!this._aUITypes) {
 				var oOperator = this.getOperator();
 				var oType = this.getType();
+				var sBaseType = this.getBaseType();
 				this._aUITypes = [];
 
 				for (var i = 0; i < oOperator.valueTypes.length; i++) {
 					var vType = oOperator.valueTypes[i];
 					if (vType === Operator.ValueType.Self) {
+						var sType;
+						if (sBaseType === BaseType.DateTime) {
+							sType = "datetime";
+						} else {
+							sType = "date";
+						}
 						this._aUITypes.push(new DynamicDateValueHelpUIType({
-							type: "date"
+							type: sType
 						}));
-					} else if (vType === Operator.ValueType.Static) {
+					} else if (!vType || vType === Operator.ValueType.Static) {
 						continue;
 					} else {
 						oType = oOperator._createLocalType(vType, oType);
@@ -187,8 +223,12 @@ sap.ui.define([
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
 				var vType = oOperator.valueTypes[i];
+				var sBaseType = this.getBaseType();
 				var oDate;
 
+				if (!vType) {
+					continue;
+				}
 				if (!oControl.aControlsByParameters[sKey][i]) {
 					if (oOperator.createControl) {
 						// use internal model to bind the control
@@ -221,12 +261,18 @@ sap.ui.define([
 						// TODO: DatePicker or Calendar?
 						// convert internal value to date
 						if (oValue && oValue.values[i]) {
-							oDate = DateUtil.typeToUniversalDate(oValue.values[i], oType);
+							oDate = DateUtil.typeToUniversalDate(oValue.values[i], oType, sBaseType);
 							oDate = DateUtil.utcToLocal(oDate);
 						}
 						var oFormatOptions = oType.getFormatOptions();
 
-						var oDatePicker = new DatePicker(sControlId + "-" + i, {
+						var Picker;
+						if (sBaseType === BaseType.DateTime) {
+							Picker = DateTimePicker;
+						} else {
+							Picker = DatePicker;
+						}
+						var oDatePicker = new Picker(sControlId + "-" + i, {
 							dateValue: oDate,
 							displayFormat: oFormatOptions.style || oFormatOptions.pattern,
 							displayFormatType: oFormatOptions.calendarType,
@@ -235,8 +281,11 @@ sap.ui.define([
 						oControl.aControlsByParameters[sKey].push(oDatePicker);
 					} else if (typeof vType === "object"){
 						// just use Input
+						oType = oOperator._createLocalType(oOperator.valueTypes[i], oType);
+						// format value to String using type
+						var sValue = oType.formatValue(oValue && oValue.values[i], "string");
 						var oInput = new Input(sControlId + "-" + i, {
-							value: oValue && oValue.values[i],
+							value: sValue,
 							change: fnChangeHandler
 						});
 						oControl.aControlsByParameters[sKey].push(oInput);
@@ -311,9 +360,13 @@ sap.ui.define([
 			var oResult = {operator: sKey, values: []};
 			var oOperator = this.getOperator();
 			var oType = this.getType();
+			var sBaseType = this.getBaseType();
 			var sControlId = oControl.getId();
 
 			for (var i = 0; i < oOperator.valueTypes.length; i++) {
+				if (!oOperator.valueTypes[i]) {
+					continue;
+				}
 				var oInputControl = oControl.aControlsByParameters[sKey][i];
 				if (oInputControl) {
 					var vValue;
@@ -329,7 +382,7 @@ sap.ui.define([
 						if (vValue) {
 							// parse to Types format
 							vValue = DateUtil.localToUtc(vValue);
-							vValue = DateUtil.universalDateToType(vValue, oType);
+							vValue = DateUtil.universalDateToType(vValue, oType, sBaseType);
 						}
 					} else {
 						vValue = oInputControl.getValue();
@@ -365,21 +418,22 @@ sap.ui.define([
 		OperatorDynamicDateOption.prototype.toDates = function(oValue) {
 			var oOperator = this.getOperator();
 			var oType = this.getType();
+			var sBaseType = this.getBaseType();
 			var aRange;
 			var i = 0;
 
 			if (oOperator.isA("sap.ui.mdc.condition.RangeOperator")) {
-				aRange = oOperator._getRange(oValue && oValue.values, oType);
+				aRange = oOperator._getRange(oValue && oValue.values, oType, sBaseType);
 				// convert to local date
 				for (i = 0; i < aRange.length; i++) {
-					aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType);
+					aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
 					aRange[i] = DateUtil.utcToLocal(aRange[i]);
 				}
 			} else if (oOperator.valueTypes[0] === Operator.ValueType.Self) {
 				aRange = oValue.values;
 				for (i = 0; i < aRange.length; i++) {
 					if (aRange[i]) {
-						aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType);
+						aRange[i] = DateUtil.typeToUniversalDate(aRange[i], oType, sBaseType);
 						aRange[i] = DateUtil.utcToLocal(aRange[i]);
 					}
 				}
@@ -398,7 +452,7 @@ sap.ui.define([
 		OperatorDynamicDateOption.prototype.format = function(oValue) {
 			var oOperator = this.getOperator();
 			var oType = this.getType();
-			return oOperator.format(oValue, oType);
+			return oOperator.format(oValue, oType, FieldDisplay.Value);
 		};
 
 		OperatorDynamicDateOption.prototype.parse = function(sValue) {
@@ -408,7 +462,7 @@ sap.ui.define([
 			if (sValue && oOperator.parse(sValue)) {
 				var oResult = {};
 				oResult.operator = this.getKey();
-				oResult.values = oOperator.parse(sValue, oType);
+				oResult.values = oOperator.parse(sValue, oType, FieldDisplay.Value);
 				return oResult;
 			}
 		};

package/src/sap/ui/mdc/condition/RangeOperator.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * @param {int[]|function} [oConfiguration.defaultValues] Array of values for the defaults of <code>RangeOperators</code> parameter. This can be a function, which returns the array of values. If not used the default for the values is 1.
 		 * @constructor
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.1
 		 * @private
 		 * @ui5-restricted sap.fe
 		 * @MDC_PUBLIC_CANDIDATE
@@ -87,12 +87,12 @@ sap.ui.define([
 			}
 		});
 
-		RangeOperator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive) {
-			var aRange = this._getRange(oCondition.values, oType);
+		RangeOperator.prototype.getModelFilter = function(oCondition, sFieldPath, oType, bCaseSensitive, sBaseType) {
+			var aRange = this._getRange(oCondition.values, oType, sBaseType);
 			return new Filter({ path: sFieldPath, operator: "BT", value1: aRange[0], value2: aRange[1] });
 		};
 
-		RangeOperator.prototype._getRange = function(aValues, oType) {
+		RangeOperator.prototype._getRange = function(aValues, oType, sBaseType) {
 			var aRange;
 			if (aValues) {
 				if (aValues.length === 2) {
@@ -107,7 +107,7 @@ sap.ui.define([
 			for (var i = 0; i < 2; i++) {
 				//the calcRange result must be converted from local time to UTC and into the correct type format.
 				aRange[i].oDate = DateUtil.localToUtc(aRange[i].oDate);
-				aRange[i] = DateUtil.universalDateToType(aRange[i], oType);
+				aRange[i] = DateUtil.universalDateToType(aRange[i], oType, sBaseType);
 			}
 
 			return aRange;

package/src/sap/ui/mdc/designtime/Util.js

@@ -0,0 +1,63 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([], function () {
+	"use strict";
+
+    function getDefaultDesginTime() {
+        return {
+            actions: {},
+            aggregations: {},
+            description: "{description}",
+            name: "{name}",
+            properties: {}
+        };
+    }
+
+    // Returns the designTime metadata for the control. By default all the properties/aggregations which are not part of the allowed list array will be ignored from RTA/DTA
+    function enhanceDesignTimeMetadata(aAllowed, sKey, oDesignTime) {
+        var bAllowed = aAllowed.includes(sKey);
+        var oObject = bAllowed && oDesignTime[sKey] || {};
+        if (!Object.keys(oObject).length) {
+            oObject[sKey] = {
+                ignore: !bAllowed
+            };
+            Object.assign(oDesignTime, oObject);
+        }
+    }
+
+    return {
+        getDesignTime: function(ControlClass, aAllowedProperties, aAllowedAggregations, oDesignTime) {
+            // Check if designTime is provided and has all the necessary attributes.
+            oDesignTime = oDesignTime ? oDesignTime : getDefaultDesginTime();
+            oDesignTime.actions = oDesignTime.actions ? oDesignTime.actions : {};
+            oDesignTime.properties = oDesignTime.properties ? oDesignTime.properties : {};
+            oDesignTime.aggregations = oDesignTime.aggregations ? oDesignTime.aggregations : {};
+
+            var oControlMetadata = ControlClass.getMetadata(),
+                // array containing all allowed control properties. Update the aAllowedProperties to enable a property for DTA
+                aAllowedProperties = aAllowedProperties ? aAllowedProperties : [],
+                // array containing all allowed control aggregations. Update the aAllowedAggregations to enable an aggregation for DTA
+                aAllowedAggregations = aAllowedAggregations ? aAllowedAggregations : [],
+                // array containing all control properties
+                aAllProperties = Object.keys(oControlMetadata.getAllProperties()).concat(Object.keys(oControlMetadata.getAllPrivateProperties())),
+                // array containing all control aggregations
+                aAllAggregations = Object.keys(oControlMetadata.getAllAggregations()).concat(Object.keys(oControlMetadata.getAllPrivateAggregations()));
+
+            // populate the oDesignTime.properties with the control properties (allowed/disallowed). By default all properties are ignored.
+            aAllProperties.forEach(function(sPropertyName) {
+                enhanceDesignTimeMetadata(aAllowedProperties, sPropertyName, oDesignTime.properties);
+            });
+
+            // populate the oDesignTime.aggregations with the control aggregations (allowed/disallowed). By default all aggregations are ignored.
+            aAllAggregations.forEach(function(sAggregationName) {
+                enhanceDesignTimeMetadata(aAllowedAggregations, sAggregationName, oDesignTime.aggregations);
+            });
+
+            return oDesignTime;
+        }
+    };
+
+});