@openui5/sap.m 1.98.0 → 1.99.0

package/src/sap/m/DynamicDate.js

@@ -36,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.SimpleType
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -88,7 +88,7 @@ sap.ui.define([
 			var aValueTypes = DynamicDateUtil.getOption(oValue.operator).getValueTypes();
 
 			oResult.values = oResult.values.map(function(oValue, index) {
-				if (aValueTypes[index] === "date") {
+				if (aValueTypes[index] === "date" || aValueTypes[index] === "datetime") {
 					return oTimestampInputFormat.parse(oValue);
 				}
 
@@ -128,7 +128,7 @@ sap.ui.define([
 			aValueTypes = DynamicDateUtil.getOption(oValue.operator).getValueTypes();
 
 			oResult.values = oResult.values.map(function(oValue, index) {
-				if (aValueTypes[index] === "date") {
+				if (aValueTypes[index] === "date" || aValueTypes[index] === "datetime") {
 					return oTimestampInputFormat.format(oValue);
 				}
 

package/src/sap/m/DynamicDateFormat.js

@@ -41,7 +41,9 @@ sap.ui.define([
 		var _dynamicParameterIndexes = {};
 		var aParameterTypesByStandardOptionKey = {
 			"DATE": ["date"],
+			"DATETIME": ["datetime"],
 			"DATERANGE": ["date", "date"],
+			"DATETIMERANGE": ["datetime", "datetime"],
 			"LASTDAYS": ["int"],
 			"LASTWEEKS": ["int"],
 			"LASTMONTHS": ["int"],
@@ -54,7 +56,10 @@ sap.ui.define([
 			"NEXTYEARS": ["int"],
 			"FROM": ["date"],
 			"TO": ["date"],
+			"FROMDATETIME": ["datetime"],
+			"TODATETIME": ["datetime"],
 			"SPECIFICMONTH": ["month"],
+			"SPECIFICMONTHINYEAR": ["month", "int"],
 			"TODAYFROMTO": ["int", "int"]
 		};
 		var aStandardDynamicDateRangeKeysArray = Object.keys(library.StandardDynamicDateRangeKeys);
@@ -109,7 +114,9 @@ sap.ui.define([
 
 		DynamicDateFormat.oDefaultDynamicDateFormat = {
 			"date": {},
+			"datetime": {},
 			"month": { pattern: "MMMM" },
+			"year": { pattern: "yyyy" },
 			"int": {}
 		};
 
@@ -144,7 +151,9 @@ sap.ui.define([
 				};
 			});
 
+			oFormat._dateTimeFormatter = DateFormat.getDateTimeInstance(oFormat.oOriginalFormatOptions["datetime"]);
 			oFormat._monthFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["month"]);
+			oFormat._yearFormatter = DateFormat.getInstance(oFormat.oOriginalFormatOptions["year"]);
 			oFormat._numberFormatter = NumberFormat.getInstance(oFormat.oOriginalFormatOptions["int"]);
 			oFormat._resourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
@@ -166,6 +175,14 @@ sap.ui.define([
 				var oDate = new Date();
 				oDate.setMonth(aParams[0]);
 				aParams[0] = this._monthFormatter.format(oDate);
+			} else if (sKey === "SPECIFICMONTHINYEAR") {
+				var oDate = new Date();
+
+				oDate.setMonth(aParams[0]);
+				oDate.setYear(aParams[1]);
+
+				aParams[0] = this._monthFormatter.format(oDate);
+				aParams[1] = this._yearFormatter.format(oDate);
 			} else if (sKey === "LASTDAYS" && aParams[0] === 1) {
 				sKey = "YESTERDAY";
 				aParams = [];
@@ -175,10 +192,15 @@ sap.ui.define([
 			} else if ((sKey === "LASTDAYS" || sKey === "NEXTDAYS") && aParams[0] === 0) {
 				sKey = "TODAY";
 				aParams = [];
+			} else if (sKey === "DATETIME") {
+				aParams[0] = this._dateTimeFormatter.format(oObj.values[0]);
 			}
 
 			var aFormattedParams = aParams.map(function(param) {
 				if (param instanceof Date) {
+					if (sKey === "DATETIMERANGE" || sKey === "FROMDATETIME" || sKey === "TODATETIME") {
+						return this._dateTimeFormatter.format(param);
+					}
 					return this._dateFormatter.format(param);
 				}
 
@@ -196,6 +218,7 @@ sap.ui.define([
 		 * Parses a given list string into an array.
 		 *
 		 * @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
 		 * @public
 		 */
@@ -227,6 +250,9 @@ sap.ui.define([
 						case "date":
 							oVal = this._dateFormatter.parse(sCurrentMatch);
 							break;
+						case "datetime":
+							oVal = this._dateTimeFormatter.parse(sCurrentMatch);
+							break;
 						case "month":
 							var aMonthNames = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(function(i) {
 								var oDate = new Date();

package/src/sap/m/DynamicDateOption.js

@@ -9,16 +9,20 @@ sap.ui.define([
 	'sap/ui/core/Element',
 	'./Label',
 	'./StepInput',
+	'./DateTimePicker',
 	'sap/ui/unified/Calendar',
 	'sap/ui/unified/DateRange',
-	'sap/ui/unified/calendar/MonthPicker'],
+	'sap/ui/unified/calendar/MonthPicker',
+	'sap/ui/unified/calendar/CustomMonthPicker'],
 	function(
 		Element,
 		Label,
 		StepInput,
+		DateTimePicker,
 		Calendar,
 		DateRange,
-		MonthPicker) {
+		MonthPicker,
+		CustomMonthPicker) {
 		"use strict";
 
 		/**
@@ -32,7 +36,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -96,10 +100,11 @@ sap.ui.define([
 		 * @public
 		 */
 		DynamicDateOption.prototype.createValueHelpUI = function(oControl, fnControlsUpdated) {
-			var oValue = oControl.getValue();
-			var aParams = this.getValueHelpUITypes(oControl);
-			var aControls = [];
-			var oInputControl;
+			var oValue = oControl.getValue(),
+				aParams = this.getValueHelpUITypes(oControl),
+				valueHelpUiTypesCount = aParams.length,
+				aControls = [],
+				oInputControl;
 
 			if (!oControl.aControlsByParameters) {
 				oControl.aControlsByParameters = {};
@@ -116,7 +121,7 @@ sap.ui.define([
 					);
 				}
 
-				oInputControl = this._createControl(i, aParams[i].getType(), oValue, fnControlsUpdated);
+				oInputControl = this._createControl(i, aParams[i].getType(), oValue, fnControlsUpdated, valueHelpUiTypesCount);
 
 				aControls.push(oInputControl);
 				oControl.aControlsByParameters[this.getKey()].push(oInputControl);
@@ -148,12 +153,18 @@ sap.ui.define([
 						}
 						break;
 					case "month":
+					case "custommonth":
 					case "date":
 					case "daterange":
 						if (!oInputControl.getSelectedDates() || oInputControl.getSelectedDates().length == 0) {
 							return false;
 						}
 						break;
+					case "datetime":
+						if (!oInputControl.getDateValue()) {
+							return false;
+						}
+						break;
 				}
 			}
 
@@ -191,6 +202,20 @@ sap.ui.define([
 						}
 
 						vOutput = oInputControl.getSelectedDates()[0].getStartDate();
+					break;
+					case "custommonth":
+						if (!oInputControl.getSelectedDates() || !oInputControl.getSelectedDates().length) {
+							return null;
+						}
+
+						vOutput = [oInputControl.getSelectedDates()[0].getStartDate().getMonth(), oInputControl.getSelectedDates()[0].getStartDate().getFullYear()];
+						break;
+					case "datetime":
+						if (!oInputControl.getDateValue()) {
+							return null;
+						}
+
+						vOutput = oInputControl.getDateValue();
 						break;
 					case "daterange":
 						if (!oInputControl.getSelectedDates().length) {
@@ -200,6 +225,8 @@ sap.ui.define([
 						var oEndDate = oInputControl.getSelectedDates()[0].getEndDate() || oInputControl.getSelectedDates()[0].getStartDate();
 						vOutput = [oInputControl.getSelectedDates()[0].getStartDate(), oEndDate];
 						break;
+					default:
+						break;
 				}
 
 				if (Array.isArray(vOutput)) {
@@ -281,7 +308,7 @@ sap.ui.define([
 
 		// PRIVATE
 
-		DynamicDateOption.prototype._createControl = function(iIndex, sUIType, oValue, fnControlsUpdated) {
+		DynamicDateOption.prototype._createControl = function(iIndex, sUIType, oValue, fnControlsUpdated, valueHelpUiTypesCount) {
 			var oInputControl;
 
 			switch (sUIType) {
@@ -291,12 +318,25 @@ sap.ui.define([
 				case "date":
 					oInputControl = this._createDateControl(oValue, iIndex, fnControlsUpdated);
 					break;
+				case "datetime":
+					if (valueHelpUiTypesCount === 1) {
+						// Returns DateTimePicker PopupContent control (single "datetime" option)
+						oInputControl = this._createDateTimeInnerControl(oValue, iIndex, fnControlsUpdated);
+					} else if (valueHelpUiTypesCount === 2) {
+						oInputControl = this._createDateTimeControl(oValue, iIndex, fnControlsUpdated);
+					}
+					break;
 				case "daterange":
 					oInputControl = this._createDateRangeControl(oValue, iIndex, fnControlsUpdated);
 					break;
 				case "month":
 					oInputControl = this._createMonthControl(oValue, iIndex, fnControlsUpdated);
 					break;
+				case "custommonth":
+					oInputControl = this._createCustomMonthControl(oValue, iIndex, fnControlsUpdated);
+					break;
+				default:
+					break;
 			}
 
 			return oInputControl;
@@ -320,6 +360,22 @@ sap.ui.define([
 			return oControl;
 		};
 
+		DynamicDateOption.prototype._createDateTimeControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new DateTimePicker();
+
+			if (oValue && this.getKey() === oValue.operator) {
+				oControl.setDateValue(oValue.values[iIndex]);
+			}
+
+			if (fnControlsUpdated instanceof Function) {
+				oControl.attachChange(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oControl;
+		};
+
 		DynamicDateOption.prototype._createDateControl = function(oValue, iIndex, fnControlsUpdated) {
 			var oControl = new Calendar({
 				width: "100%"
@@ -340,6 +396,53 @@ sap.ui.define([
 			return oControl;
 		};
 
+		/**
+		 * Returns DateTimePicker PopupContent control (single "datetime" option)
+		 */
+		DynamicDateOption.prototype._createDateTimeInnerControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new DateTimePicker({
+					width: "100%"
+				}),
+				oPopupContent;
+
+			// DateTimePicker is created, but only its internal PopupContent control is used
+			oControl._createPopup();
+			oControl._createPopupContent();
+			oPopupContent = oControl._oPopupContent;
+			oPopupContent.setForcePhoneView(true);
+			oPopupContent.getCalendar().removeAllSelectedDates();
+
+			if (oValue && this.getKey() === oValue.operator) {
+				var oValueCopy = new Date(oValue.values[iIndex]); // a copy is used to prevent time setting on pressing Cancel button
+				oPopupContent.getCalendar().addSelectedDate(new DateRange({
+					startDate: oValueCopy
+				}));
+				oPopupContent.getClocks()._setTimeValues(oValueCopy);
+			}
+
+			if (fnControlsUpdated instanceof Function) {
+				// capture live clock changes and update the value
+				oPopupContent.getClocks().getAggregation("_clocks").forEach(function(oClock) {
+					oClock.attachChange(function(oEvent) {
+						fnControlsUpdated(this);
+					}.bind(this));
+				}.bind(this));
+
+				// capture live AM/PM changes and update the value
+				if (oPopupContent.getClocks().getAggregation("_buttonAmPm")) {
+					oPopupContent.getClocks().getAggregation("_buttonAmPm").attachSelectionChange(function(oEvent) {
+						fnControlsUpdated(this);
+					}.bind(this));
+				}
+
+				oPopupContent.getCalendar().attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oPopupContent;
+		};
+
 		DynamicDateOption.prototype._createDateRangeControl = function(oValue, iIndex, fnControlsUpdated) {
 			var oControl = new Calendar({
 				intervalSelection: true,
@@ -382,5 +485,27 @@ sap.ui.define([
 			return oControl;
 		};
 
+		DynamicDateOption.prototype._createCustomMonthControl = function(oValue, iIndex, fnControlsUpdated) {
+			var oControl = new CustomMonthPicker(),
+				oDate = new Date(),
+				iMonth = (oValue && iIndex >= 0 && this.getKey() === oValue.operator) ? oValue.values[iIndex] : oDate.getMonth(),
+				iYear = (oValue  && iIndex >= 0 && this.getKey() === oValue.operator) ? oValue.values[iIndex + 1] : oDate.getFullYear();
+
+			oDate.setDate(1);
+			oDate.setMonth(iMonth);
+			oDate.setYear(iYear);
+			oControl.addSelectedDate(new DateRange({
+				startDate: oDate
+			}));
+
+			if (fnControlsUpdated instanceof Function) {
+				oControl.attachSelect(function() {
+					fnControlsUpdated(this);
+				}, this);
+			}
+
+			return oControl;
+		};
+
 		return DynamicDateOption;
 	});

package/src/sap/m/DynamicDateRange.js

@@ -118,7 +118,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public
@@ -239,8 +239,11 @@ sap.ui.define([
 							"FIRSTDAYYEAR",
 							"LASTDAYYEAR",
 							"DATERANGE",
+							"DATETIMERANGE",
 							"FROM",
 							"TO",
+							"FROMDATETIME",
+							"TODATETIME",
 							"YEARTODATE",
 							"DATETOYEAR",
 							"LASTDAYS",
@@ -258,6 +261,7 @@ sap.ui.define([
 							"LASTWEEK",
 							"NEXTWEEK",
 							"SPECIFICMONTH",
+							"SPECIFICMONTHINYEAR",
 							"THISMONTH",
 							"LASTMONTH",
 							"NEXTMONTH",
@@ -270,7 +274,8 @@ sap.ui.define([
 							"QUARTER4",
 							"THISYEAR",
 							"LASTYEAR",
-							"NEXTYEAR"
+							"NEXTYEAR",
+							"DATETIME"
 						]
 					}
 				},
@@ -427,6 +432,13 @@ sap.ui.define([
 					if (typeof (vOption) === "string") {
 						return this._createHeaderListItem(vOption);
 					}
+					if (vOption.getKey() === "FROMDATETIME") {
+						vOption._bAdditionalTimeText = !!this._findOption("FROM");
+					} else if (vOption.getKey() === "TODATETIME") {
+						vOption._bAdditionalTimeText = !!this._findOption("TO");
+					} else if (vOption.getKey() === "DATETIMERANGE") {
+						vOption._bAdditionalTimeText = !!this._findOption("DATERANGE");
+					}
 					return this._createListItem(vOption);
 				}, this).forEach(function(oItem) {
 					oItem.addDelegate(this._oListItemDelegate, this);
@@ -440,6 +452,19 @@ sap.ui.define([
 			}
 		};
 
+		/**
+		 * Searches if there is an option with the given key included.
+		 *
+		 * @param {string} sKey option key to be searched against
+		 * @returns  {object|undefined} object if the object exists
+		 * @private
+		 */
+		DynamicDateRange.prototype._findOption = function(sKey) {
+			return this._getOptions().find(function(oOption) {
+				return oOption.getKey() === sKey;
+			});
+		};
+
 		/**
 		 * Appends an option key, identifying an additional option to be used by the control.
 		 *
@@ -468,6 +493,8 @@ sap.ui.define([
 			if (oValue && oValue.operator !== "PARSEERROR") {
 				sInputValue = this._enhanceInputValue(this._formatValue(oValue), oValue);
 				this._oInput.setValue(sInputValue);
+			} else if (oValue === undefined) {
+				this._oInput.setValue("");
 			}
 		};
 
@@ -555,11 +582,22 @@ sap.ui.define([
 		};
 
 		DynamicDateRange.prototype._getDatesLabelFormatter = function() {
-			if (!this._oDatesLabelFormatter) {
-				var oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
-				oFormatOptions.interval = true;
+			var oFormatOptions,
+				aValueHelpTypes = this._oSelectedOption ? this._oSelectedOption.getValueHelpUITypes() : [],
+				sType = aValueHelpTypes && aValueHelpTypes.length ? aValueHelpTypes[0].getType() : "";
 
-				this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
+			if (!this._oDatesLabelFormatter) {
+				switch (sType) {
+					case "datetime":
+						oFormatOptions = Object.create(this._getFormatter()._dateTimeFormatter.oFormatOptions);
+						oFormatOptions.interval = true;
+						this._oDatesLabelFormatter = DateFormat.getDateTimeInstance(oFormatOptions);
+						break;
+					default:
+						oFormatOptions = Object.create(this._getFormatter()._dateFormatter.oFormatOptions);
+						oFormatOptions.interval = true;
+						this._oDatesLabelFormatter = DateFormat.getInstance(oFormatOptions);
+				}
 			}
 
 			return this._oDatesLabelFormatter;
@@ -659,8 +697,8 @@ sap.ui.define([
 			if (!this._oPopup) {
 				this._oPopup = new ResponsivePopover(this.getId() + "-RP", {
 					//read the documentation about those two - the page addapts its size to its container...
-					contentHeight: '470px',
-					contentWidth: _isCompact(this.getDomRef()) ? '272px' : '320px',
+					contentHeight: '512px',
+					contentWidth: '320px',
 					showCloseButton: false,
 					showArrow: false,
 					showHeader: false,
@@ -688,6 +726,7 @@ sap.ui.define([
 				}, this);
 
 				this._oPopup.attachAfterClose(function() {
+					this._oPreviousSelectedOption = this._oSelectedOption;
 					this._setFooterVisibility(false);
 					this.invalidate();
 				}, this);
@@ -700,7 +739,11 @@ sap.ui.define([
 
 				this._oPopup.setEndButton(new Button({
 					text: oResourceBundle.getText("DYNAMIC_DATE_RANGE_CANCEL"),
-					press: this._closePopup.bind(this)
+					press: function() {
+						this._oSelectedOption = this._oPreviousSelectedOption;
+						this._oDatesLabelFormatter = null;
+						this._closePopup();
+					}.bind(this)
 				}));
 
 				this._setFooterVisibility(false);
@@ -785,7 +828,7 @@ sap.ui.define([
 		DynamicDateRange.prototype._createListItem = function(oOption) {
 			var bIsFixedOption = this._isFixedOption(oOption);
 
-			return new DynamicDateRangeListItem(this.getId() + "-option-" + oOption.getKey(),  {
+			return new DynamicDateRangeListItem(this.getId() + "-option-" + oOption.getKey().replaceAll(" ", ""),  {
 				type: bIsFixedOption ? ListType.Active : ListType.Navigation,
 				title: oOption.getText(this),
 				wrapping: true,
@@ -806,6 +849,11 @@ sap.ui.define([
 			var sOptionKey = oEvent.getSource().getOptionKey(),
 				oOption = DynamicDateUtil.getOption(sOptionKey);
 
+			if (this._oPreviousSelectedOption && this._oPreviousSelectedOption.getKey() !== sOptionKey)	{
+				this._oDatesLabelFormatter = null;
+			}
+			this._oPreviousSelectedOption = this._oSelectedOption;
+
 			this._oSelectedOption = oOption;
 			if (this._isFixedOption(oOption)) {
 				this._applyValue();
@@ -1029,7 +1077,7 @@ sap.ui.define([
 			if (oToPage === oOptionDetailsPage) {
 				this.aInputControls.forEach(function(oControl) {
 					if (jQuery(oControl.getDomRef()).firstFocusableDomRef()) {
-						oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
+						oControl.addAriaLabelledBy && oControl.addAriaLabelledBy(oToPage.getAggregation("_internalHeader"));
 
 						if (!this._isCalendarBasedControl(oControl) && oControl.addAriaDescribedBy) {
 							oControl.addAriaDescribedBy(oToPage.getFooter().getContent()[0]);
@@ -1174,7 +1222,7 @@ sap.ui.define([
 		 * Returns ARIA accessibility role for the control.
 		 *
 		 * @param {sap.ui.core.Control} oControl an object representation of the control
-		 * @returns {String}
+		 * @returns {string}
 		 */
 		DynamicDateRangeInputRenderer.getAriaRole = function(oControl) {
 			return "combobox";
@@ -1244,7 +1292,6 @@ sap.ui.define([
 		/**
 		 * Getter for the originating control.
 		 *
-		 * @param {void}
 		 * @returns {sap.ui.core.Control}
 		 */
 		DynamicDateRangeInput.prototype._getControlOrigin = function() {
@@ -1278,13 +1325,17 @@ sap.ui.define([
 		// Overwrite the sap.m.StandardListItem.getNavigationControl method, in order to change the navigation icon URI
 		DynamicDateRangeListItem.prototype.getNavigationControl = function() {
 			var oNavControl = StandardListItem.prototype.getNavigationControl.apply(this, arguments),
-				bDateOption = ["SPECIFICMONTH", "DATE", "DATERANGE", "FROM", "TO"].includes(this.getOptionKey()),
-				sNavgationIconURI = bDateOption
-					? IconPool.getIconURI("appointment-2")
-					: IconPool.getIconURI("slim-arrow-right");
+				sOptionKey = this.getOptionKey(),
+				aValueTypes = DynamicDateUtil.getOption(sOptionKey).getValueTypes(),
+				bDateOption = ["SPECIFICMONTH", "DATE", "DATERANGE", "FROM", "TO"].includes(sOptionKey),
+				bDateTimeOption = aValueTypes && aValueTypes.length && aValueTypes[0] === "datetime",
+				sNavgationIconURI;
 
-			if (bDateOption) {
+			if (bDateOption || bDateTimeOption) {
 				oNavControl.addStyleClass("sapMDDRDateOption");
+				sNavgationIconURI = bDateOption ? IconPool.getIconURI("appointment-2") : IconPool.getIconURI("date-time");
+			} else {
+				sNavgationIconURI = IconPool.getIconURI("slim-arrow-right");
 			}
 
 			oNavControl.setSrc(sNavgationIconURI);
@@ -1292,18 +1343,5 @@ sap.ui.define([
 			return oNavControl;
 		};
 
-		function _isCompact(oRef) {
-			var oDomRef = oRef;
-
-			while (oDomRef && oDomRef.classList) {
-				if (oDomRef.classList.contains("sapUiSizeCompact")) {
-					return true;
-				}
-				oDomRef = oDomRef.parentNode;
-			}
-
-			return false;
-		}
-
 		return DynamicDateRange;
 	});

package/src/sap/m/DynamicDateRangeRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/m/InputBaseRenderer", 'sap/ui/core/Renderer'],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.DynamicDateRange} oControl an object representation of the control that should be rendered
 	 */
 	DynamicDateRangeRenderer.render = function(oRm, oControl) {
 

package/src/sap/m/DynamicDateUtil.js

@@ -27,6 +27,9 @@ sap.ui.define([
 		"LASTDAYQUARTER",
 		"FIRSTDAYYEAR",
 		"LASTDAYYEAR",
+		"DATETIMERANGE",
+		"FROMDATETIME",
+		"TODATETIME",
 		"DATERANGE",
 		"FROM",
 		"TO",
@@ -112,6 +115,8 @@ sap.ui.define([
 			"NEXTYEARS": new StandardDynamicDateOption({ key: "NEXTYEARS", valueTypes: ["int"] }),
 			"FROM": new StandardDynamicDateOption({ key: "FROM", valueTypes: ["date"] }),
 			"TO": new StandardDynamicDateOption({ key: "TO", valueTypes: ["date"] }),
+			"FROMDATETIME": new StandardDynamicDateOption({ key: "FROMDATETIME", valueTypes: ["datetime"] }),
+			"TODATETIME": new StandardDynamicDateOption({ key: "TODATETIME", valueTypes: ["datetime"] }),
 			"YEARTODATE": new StandardDynamicDateOption({ key: "YEARTODATE", valueTypes: [] }),
 			"DATETOYEAR": new StandardDynamicDateOption({ key: "DATETOYEAR", valueTypes: [] }),
 			"TODAYFROMTO": new StandardDynamicDateOption({ key: "TODAYFROMTO", valueTypes: ["int", "int"] }),
@@ -120,8 +125,11 @@ sap.ui.define([
 			"QUARTER3": new StandardDynamicDateOption({ key: "QUARTER3", valueTypes: [] }),
 			"QUARTER4": new StandardDynamicDateOption({ key: "QUARTER4", valueTypes: [] }),
 			"SPECIFICMONTH": new StandardDynamicDateOption({ key: "SPECIFICMONTH", valueTypes: ["int"] }),
+			"SPECIFICMONTHINYEAR": new StandardDynamicDateOption({ key: "SPECIFICMONTHINYEAR", valueTypes: ["int", "int"] }),
 			"DATERANGE": new StandardDynamicDateOption({ key: "DATERANGE", valueTypes: ["date", "date"] }),
-			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] })
+			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] }),
+			"DATETIME": new StandardDynamicDateOption({ key: "DATETIME", valueTypes: ["datetime"] }),
+			"DATETIMERANGE": new StandardDynamicDateOption({ key: "DATETIMERANGE", valueTypes: ["datetime", "datetime"] })
 		},
 		_allKeys: STANDARD_KEYS_ARRAY.slice(0)
 	};

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @public
 		 * @since 1.92

package/src/sap/m/ExpandableText.js

@@ -100,7 +100,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterItemRenderer.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ListItemBaseRenderer', 'sap/ui/core/Renderer'],
 	 *
 	 * @param {sap.ui.core.RenderManager}
 	 *          oRm The RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control}
+	 * @param {sap.m.FacetFilterItem}
 	 *          oControl An object representation of the control that should be rendered
 	 */
 	FacetFilterItemRenderer.renderLIContent = function(oRm, oControl) {