@openui5/sap.m 1.128.0 → 1.130.0

package/src/sap/m/StandardDynamicDateOption.js

@@ -8,24 +8,30 @@
 sap.ui.define([
 	"sap/ui/core/Lib",
 	'sap/ui/core/library',
+	'sap/ui/core/Item',
 	'./DynamicDateOption',
 	'./Label',
 	'./RadioButton',
-	'./RadioButtonGroup',
+	'./Select',
+	'./VBox',
 	'sap/ui/core/date/UniversalDateUtils',
 	'sap/ui/core/date/UniversalDate',
+	'sap/ui/core/date/UI5Date',
 	'sap/m/DynamicDateValueHelpUIType',
 	'./library'
 ],
 	function(
 		Library,
 		coreLibrary,
+		Item,
 		DynamicDateOption,
 		Label,
 		RadioButton,
-		RadioButtonGroup,
+		Select,
+		VBox,
 		UniversalDateUtils,
 		UniversalDate,
+		UI5Date,
 		DynamicDateValueHelpUIType,
 		library
 	) {
@@ -46,7 +52,7 @@ sap.ui.define([
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.128.0
+		 * @version 1.130.0
 		 *
 		 * @private
 		 * @alias sap.m.StandardDynamicDateOption
@@ -112,6 +118,20 @@ sap.ui.define([
 			"NEXTMONTHS": "NEXTMONTHS",
 			"NEXTQUARTERS": "NEXTQUARTERS",
 			"NEXTYEARS": "NEXTYEARS",
+			"LASTMINUTESINCLUDED": "LASTMINUTESINCLUDED",
+			"LASTHOURSINCLUDED": "LASTHOURSINCLUDED",
+			"LASTDAYSINCLUDED": "LASTDAYSINCLUDED",
+			"LASTWEEKSINCLUDED": "LASTWEEKSINCLUDED",
+			"LASTMONTHSINCLUDED": "LASTMONTHSINCLUDED",
+			"LASTQUARTERSINCLUDED": "LASTQUARTERSINCLUDED",
+			"LASTYEARSINCLUDED": "LASTYEARSINCLUDED",
+			"NEXTMINUTESINCLUDED": "NEXTMINUTESINCLUDED",
+			"NEXTHOURSINCLUDED": "NEXTHOURSINCLUDED",
+			"NEXTDAYSINCLUDED": "NEXTDAYSINCLUDED",
+			"NEXTWEEKSINCLUDED": "NEXTWEEKSINCLUDED",
+			"NEXTMONTHSINCLUDED": "NEXTMONTHSINCLUDED",
+			"NEXTQUARTERSINCLUDED": "NEXTQUARTERSINCLUDED",
+			"NEXTYEARSINCLUDED": "NEXTYEARSINCLUDED",
 			"FROM": "FROM",
 			"TO": "TO",
 			"FROMDATETIME": "FROMDATETIME",
@@ -178,6 +198,20 @@ sap.ui.define([
 			"NEXTMONTHS": _Groups.DateRanges,
 			"NEXTQUARTERS": _Groups.DateRanges,
 			"NEXTYEARS": _Groups.DateRanges,
+			"LASTMINUTESINCLUDED": _Groups.DateRanges,
+			"LASTHOURSINCLUDED": _Groups.DateRanges,
+			"LASTDAYSINCLUDED": _Groups.DateRanges,
+			"LASTWEEKSINCLUDED": _Groups.DateRanges,
+			"LASTMONTHSINCLUDED": _Groups.DateRanges,
+			"LASTQUARTERSINCLUDED": _Groups.DateRanges,
+			"LASTYEARSINCLUDED": _Groups.DateRanges,
+			"NEXTMINUTESINCLUDED": _Groups.DateRanges,
+			"NEXTHOURSINCLUDED": _Groups.DateRanges,
+			"NEXTDAYSINCLUDED": _Groups.DateRanges,
+			"NEXTWEEKSINCLUDED": _Groups.DateRanges,
+			"NEXTMONTHSINCLUDED": _Groups.DateRanges,
+			"NEXTQUARTERSINCLUDED": _Groups.DateRanges,
+			"NEXTYEARSINCLUDED": _Groups.DateRanges,
 			"FROM": _Groups.DateRanges,
 			"TO": _Groups.DateRanges,
 			"FROMDATETIME": _Groups.DateRanges,
@@ -193,9 +227,11 @@ sap.ui.define([
 
 		var aLastOptions = ["LASTMINUTES", "LASTHOURS", "LASTDAYS", "LASTWEEKS", "LASTMONTHS", "LASTQUARTERS", "LASTYEARS"];
 		var aNextOptions = ["NEXTMINUTES", "NEXTHOURS", "NEXTDAYS", "NEXTWEEKS", "NEXTMONTHS", "NEXTQUARTERS", "NEXTYEARS"];
+		var aLastIncludedOptions = ["LASTMINUTESINCLUDED", "LASTHOURSINCLUDED", "LASTDAYSINCLUDED", "LASTWEEKSINCLUDED", "LASTMONTHSINCLUDED", "LASTQUARTERSINCLUDED", "LASTYEARSINCLUDED"];
+		var aNextIncludedOptions = ["NEXTMINUTESINCLUDED", "NEXTHOURSINCLUDED", "NEXTDAYSINCLUDED", "NEXTWEEKSINCLUDED", "NEXTMONTHSINCLUDED", "NEXTQUARTERSINCLUDED", "NEXTYEARSINCLUDED"];
 
-		StandardDynamicDateOption.LastXKeys = aLastOptions;
-		StandardDynamicDateOption.NextXKeys = aNextOptions;
+		StandardDynamicDateOption.LastXKeys = aLastOptions.concat(aLastIncludedOptions);
+		StandardDynamicDateOption.NextXKeys = aNextOptions.concat(aNextIncludedOptions);
 
 		var _resourceBundle = Library.getResourceBundleFor("sap.m");
 
@@ -214,19 +250,28 @@ sap.ui.define([
 		StandardDynamicDateOption.prototype.getText = function(oControl) {
 			var sKey = this.getKey();
 			var oOptions = oControl._getOptions();
-
 			var aParams = this.getValueHelpUITypes(oControl);
 			var oLastOptionParam = this._getOptionParams(aLastOptions, oOptions);
+			var oLastOptionIncludedParam = this._getOptionIncludedParams(aLastIncludedOptions, oOptions);
 			var oNextOptionParam = this._getOptionParams(aNextOptions, oOptions);
+			var oNextOptionIncludedParam = this._getOptionIncludedParams(aNextIncludedOptions, oOptions);
 
 			if (oLastOptionParam) {
 				aParams.push(oLastOptionParam);
 			}
 
+			if (oLastOptionIncludedParam) {
+				aParams.push(oLastOptionIncludedParam);
+			}
+
 			if (oNextOptionParam) {
 				aParams.push(oNextOptionParam);
 			}
 
+			if (oNextOptionIncludedParam) {
+				aParams.push(oNextOptionIncludedParam);
+			}
+
 			switch (sKey) {
 				case Keys.LASTMINUTES:
 				case Keys.LASTHOURS:
@@ -242,6 +287,20 @@ sap.ui.define([
 				case Keys.NEXTMONTHS:
 				case Keys.NEXTQUARTERS:
 				case Keys.NEXTYEARS:
+				case Keys.LASTMINUTESINCLUDED:
+				case Keys.LASTHOURSINCLUDED:
+				case Keys.LASTDAYSINCLUDED:
+				case Keys.LASTWEEKSINCLUDED:
+				case Keys.LASTMONTHSINCLUDED:
+				case Keys.LASTQUARTERSINCLUDED:
+				case Keys.LASTYEARSINCLUDED:
+				case Keys.NEXTMINUTESINCLUDED:
+				case Keys.NEXTHOURSINCLUDED:
+				case Keys.NEXTDAYSINCLUDED:
+				case Keys.NEXTWEEKSINCLUDED:
+				case Keys.NEXTMONTHSINCLUDED:
+				case Keys.NEXTQUARTERSINCLUDED:
+				case Keys.NEXTYEARSINCLUDED:
 					return this._getXPeriodTitle(aParams[1].getOptions());
 				case Keys.FROMDATETIME:
 				case Keys.TODATETIME:
@@ -338,6 +397,20 @@ sap.ui.define([
 					case Keys.NEXTMONTHS:
 					case Keys.NEXTQUARTERS:
 					case Keys.NEXTYEARS:
+					case Keys.LASTMINUTESINCLUDED:
+					case Keys.LASTHOURSINCLUDED:
+					case Keys.LASTDAYSINCLUDED:
+					case Keys.LASTWEEKSINCLUDED:
+					case Keys.LASTMONTHSINCLUDED:
+					case Keys.LASTQUARTERSINCLUDED:
+					case Keys.LASTYEARSINCLUDED:
+					case Keys.NEXTMINUTESINCLUDED:
+					case Keys.NEXTHOURSINCLUDED:
+					case Keys.NEXTDAYSINCLUDED:
+					case Keys.NEXTWEEKSINCLUDED:
+					case Keys.NEXTMONTHSINCLUDED:
+					case Keys.NEXTQUARTERSINCLUDED:
+					case Keys.NEXTYEARSINCLUDED:
 						this.aValueHelpUITypes = [
 							new DynamicDateValueHelpUIType({
 								text: _resourceBundle.getText("DDR_LASTNEXTX_LABEL"),
@@ -394,17 +467,27 @@ sap.ui.define([
 			}
 			oControl.aControlsByParameters[this.getKey()] = [];
 
-			var oLastOptionParam = this._getOptionParams(aLastOptions, oOptions),
-				oNextOptionParam = this._getOptionParams(aNextOptions, oOptions);
+			var oLastOptionParam = this._getOptionParams(aLastOptions, oOptions);
+			var oLastOptionIncludedParam = this._getOptionIncludedParams(aLastIncludedOptions, oOptions);
+			var oNextOptionParam = this._getOptionParams(aNextOptions, oOptions);
+			var oNextOptionIncludedParam = this._getOptionIncludedParams(aNextIncludedOptions, oOptions);
 
 			if (oLastOptionParam) {
 				aParams.push(oLastOptionParam);
 			}
 
+			if (oLastOptionIncludedParam) {
+				aParams.push(oLastOptionIncludedParam);
+			}
+
 			if (oNextOptionParam) {
 				aParams.push(oNextOptionParam);
 			}
 
+			if (oNextOptionIncludedParam) {
+				aParams.push(oNextOptionIncludedParam);
+			}
+
 			if (oValue && oValue.values) {
 				oValue.values = oValue.values.map(function(val) {
 					return val;
@@ -457,6 +540,9 @@ sap.ui.define([
 					case "options":
 						oInputControl = this._createOptionsControl(oValue, iIndex, fnControlsUpdated, aParams);
 						break;
+					case "included":
+						oInputControl = this._createIncludedControl(oValue, fnControlsUpdated);
+						break;
 					default:
 						break;
 				}
@@ -494,21 +580,98 @@ sap.ui.define([
 		};
 
 		StandardDynamicDateOption.prototype._createOptionsControl = function(oValue, iIndex, fnControlsUpdated, aParameters) {
-			var oControl = new RadioButtonGroup({
-				buttons: [
-					aParameters[iIndex].getOptions().map(makeRadioButton)
+			const aOptions = aParameters[iIndex].getOptions();
+			const aOptionsStrings = aOptions.map(function(sOption) {
+				let sOptionName = sOption;
+
+				if (sOptionName.indexOf("included") !== -1) {
+					sOptionName = sOptionName.replace("included", "");
+				}
+
+				if (aOptions.indexOf(sOption) !== -1 && aOptions.indexOf(sOptionName) !== -1 && sOptionName !== sOption) {
+					return "";
+				}
+
+				return sOptionName.toUpperCase();
+			});
+
+			const filteredArray = aOptionsStrings.filter(function(str) {
+				return str !== "";
+			});
+
+			var oControl = new Select({
+				items: [
+					filteredArray.map(makeSelectOption)
 				]
 			});
+
+			oControl.setSelectedKey(oControl.getAggregation("items")[0].getKey());
+
 			if (oValue) {
-				var iOptionIndex = aParameters[iIndex].getOptions().indexOf(oValue.operator.slice(4).toLowerCase());
+				const aOptionsArray = aParameters[iIndex].getOptions();
+
+				for (let i = 0; i < aOptionsArray.length; i++) {
+					if (aOptionsArray[i].indexOf("included") !== -1) {
+						aOptionsArray[i] = aOptionsArray[i].replace("included", "");
+					}
+
+					const iLastIndexOfOption = aOptionsArray.lastIndexOf(aOptionsArray[i]);
+
+					if (i !== iLastIndexOfOption) {
+						aOptionsArray.splice(iLastIndexOfOption, 1);
+					}
+				}
+
+				var sKey = oValue.operator.slice(4).replace("INCLUDED", ""),
+					iOptionIndex = aOptionsArray.indexOf(sKey?.toLowerCase());
 
 				if (iOptionIndex !== -1) {
-					oControl.setSelectedIndex(iOptionIndex);
+					oControl.setSelectedKey(sKey);
 				}
 			}
 
 			if (fnControlsUpdated instanceof Function) {
-				oControl.attachSelect(function() {
+				oControl.attachChange(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oControl;
+		};
+
+		StandardDynamicDateOption.prototype._createIncludedControl = function(oValue, fnControlsUpdated) {
+			const oIncludedRadioButton = new RadioButton({
+				text: _resourceBundle.getText("DDR_LASTNEXTX_INCLUDE_LABEL"),
+				groupName: "includedSelection"
+			});
+			const oExcludedRadioButton = new RadioButton({
+				text: _resourceBundle.getText("DDR_LASTNEXTX_EXCLUDE_LABEL"),
+				selected: true,
+				groupName: "includedSelection"
+			});
+
+			const oControl = new VBox({
+				items: [
+					oExcludedRadioButton,
+					new Label({text:"", wrapping: true}),
+					oIncludedRadioButton,
+					new Label({text: "", wrapping: true})
+				]
+			});
+
+			if (oValue && oValue.operator.indexOf("INCLUDED") > -1) {
+				oIncludedRadioButton.setSelected(true);
+			} else {
+				oExcludedRadioButton.setSelected(true);
+			}
+
+			this._oInternalIncludedControl = oControl;
+
+			if (fnControlsUpdated instanceof Function) {
+				oIncludedRadioButton.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
+				oExcludedRadioButton.attachSelect(function() {
 					fnControlsUpdated(this);
 				}, this);
 			}
@@ -519,8 +682,24 @@ sap.ui.define([
 		StandardDynamicDateOption.prototype._getOptionParams = function(aGroupOptions, oOptions){
 			if (aGroupOptions.indexOf(this.getKey()) !== -1) {
 				return new DynamicDateValueHelpUIType({
-					text: _resourceBundle.getText("DDR_LASTNEXTX_TIME_PERIODS_LABEL"),
+					text: _resourceBundle.getText("DDR_LASTNEXTX_TIME_UNIT_LABEL"),
 					type: "options",
+					options: oOptions ? oOptions.filter(function(option) {
+						return aGroupOptions.indexOf(option.getKey()) !== -1 || aGroupOptions.indexOf(option.getKey().replace("INCLUDED", "")) !== -1;
+					}).map(function(option) {
+						return option.getKey().slice(4).toLowerCase();
+					}) : []
+				});
+			}
+
+			return undefined;
+		};
+
+		StandardDynamicDateOption.prototype._getOptionIncludedParams = function(aGroupOptions, oOptions){
+			if (aGroupOptions.indexOf(this.getKey() + "INCLUDED") !== -1) {
+				return new DynamicDateValueHelpUIType({
+					text: _resourceBundle.getText("DDR_LASTNEXTX_TIME_PERIODS_LABEL"),
+					type: "included",
 					options: oOptions ? oOptions.filter(function(option) {
 						return aGroupOptions.indexOf(option.getKey()) !== -1;
 					}).map(function(option) {
@@ -590,23 +769,37 @@ sap.ui.define([
 		StandardDynamicDateOption.prototype.getValueHelpOutput = function(oControl) {
 			var oOptions = oControl._getOptions();
 			var aParams = this.getValueHelpUITypes(oControl),
+				bHasIncludedControl = oControl.aControlsByParameters && oControl.aControlsByParameters[this.getKey()] && oControl.aControlsByParameters[this.getKey()].length > 1,
 				aResult = {},
 				vOutput;
 
-			if (aLastOptions.indexOf(this.getKey()) !== -1 && oControl.aControlsByParameters[this.getKey()].length > 1) {
+			if (aLastOptions.indexOf(this.getKey()) !== -1 && bHasIncludedControl) {
 				aResult.operator = oOptions.filter(function(option) {
-					return aLastOptions.indexOf(option.getKey()) !== -1;
-				})[oControl.aControlsByParameters[this.getKey()][1].getSelectedIndex()].getKey();
-			} else if (aNextOptions.indexOf(this.getKey()) !== -1 && oControl.aControlsByParameters[this.getKey()].length > 1) {
+					return this._shouldAddLastOrNextOption(oOptions, option, aLastOptions);
+				}.bind(this))[oControl.aControlsByParameters[this.getKey()][1].getSelectedIndex()].getKey();
+			} else if (aNextOptions.indexOf(this.getKey()) !== -1 && bHasIncludedControl) {
 				aResult.operator = oOptions.filter(function(option) {
-					return aNextOptions.indexOf(option.getKey()) !== -1;
-				})[oControl.aControlsByParameters[this.getKey()][1].getSelectedIndex()].getKey();
+					return this._shouldAddLastOrNextOption(oOptions, option, aNextOptions);
+				}.bind(this))[oControl.aControlsByParameters[this.getKey()][1].getSelectedIndex()].getKey();
 			} else {
 				aResult.operator = this.getKey();
 			}
 
+			if (aLastOptions.indexOf(this.getKey()) !== -1 || aNextOptions.indexOf(this.getKey()) !== -1) {
+				const bCurrentOptionHasAlsoIncluded = oControl.getStandardOptions().indexOf(aResult.operator + "INCLUDED") > -1;
+				const bIncludedRadioButtonIsSelected = oControl.aControlsByParameters && oControl.aControlsByParameters[this.getKey()] && oControl.aControlsByParameters[this.getKey()][2]?.getItems()[2].getSelected();
+
+				if (bIncludedRadioButtonIsSelected && bCurrentOptionHasAlsoIncluded) {
+					aResult.operator = aResult.operator + "INCLUDED";
+				}
+			}
+
 			aResult.values = [];
 
+			if (!oControl.aControlsByParameters || !oControl.aControlsByParameters[this.getKey()]) {
+				return aResult;
+			}
+
 			for (var i = 0; i < aParams.length; i++) {
 				var oInputControl = oControl.aControlsByParameters[this.getKey()][i];
 
@@ -682,6 +875,55 @@ sap.ui.define([
 			return aResult;
 		};
 
+		StandardDynamicDateOption.prototype._shouldAddLastOrNextOption = function(aOptions, oOption, aTargetOptions) {
+			let sOptionKey = oOption.getKey();
+			let iRepetitionCounter = 0;
+
+			if (sOptionKey.indexOf("INCLUDED") !== -1) {
+				iRepetitionCounter++;
+				sOptionKey = sOptionKey.replace("INCLUDED", "");
+			}
+
+			for (let i = 0; i < aOptions.length; i++) {
+				if (aOptions[i].getKey() === sOptionKey) {
+					iRepetitionCounter++;
+				}
+			}
+
+			return aTargetOptions.indexOf(sOptionKey) !== -1 && iRepetitionCounter === 1;
+		};
+
+		StandardDynamicDateOption.prototype.alignValueHelpUI = function(oControl) {
+			const bHasIncludedLastOptions = aLastOptions.indexOf(this.getKey()) !== -1 && oControl.aControlsByParameters[Object.keys(oControl.aControlsByParameters)[0]].length > 1;
+			const bHasIncludedNextOptions = aNextOptions.indexOf(this.getKey()) !== -1 && oControl.aControlsByParameters[Object.keys(oControl.aControlsByParameters)[0]].length > 1;
+			const bHasRadioButtons = bHasIncludedLastOptions || bHasIncludedNextOptions;
+
+			if (!bHasRadioButtons) {
+				return;
+			}
+
+			const sSelectedOption = oControl.aControlsByParameters[this.getKey()][1].getSelectedKey();
+			const sFullOptionName = this.getKey().slice(0,4) + sSelectedOption.toUpperCase();
+			const oIncludedControl = oControl.aControlsByParameters[this.getKey()][2];
+			const oIncludedControlLabel = oControl.aInputControls[4];
+			const oInputControl = oControl.aControlsByParameters[this.getKey()][0];
+			const oIncludedDates = this.toDates({"operator": sFullOptionName + "INCLUDED", "values": [oInputControl.getValue()]});
+			const oExcludedDates = this.toDates({"operator": sFullOptionName, "values": [oInputControl.getValue()]});
+			const sIncludedLabel = oControl._getDatesLabelFormatter().format(oIncludedDates);
+			const sExcludedLabel = oControl._getDatesLabelFormatter().format(oExcludedDates);
+
+			oIncludedControl?.getItems()[1].setText(sExcludedLabel);
+			oIncludedControl?.getItems()[3].setText(sIncludedLabel);
+
+			if (oControl.getStandardOptions().indexOf(sFullOptionName + "INCLUDED") !== -1 && oControl.getStandardOptions().indexOf(sFullOptionName) !== -1) {
+				oIncludedControl?.setVisible(true);
+				oIncludedControlLabel?.setVisible(true);
+			} else {
+				oIncludedControl?.setVisible(false);
+				oIncludedControlLabel?.setVisible(false);
+			}
+		};
+
 		StandardDynamicDateOption.prototype.getGroup = function() {
 			return _OptionsGroup[this.getKey()];
 		};
@@ -796,6 +1038,41 @@ sap.ui.define([
 					return UniversalDateUtils.ranges.lastQuarters(iParamLastNext);
 				case "LASTYEARS":
 					return UniversalDateUtils.ranges.lastYears(iParamLastNext);
+				case "LASTMINUTESINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastMinutes(iParamLastNext - 1);
+					oResultValues[0].setSeconds(0);
+
+					return oResultValues;
+				case "LASTHOURSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastHours(iParamLastNext - 1);
+					oResultValues[0].setMinutes(0, 0);
+
+					return oResultValues;
+				case "LASTDAYSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastDays(iParamLastNext - 1);
+					oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "LASTWEEKSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastWeeks(iParamLastNext - 1, sCalendarWeekNumbering);
+					oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "LASTMONTHSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastMonths(iParamLastNext - 1);
+					oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "LASTQUARTERSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastQuarters(iParamLastNext - 1);
+					oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "LASTYEARSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.lastYears(iParamLastNext - 1);
+					oResultValues[1] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
 				case "NEXTMINUTES":
 					return UniversalDateUtils.ranges.nextMinutes(iParamLastNext);
 				case "NEXTHOURS":
@@ -810,6 +1087,41 @@ sap.ui.define([
 					return UniversalDateUtils.ranges.nextQuarters(iParamLastNext);
 				case "NEXTYEARS":
 					return UniversalDateUtils.ranges.nextYears(iParamLastNext);
+				case "NEXTMINUTESINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextMinutes(iParamLastNext - 1);
+					oResultValues[1].setSeconds(59);
+
+					return oResultValues;
+				case "NEXTHOURSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextHours(iParamLastNext - 1);
+					oResultValues[1].setMinutes(59, 59);
+
+					return oResultValues;
+				case "NEXTDAYSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextDays(iParamLastNext - 1);
+					oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "NEXTWEEKSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextWeeks(iParamLastNext  - 1, sCalendarWeekNumbering);
+					oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "NEXTMONTHSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextMonths(iParamLastNext - 1);
+					oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "NEXTQUARTERSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextQuarters(iParamLastNext - 1);
+					oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
+				case "NEXTYEARSINCLUDED":
+					var oResultValues = UniversalDateUtils.ranges.nextYears(iParamLastNext - 1);
+					oResultValues[0] = UniversalDate.getInstance(UI5Date.getInstance());
+
+					return oResultValues;
 				case "FROM":
 					return [UniversalDate.getInstance(oValue.values[0])];
 				case "TO":
@@ -910,9 +1222,24 @@ sap.ui.define([
 				return _resourceBundle.getText("DYNAMIC_DATE_" + sKey + "_TITLE");
 			}
 
-			sCombinedOptions = aOptions.map(function(sOption) {
-				return _resourceBundle.getText("DYNAMIC_DATE_" + sOption.toUpperCase());
-			}).join(" / ");
+			const aOptionsStrings = aOptions.map(function(sOption) {
+				let sOptionName = sOption;
+
+				if (sOptionName.indexOf("included") !== -1) {
+					sOptionName = sOptionName.replace("included", "");
+				}
+
+				if (aOptions.indexOf(sOption) !== -1 && aOptions.indexOf(sOptionName) !== -1 && sOptionName !== sOption) {
+					return "";
+				}
+				return _resourceBundle.getText("DYNAMIC_DATE_" + sOptionName.toUpperCase());
+			});
+
+			const filteredArray = aOptionsStrings.filter(function(str) {
+				return str !== "";
+			});
+
+			sCombinedOptions = filteredArray.join(" / ");
 
 			if (sKey.indexOf("LAST") === 0) {
 				return _resourceBundle.getText("DYNAMIC_DATE_LASTX_TITLE", [sCombinedOptions]);
@@ -923,9 +1250,9 @@ sap.ui.define([
 			}
 		};
 
-		function makeRadioButton(sOptionName) {
-			return new RadioButton({ text: _resourceBundle.getText("DYNAMIC_DATE_" + sOptionName.toUpperCase()) });
+		function makeSelectOption(sOption) {
+			return new Item({ key: sOption.toUpperCase(), text: _resourceBundle.getText("DYNAMIC_DATE_" + sOption.toUpperCase()) });
 		}
 
 		return StandardDynamicDateOption;
-	});
+	});

package/src/sap/m/StandardListItem.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTile.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.m.Tile
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StandardTreeItem.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.TreeItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/StepInput.js

@@ -121,7 +121,7 @@ function(
 		 * @implements sap.ui.core.IFormContent
 		 *
 		 * @author SAP SE
-		 * @version 1.128.0
+		 * @version 1.130.0
 		 *
 		 * @constructor
 		 * @public
@@ -753,16 +753,16 @@ function(
 				if (bHasValidationErrorListeners && sBindingConstraintMax) {
 					return;
 				}
-				sMessage = oCoreMessageBundle.getText("EnterNumberMax", [max]);
+				sMessage = this.getValueStateText() ? this.getValueStateText() : oCoreMessageBundle.getText("EnterNumberMax", [max]);
 				aViolatedConstraints.push("maximum");
 			} else if (this._isLessThanMin(value)) {
 				if (bHasValidationErrorListeners && sBindingConstraintMin) {
 					return;
 				}
-				sMessage = oCoreMessageBundle.getText("EnterNumberMin", [min]);
+				sMessage = this.getValueStateText() ? this.getValueStateText() : oCoreMessageBundle.getText("EnterNumberMin", [min]);
 				aViolatedConstraints.push("minimum");
 			} else if (this._areFoldChangeRequirementsFulfilled() && (value % this.getStep() !== 0)) {
-				sMessage = oCoreMessageBundle.getText("Float.Invalid");
+				sMessage = this.getValueStateText() ? this.getValueStateText() : oCoreMessageBundle.getText("Float.Invalid");
 			}
 
 			if (sMessage) {

package/src/sap/m/SuggestionItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @since 1.34
 	 *
 	 * @constructor

package/src/sap/m/SuggestionsPopover.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @alias sap.m.SuggestionsPopover
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 */
 	var SuggestionsPopover = EventProvider.extend("sap.m.SuggestionsPopover", /** @lends sap.m.SuggestionsPopover.prototype */ {
 

package/src/sap/m/Switch.js

@@ -52,7 +52,7 @@ function(
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.128.0
+		 * @version 1.130.0
 		 *
 		 * @constructor
 		 * @public