@openui5/sap.m 1.110.0 → 1.111.0

package/src/sap/m/DateTimePicker.js

@@ -27,6 +27,7 @@ sap.ui.define([
 	'sap/ui/core/IconPool',
 	'sap/ui/qunit/utils/waitForThemeApplied',
 	'sap/ui/core/Configuration',
+	'sap/ui/core/date/UI5Date',
 	'sap/ui/dom/jquery/cursorPos' // provides jQuery.fn.cursorPos
 ], function(
 	jQuery,
@@ -49,7 +50,8 @@ sap.ui.define([
 	Button,
 	IconPool,
 	waitForThemeApplied,
-	Configuration
+	Configuration,
+	UI5Date
 ) {
 	"use strict";
 
@@ -143,7 +145,7 @@ sap.ui.define([
 	 * mobile devices, it opens in full screen.
 	 *
 	 * @extends sap.m.DatePicker
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -356,7 +358,7 @@ sap.ui.define([
 			}
 
 			if (sKey === "Cal") {
-				oCalendar.$().css("display", "flex");
+				oCalendar.$().css("display", "");
 				oClocks.$().css("display", "none");
 				oCalendar.getFocusDomRef() && oCalendar.getFocusDomRef().focus();
 			} else {
@@ -389,66 +391,32 @@ sap.ui.define([
 		this._bOnlyCalendar = false;
 	};
 
-	DateTimePicker.prototype._formatValueAndUpdateOutput = function(oDate, sValue) {
-		delete this._prefferedValue;
-
-		// convert to output
-		var sOutputValue = oDate ? this._formatValue(oDate) : sValue;
-		if (!oDate) {
-			var sFallbackValue = this._fallbackParse(sValue);
-			if (typeof sFallbackValue === "string") {
-				this._bValid = true;
-				this._prefferedValue = sFallbackValue;
-				sOutputValue = sFallbackValue;
-			}
-		}
-
-		if (!this.getDomRef()) {
-			return;
-		}
-
-		if (this._bPreferUserInteraction) {
-			// Handle the value concurrency before setting the value property of the control,
-			// in order to distinguish whether the user only focused the input field or typed in it
-			this.handleInputValueConcurrency(sOutputValue);
-		} else if (this._$input.val() !== sOutputValue) {
-			// update the DOM value when necessary
-			// otherwise cursor can go to the end of text unnecessarily
-			this._$input.val(sOutputValue);
-			this._curpos = this._$input.cursorPos();
-		}
-	};
-
 	DateTimePicker.prototype.setTimezone = function(sTimezone) {
 		var oCurrentDateValue,
 			sFormattedValue,
 			oNewDateValue;
 
+
 		if (this.getTimezone() === sTimezone) {
 			return this;
 		}
-
-		oCurrentDateValue = this.getDateValue() || this._parseValue(this.getValue(), false);
-		sFormattedValue = this._formatValue(oCurrentDateValue, false);
-
 		this.setProperty("timezone", sTimezone);
 
-		this._oDisplayFormat = null;
-		this._oValueFormat = null;
-		this._oDisplayFormatWithTimezone = null;
-		this._oValueFormatWithTimezone = null;
-
 		if (this._oTimezonePopup) {
 			this._oTimezonePopup.setTitle(this._getTranslatedTimezone(true));
 		}
 
-		// the dateValue should be adjusted, and the value re-formatted
-		oNewDateValue = this._parseValue(sFormattedValue, true);
-		if (oNewDateValue) {
-			this.setProperty("dateValue", oNewDateValue);
-			this.setProperty("value", this._formatValue(oNewDateValue, true));
+		if (this._isTimezoneBinding()){
+			oCurrentDateValue = this.getDateValue() || this._parseValue(this.getValue(), false);
+			sFormattedValue = this._formatValue(oCurrentDateValue, false);
+			oNewDateValue = this._parseValue(sFormattedValue, true);
+			if (oNewDateValue) {
+				this.setProperty("dateValue", oNewDateValue);
+				this.setProperty("value", this._formatValue(oNewDateValue, true));
+			}
 		}
 
+
 		return this;
 	};
 
@@ -479,6 +447,57 @@ sap.ui.define([
 		}
 	};
 
+	DateTimePicker.prototype._formatValueAndUpdateOutput = function(oDate, sValue) {
+		delete this._prefferedValue;
+		// convert to output
+		var sOutputValue = oDate ? this._formatValue(oDate) : sValue;
+		if (!oDate) {
+			var sFallbackValue = this._fallbackParse(sValue);
+			if (typeof sFallbackValue === "string") {
+				this._bValid = true;
+				this._prefferedValue = sFallbackValue;
+				sOutputValue = sFallbackValue;
+			}
+		}
+
+		if (!this.getDomRef()) {
+			return;
+		}
+
+		if (this._bPreferUserInteraction) {
+			// Handle the value concurrency before setting the value property of the control,
+			// in order to distinguish whether the user only focused the input field or typed in it
+			this.handleInputValueConcurrency(sOutputValue);
+		} else if (this._$input.val() !== sOutputValue) {
+			// update the DOM value when necessary
+			// otherwise cursor can go to the end of text unnecessarily
+			this._$input.val(sOutputValue);
+			this._curpos = this._$input.cursorPos();
+		}
+	};
+
+	/**
+	 * Tries to parse the value to see if it is a timezone only string.
+	 * @param {string} sValue A value string
+	 * @return {string|null} An empty string indicating success or null
+	 * @private
+	 */
+	DateTimePicker.prototype._fallbackParse = function(sValue) {
+		return this._getFallbackParser().parse(sValue) ? "" : null;
+	};
+
+	DateTimePicker.prototype._getFallbackParser = function() {
+		if (!this._fallbackParser) {
+			this._fallbackParser = DateFormat.getDateTimeWithTimezoneInstance({
+				showDate: false,
+				showTime: false,
+				showTimezone: true
+			});
+		}
+
+		return this._fallbackParser;
+	};
+
 	/**
 	 * Apply the correct icon to the used Date control
 	 * @protected
@@ -502,7 +521,6 @@ sap.ui.define([
 	};
 
 	DateTimePicker.prototype.setDisplayFormat = function(sDisplayFormat) {
-		this._oDisplayFormatWithTimezone = null;
 		DatePicker.prototype.setDisplayFormat.apply(this, arguments);
 
 		if (this._oClocks) {
@@ -514,11 +532,6 @@ sap.ui.define([
 
 	};
 
-	DateTimePicker.prototype.setValueFormat = function(sValueFormat) {
-		this._oValueFormatWithTimezone = null;
-		return DatePicker.prototype.setValueFormat.apply(this, arguments);
-	};
-
 	DateTimePicker.prototype.setMinutesStep = function(iMinutesStep) {
 
 		this.setProperty('minutesStep', iMinutesStep, true);
@@ -607,6 +620,11 @@ sap.ui.define([
 		return this._oTimezonePopup;
 	};
 
+	DateTimePicker.prototype._getFormatInstance = function(oArguments){
+
+		return DateFormat.getDateTimeInstance(oArguments);
+	};
+
 	DateTimePicker.prototype._togglePopoverOpen = function(oPopover, oOpenerDomRef) {
 		if (oPopover.isOpen()) {
 			oPopover.close();
@@ -615,7 +633,7 @@ sap.ui.define([
 		}
 	};
 
-	DateTimePicker.prototype._getFormatter = function(bDisplayFormat) {
+	DateTimePicker.prototype._getFormatterWithTimezoneInstance = function(bDisplayFormat) {
 		var sCacheName = this._getTimezoneFormatterCacheName(bDisplayFormat);
 
 		if (!this[sCacheName]) {
@@ -684,6 +702,10 @@ sap.ui.define([
 			oFormatOptions[this._checkStyle(sFormat) ? "style" : "pattern"] = sFormat;
 		}
 
+		// Explicit replacement of the values because these two option are not compatible with the control
+		oFormatOptions.showDate = true;
+		oFormatOptions.showTime = true;
+
 		return oFormatOptions;
 	};
 
@@ -778,25 +800,20 @@ sap.ui.define([
 
 	};
 
-	DateTimePicker.prototype._parseValue = function(sValue, bDisplayFormat, sTimezone) {
+	DateTimePicker.prototype._isTimezoneBinding = function() {
 		var oBinding = this.getBinding("value") || this.getBinding("dateValue"),
-			oBindingType = oBinding && oBinding.getType(),
-			aDateWithTimezone;
+			oBindingType = oBinding && oBinding.getType();
 
-		if (oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"])) {
-			var aCurrentBindingValues = oBinding.getCurrentValues().slice(0);
-			aCurrentBindingValues[1] = sTimezone || this._getTimezone(true);
-			return oBindingType.parseValue(sValue, "string", aCurrentBindingValues)[0];
-		}
+		return oBindingType && oBindingType.isA(["sap.ui.model.odata.type.DateTimeWithTimezone"]);
+	};
 
-		aDateWithTimezone = this._getFormatter(bDisplayFormat)
-			.parse(sValue, sTimezone || this._getTimezone(true));
+	DateTimePicker.prototype._parseValue = function(sValue, bDisplayFormat, sTimezone) {
 
-		if (!aDateWithTimezone || !aDateWithTimezone.length) {
-			return null;
+		if (this._isTimezoneBinding()) {
+			return this._getFormatterWithTimezoneInstance().parse(sValue, sTimezone || this._getTimezone(true))[0];
 		}
 
-		return aDateWithTimezone[0];
+		return DatePicker.prototype._parseValue.apply(this, arguments);
 	};
 
 	DateTimePicker.prototype._formatValue = function(oDate, bValueFormat, sTimezone) {
@@ -804,32 +821,17 @@ sap.ui.define([
 			return "";
 		}
 
-		return this._getFormatter(!bValueFormat).format(oDate, sTimezone || this._getTimezone(true));
-	};
-
-	/**
-	 * Tries to parse the value to see if it is a timezone only string.
-	 * @param {string} sValue A value string
-	 * @returns {string|null} An empty string indicating success or null
-	 * @private
-	 */
-	DateTimePicker.prototype._fallbackParse = function(sValue) {
-		return this._getFallbackParser().parse(sValue) ? "" : null;
-	};
-
-	DateTimePicker.prototype._getFallbackParser = function() {
-		if (!this._fallbackParser) {
-			this._fallbackParser = DateFormat.getDateTimeWithTimezoneInstance({
-				showDate: false,
-				showTime: false,
-				showTimezone: true
-			});
+		if (this._isTimezoneBinding()){
+			return this._getFormatterWithTimezoneInstance(!bValueFormat).format(oDate, sTimezone || this._getTimezone(true));
 		}
 
-		return this._fallbackParser;
+		return DatePicker.prototype._formatValue.apply(this, arguments);
 	};
 
 	DateTimePicker.prototype._getPickerParser = function() {
+		if (!this._isTimezoneBinding()){
+			return DatePicker.prototype._getFormatter.apply(this, arguments);
+		}
 		if (!this._clocksParser) {
 			this._clocksParser = DateFormat.getDateTimeWithTimezoneInstance({
 				showTimezone: false,
@@ -979,13 +981,13 @@ sap.ui.define([
 			sFormattedDate;
 
 		if (oDate) {
-			oDate = new Date(oDate.getTime());
+			oDate = UI5Date.getInstance(oDate.getTime());
 			this._oOKButton.setEnabled(true);
 		} else {
 			bDateFound = false;
 			oDate = this.getInitialFocusedDateValue();
 			if (!oDate) {
-				oDate = new Date();
+				oDate = UI5Date.getInstance();
 				this._oCalendar.removeAllSelectedDates();
 			}
 			var iMaxTimeMillis = this._oMaxDate.getTime();
@@ -996,10 +998,11 @@ sap.ui.define([
 			this._oOKButton.setEnabled(false);
 		}
 
-		// convert the date to local date for the calendar and the clocks
-		sFormattedDate = this._getPickerParser().format(oDate, this._getTimezone(true));
-		oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
-
+		// convert the date to local date for the calendar and the clocks if binding is used
+		if (this._isTimezoneBinding()) {
+			sFormattedDate = this._getPickerParser().format(oDate, this._getTimezone(true));
+			oDate = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[0];
+		}
 		this._oCalendar.focusDate(oDate);
 
 		if (bDateFound) {
@@ -1014,7 +1017,9 @@ sap.ui.define([
 	DateTimePicker.prototype._getSelectedDate = function(){
 		var oDate = DatePicker.prototype._getSelectedDate.apply(this, arguments),
 			oDateTime,
-			sPattern;
+			sPattern,
+			sFormattedDate,
+			oParts;
 
 		if (oDate) {
 			oDateTime = this._oClocks.getTimeValues();
@@ -1031,12 +1036,17 @@ sap.ui.define([
 			}
 
 			if (oDate.getTime() < this._oMinDate.getTime()) {
-				oDate = new Date(this._oMinDate.getTime());
+				oDate = UI5Date.getInstance(this._oMinDate.getTime());
 			} else if (oDate.getTime() > this._oMaxDate.getTime()){
-				oDate = new Date(this._oMaxDate.getTime());
+				oDate = UI5Date.getInstance(this._oMaxDate.getTime());
 			}
 		}
 
+		if (this._isTimezoneBinding()) {
+			sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+			oParts = this._getPickerParser().parse(sFormattedDate, this._getTimezone(true));
+			oDate = oParts && oParts[0];
+		}
 		return oDate;
 	};
 
@@ -1093,7 +1103,7 @@ sap.ui.define([
 		} else {
 			oSwitcher.setVisible(false);
 			oClocks.$().css("display", "");
-			oCalendar.$().css("display", "flex");
+			oCalendar.$().css("display", "");
 		}
 	};
 

package/src/sap/m/DateTimePickerRenderer.js

@@ -3,8 +3,20 @@
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRenderer', 'sap/ui/core/library'],
-	function(Renderer, DatePickerRenderer, InputBaseRenderer, coreLibrary) {
+sap.ui.define([
+	'sap/ui/core/Renderer',
+	'./DatePickerRenderer',
+	'./InputBaseRenderer',
+	'sap/ui/core/library',
+	'sap/ui/core/date/UI5Date'
+],
+	function(
+		Renderer,
+		DatePickerRenderer,
+		InputBaseRenderer,
+		coreLibrary,
+		UI5Date
+) {
 	"use strict";
 
 	/**
@@ -61,9 +73,7 @@ sap.ui.define(['sap/ui/core/Renderer', './DatePickerRenderer', './InputBaseRende
 		oRm.openEnd();
 
 		// try to choose the date that is the longest when formatted
-		oRm.text(oControl._getFormatter(true).format(
-			new Date(Date.UTC(2000, 10, 20, 10, 10, 10)),
-			"UTC"));
+		oRm.text(oControl._getFormatter(true).format(UI5Date.getInstance(2000, 10, 20, 10, 10, 10)));
 		oRm.close("span");
 	};
 

package/src/sap/m/Dialog.js

@@ -167,7 +167,7 @@ function(
 		*
 		* @implements sap.ui.core.PopupInterface
 		* @author SAP SE
-		* @version 1.110.0
+		* @version 1.111.0
 		*
 		* @constructor
 		* @public
@@ -482,7 +482,7 @@ function(
 			header: {suffix: "header"},
 			subHeader: {selector: ".sapMDialogSubHeader .sapMIBar"},
 			content: {selector: ".sapMDialogScrollCont"},
-			footer: {suffix: "footer"}
+			footer: {selector: ".sapMDialogFooter .sapMIBar"}
 		});
 
 		// Add title propagation support
@@ -1249,6 +1249,10 @@ function(
 						$dialogContent.css({"padding-right" : ""});
 						this._iLastWidthAndHeightWithScroll = null;
 					}
+				} else if (!this._hasVerticalScrollbar() || !bMinWidth) {
+					$dialog.removeClass("sapMDialogVerticalScrollIncluded");
+					$dialogContent.css({"padding-right" : ""});
+					this._iLastWidthAndHeightWithScroll = null;
 				}
 			}
 

package/src/sap/m/DisplayListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DraftIndicator.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.110.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @public
@@ -70,8 +70,8 @@ sap.ui.define([
 		 * Only formats the 'values' part of the given object. The dates are expected as 'timestamp' numbers
 		 * and are converted to Javascript Date objects. The numbers and strings are left untouched.
 		 *
-		 * @param {object} oValue The value to be formatted
-		 * @return {object} A value object in a similar form
+		 * @param {{operator: string, values: Array<number|string>}} oValue The value to be formatted
+		 * @return {{operator: string, values: Array<Date|number|string>}} A value object in a similar form
 		 *
 		 * @public
 		 */
@@ -105,8 +105,8 @@ sap.ui.define([
 		 * and are converted to timestamps. The numbers and strings are left untouched.
 		 * Special values with operator: "PARSEERROR" generate a parse exception.
 		 *
-		 * @param {object} oValue The value to be parsed
-		 * @return {object} A value object in a similar form
+		 * @param {{operator: string, values: Array<Date|number|string>}} oValue The value to be parsed
+		 * @return {{operator: string, values: Array<number|string|null>}} A value object in a similar form
 		 *
 		 * @public
 		 */

package/src/sap/m/DynamicDateFormat.js

@@ -43,11 +43,15 @@ sap.ui.define([
 			"DATETIME": ["datetime"],
 			"DATERANGE": ["date", "date"],
 			"DATETIMERANGE": ["datetime", "datetime"],
+			"LASTMINUTES": ["int"],
+			"LASTHOURS": ["int"],
 			"LASTDAYS": ["int"],
 			"LASTWEEKS": ["int"],
 			"LASTMONTHS": ["int"],
 			"LASTQUARTERS": ["int"],
 			"LASTYEARS": ["int"],
+			"NEXTMINUTES": ["int"],
+			"NEXTHOURS": ["int"],
 			"NEXTDAYS": ["int"],
 			"NEXTWEEKS": ["int"],
 			"NEXTMONTHS": ["int"],
@@ -98,11 +102,24 @@ sap.ui.define([
 			_dynamicParameterIndexes[sKey] = aParams;
 		}
 
+		/**
+		 * @typedef {object} sap.m.DynamicDateFormatOptions
+		 * @description Object which defines the format options
+		 *
+		 * @param {sap.ui.core.Locale} [oFormatOptions.oLocale] Formatter locale
+		 * @param {sap.ui.core.LocaleData} [oFormatOptions.oLocaleData] Locale-specific data, such as, date formats, number formats, and currencies
+		 * @param {Object<string, object>} [oFormatOptions.oOriginalFormatOptions] Default format options
+		 *
+		 * @public
+		 * @since 1.111
+		 */
+
 		/**
 		 * Get an instance of the DynamicDateFormat which can be used for formatting.
 		 *
-		 * @param {object} [oFormatOptions] Object which defines the format options
+		 * @param {sap.m.DynamicDateFormatOptions} [oFormatOptions] Object which defines the format options
 		 * @param {sap.ui.core.Locale} [oLocale] Locale to get the formatter for
+		 * @ui5-omissible-params oFormatOptions
 		 * @return {sap.m.DynamicDateFormat} Instance of the DynamicDateFormat
 		 * @public
 		 *
@@ -122,7 +139,7 @@ sap.ui.define([
 		/**
 		 * Create an instance of the DynamicDateFormat.
 		 *
-		 * @param {object} [oFormatOptions] Object which defines the format options
+		 * @param {sap.m.DynamicDateFormatOptions} [oFormatOptions] Object which defines the format options
 		 * @param {sap.ui.core.Locale} [oLocale] Locale to get the formatter for
 		 * @return {sap.m.DynamicDateFormat} Instance of the DynamicDateFormat
 		 * @private
@@ -168,7 +185,7 @@ sap.ui.define([
 		/**
 		 * Formats a list according to the given format options.
 		 *
-		 * @param {object} oObj The value to format
+		 * @param {sap.m.DynamicDateRangeValue} oObj The value to format
 		 * @param {boolean} bSkipCustomFormatting If set to <code>true</code> the formatter does not format to the equivalent user-friendly string. Instead, the formatter uses the specified option key and parameters.
 		 * @return {string} The formatted output value.
 		 * @public
@@ -241,7 +258,7 @@ sap.ui.define([
 		 *
 		 * @param {string} sValue String value to be parsed
 		 * @param {string} sKey String value of the key we will parse for
-		 * @return {object} The parsed output value
+		 * @return {sap.m.DynamicDateRangeValue[]} The parsed output value
 		 * @public
 		 */
 		DynamicDateFormat.prototype.parse = function(sValue, sKey) {

package/src/sap/m/DynamicDateOption.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.110.0
+		 * @version 1.111.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -96,7 +96,7 @@ sap.ui.define([
 		 * getValueHelpUITypes is not enough to define the UI.
 		 *
 		 * @param {sap.m.DynamicDateRange} oControl The control instance
-		 * @param {function} fnControlsUpdated A callback invoked when any of the created controls updates its value
+		 * @param {function(sap.ui.base.Event)} fnControlsUpdated A callback invoked when any of the created controls updates its value
 		 * @returns {sap.ui.core.Control[]} An array with the option's value help UI controls
 		 * @public
 		 */
@@ -189,10 +189,10 @@ sap.ui.define([
 
 		/**
 		 * Gets the value help controls' output values and
-		 * converts them to a DynamicDateRange value.
+		 * converts them to a <code>sap.m.DynamicDateRangeValue</code>.
 		 *
 		 * @param {sap.m.DynamicDateRange} oControl The control instance
-		 * @returns {object} A DynamicDateRange value
+		 * @returns {sap.m.DynamicDateRangeValue} A <code>sap.m.DynamicDateRangeValue</code>
 		 * @public
 		 */
 		DynamicDateOption.prototype.getValueHelpOutput = function(oControl) {
@@ -281,7 +281,7 @@ sap.ui.define([
 		/**
 		 * Formats the option's value to a string.
 		 *
-		 * @param {object} oValue A DynamicDateRange value
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
 		 * @returns {string} A string representing this option's value
 		 * @public
 		 */
@@ -290,10 +290,10 @@ sap.ui.define([
 		};
 
 		/**
-		 * Parses a string to a DynamicDateRange value.
+		 * Parses a string to a <code>sap.m.DynamicDateRangeValue</code>.
 		 *
 		 * @param {string} sValue An input string
-		 * @returns {object} This option's DynamicDateRange value
+		 * @returns {sap.m.DynamicDateRangeValue} This parsed value
 		 * @public
 		 */
 		DynamicDateOption.prototype.parse = function(sValue) {
@@ -303,7 +303,7 @@ sap.ui.define([
 		/**
 		 * Calculates an absolute date range from the options relative value.
 		 *
-		 * @param {object} oValue A DynamicDateRange value
+		 * @param {sap.m.DynamicDateRangeValue} oValue A <code>sap.m.DynamicDateRangeValue</code>
 		 * @returns {sap.ui.core.date.UniversalDate[]} A couple of dates marking the start and the end of the range
 		 * @public
 		 */
@@ -376,8 +376,11 @@ sap.ui.define([
 			return oControl;
 		};
 
-		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated) {
-			var oControl = new DateTimePicker({timezone: TimezoneUtil.getLocalTimezone()});
+		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
+			var oControl = new DateTimePicker({
+				timezone: TimezoneUtil.getLocalTimezone(),
+				calendarWeekNumbering: sCalendarWeekNumbering
+			});
 
 			if (oValue && this.getKey() === oValue.operator) {
 				oControl.setDateValue(oValue.values[iIndex]);
@@ -392,9 +395,10 @@ sap.ui.define([
 			return oControl;
 		};
 
-		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new Calendar({
-				width: "100%"
+				width: "100%",
+				calendarWeekNumbering: sCalendarWeekNumbering
 			});
 			var oInputControlValue;
 
@@ -422,9 +426,10 @@ sap.ui.define([
 		/**
 		 * Returns DateTimePicker PopupContent control (single "datetime" option)
 		 */
-		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new DateTimePicker({
-					width: "100%"
+					width: "100%",
+					calendarWeekNumbering: sCalendarWeekNumbering
 				}),
 				oPopupContent;
 
@@ -471,10 +476,11 @@ sap.ui.define([
 			return oPopupContent;
 		};
 
-		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated, bUTC) {
+		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated, bUTC, sCalendarWeekNumbering) {
 			var oControl = new Calendar({
 				intervalSelection: true,
-				width: "100%"
+				width: "100%",
+				calendarWeekNumbering: sCalendarWeekNumbering
 			});
 			if (oValue && this.getKey() === oValue.operator) {
 				// a date range UI type maps to 2 consecutive date parameters from the value