@openui5/sap.m 1.96.5 → 1.99.0

package/src/sap/m/StandardDynamicDateOption.js

@@ -5,10 +5,41 @@
  */
 
 // Provides control sap.m.StandardDynamicDateOption.
-sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepInput', './RadioButton', './RadioButtonGroup', 'sap/ui/unified/Calendar', 'sap/ui/unified/calendar/MonthPicker', 'sap/ui/core/format/DateFormat', './StandardDynamicDateRangeKeys', 'sap/ui/core/date/UniversalDateUtils', 'sap/ui/core/date/UniversalDate', 'sap/m/DynamicDateValueHelpUIType', './library'],
-	function(Element, DynamicDateOption, Label, StepInput, RadioButton, RadioButtonGroup, Calendar, MonthPicker, DateFormat, StandardDynamicDateRangeKeys, UniversalDateUtils, UniversalDate, DynamicDateValueHelpUIType, library) {
+sap.ui.define([
+		'sap/ui/core/library',
+		'sap/ui/core/Element',
+		'./DynamicDateOption',
+		'./Label',
+		'./StepInput',
+		'./RadioButton',
+		'./RadioButtonGroup',
+		'sap/ui/unified/Calendar',
+		'sap/ui/unified/calendar/MonthPicker',
+		'sap/ui/core/format/DateFormat',
+		'sap/ui/core/date/UniversalDateUtils',
+		'sap/ui/core/date/UniversalDate',
+		'sap/m/DynamicDateValueHelpUIType',
+		'./library'],
+	function(
+		coreLibrary,
+		Element,
+		DynamicDateOption,
+		Label,
+		StepInput,
+		RadioButton,
+		RadioButtonGroup,
+		Calendar,
+		MonthPicker,
+		DateFormat,
+		UniversalDateUtils,
+		UniversalDate,
+		DynamicDateValueHelpUIType,
+		library) {
 		"use strict";
 
+		// shortcut for sap.ui.core.VerticalAlign
+		var VerticalAlign = coreLibrary.VerticalAlign;
+
 		/**
 		 * Constructor for a new StandardDynamicDateOption.
 		 *
@@ -21,7 +52,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		 * @extends sap.m.DynamicDateOption
 		 *
 		 * @author SAP SE
-		 * @version 1.96.5
+		 * @version 1.99.0
 		 *
 		 * @public
 		 * @alias sap.m.StandardDynamicDateOption
@@ -39,11 +70,22 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 		var Keys = {
 			"DATE": "DATE",
+			"DATETIME": "DATETIME",
 			"DATERANGE": "DATERANGE",
+			"DATETIMERANGE": "DATETIMERANGE",
 			"TODAY": "TODAY",
 			"YESTERDAY": "YESTERDAY",
 			"TOMORROW": "TOMORROW",
 			"SPECIFICMONTH": "SPECIFICMONTH",
+			"SPECIFICMONTHINYEAR": "SPECIFICMONTHINYEAR",
+			"FIRSTDAYWEEK": "FIRSTDAYWEEK",
+			"LASTDAYWEEK": "LASTDAYWEEK",
+			"FIRSTDAYMONTH":"FIRSTDAYMONTH",
+			"LASTDAYMONTH":"LASTDAYMONTH",
+			"FIRSTDAYQUARTER":"FIRSTDAYQUARTER",
+			"LASTDAYQUARTER":"LASTDAYQUARTER",
+			"FIRSTDAYYEAR":"FIRSTDAYYEAR",
+			"LASTDAYYEAR":"LASTDAYYEAR",
 			"THISWEEK": "THISWEEK",
 			"THISMONTH": "THISMONTH",
 			"THISQUARTER": "THISQUARTER",
@@ -68,7 +110,10 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			"NEXTYEARS": "NEXTYEARS",
 			"FROM": "FROM",
 			"TO": "TO",
+			"FROMDATETIME": "FROMDATETIME",
+			"TODATETIME": "TODATETIME",
 			"YEARTODATE": "YEARTODATE",
+			"DATETOYEAR":"DATETOYEAR",
 			"TODAYFROMTO": "TODAYFROMTO",
 			"QUARTER1": "QUARTER1",
 			"QUARTER2": "QUARTER2",
@@ -87,11 +132,22 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 		var _OptionsGroup = {
 			"DATE": _Groups.SingleDates,
+			"DATETIME": _Groups.SingleDates,
 			"DATERANGE": _Groups.DateRanges,
+			"DATETIMERANGE": _Groups.DateRanges,
 			"TODAY": _Groups.SingleDates,
 			"YESTERDAY": _Groups.SingleDates,
 			"TOMORROW": _Groups.SingleDates,
 			"SPECIFICMONTH": _Groups.Months,
+			"SPECIFICMONTHINYEAR": _Groups.Months,
+			"FIRSTDAYWEEK": _Groups.SingleDates,
+			"LASTDAYWEEK": _Groups.SingleDates,
+			"FIRSTDAYMONTH":_Groups.SingleDates,
+			"LASTDAYMONTH":_Groups.SingleDates,
+			"FIRSTDAYQUARTER":_Groups.SingleDates,
+			"LASTDAYQUARTER":_Groups.SingleDates,
+			"FIRSTDAYYEAR":_Groups.SingleDates,
+			"LASTDAYYEAR":_Groups.SingleDates,
 			"THISWEEK": _Groups.Weeks,
 			"THISMONTH": _Groups.Months,
 			"THISQUARTER": _Groups.Quarters,
@@ -116,7 +172,10 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			"NEXTYEARS": _Groups.DateRanges,
 			"FROM": _Groups.DateRanges,
 			"TO": _Groups.DateRanges,
+			"FROMDATETIME": _Groups.DateRanges,
+			"TODATETIME": _Groups.DateRanges,
 			"YEARTODATE": _Groups.DateRanges,
+			"DATETOYEAR": _Groups.DateRanges,
 			"TODAYFROMTO": _Groups.DateRanges,
 			"QUARTER1": _Groups.Quarters,
 			"QUARTER2": _Groups.Quarters,
@@ -134,6 +193,16 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 		StandardDynamicDateOption.Keys = Keys;
 
+		StandardDynamicDateOption.prototype.exit = function() {
+			if (this.aValueHelpUITypes) {
+				while (this.aValueHelpUITypes.length) {
+					this.aValueHelpUITypes.pop().destroy();
+				}
+
+				delete this.aValueHelpUITypes;
+			}
+		};
+
 		StandardDynamicDateOption.prototype.getText = function(oControl) {
 			var sKey = this.getKey();
 			var oOptions = oControl._getOptions();
@@ -156,13 +225,18 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 				case Keys.LASTMONTHS:
 				case Keys.LASTQUARTERS:
 				case Keys.LASTYEARS:
-					return _resourceBundle.getText("DYNAMIC_DATE_LASTX_TITLE", aParams[1].getOptions().join(" / "));
 				case Keys.NEXTDAYS:
 				case Keys.NEXTWEEKS:
 				case Keys.NEXTMONTHS:
 				case Keys.NEXTQUARTERS:
 				case Keys.NEXTYEARS:
-					return _resourceBundle.getText("DYNAMIC_DATE_NEXTX_TITLE", aParams[1].getOptions().join(" / "));
+					return this._getXPeriodTitle(aParams[1].getOptions());
+				case Keys.FROMDATETIME:
+				case Keys.TODATETIME:
+				case Keys.DATETIMERANGE:
+					return oControl._findOption(sKey)._bAdditionalTimeText ?
+						_resourceBundle.getText("DYNAMIC_DATE_" + sKey + "_TITLE") + " (" + _resourceBundle.getText("DYNAMIC_DATE_DATETIME_TITLE") + ")" :
+						_resourceBundle.getText("DYNAMIC_DATE_" + sKey + "_TITLE");
 				default:
 					return _resourceBundle.getText("DYNAMIC_DATE_" + sKey + "_TITLE");
 			}
@@ -171,71 +245,117 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		StandardDynamicDateOption.prototype.getValueHelpUITypes = function(oControl) {
 			var sKey = this.getKey();
 
-			switch (sKey) {
-				case Keys.TODAY:
-				case Keys.YESTERDAY:
-				case Keys.TOMORROW:
-				case Keys.THISWEEK:
-				case Keys.THISMONTH:
-				case Keys.THISQUARTER:
-				case Keys.THISYEAR:
-				case Keys.LASTWEEK:
-				case Keys.LASTMONTH:
-				case Keys.LASTQUARTER:
-				case Keys.LASTYEAR:
-				case Keys.NEXTWEEK:
-				case Keys.NEXTMONTH:
-				case Keys.NEXTQUARTER:
-				case Keys.NEXTYEAR:
-				case Keys.YEARTODATE:
-				case Keys.QUARTER1:
-				case Keys.QUARTER2:
-				case Keys.QUARTER3:
-				case Keys.QUARTER4:
-					return [];
-				case Keys.DATE:
-				case Keys.FROM:
-				case Keys.TO:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "date"
-						})];
-				case Keys.DATERANGE:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "daterange"
-						})];
-				case Keys.SPECIFICMONTH:
-					return [
-						new DynamicDateValueHelpUIType({
-							type: "month"
-						})];
-				case Keys.LASTDAYS:
-				case Keys.LASTWEEKS:
-				case Keys.LASTMONTHS:
-				case Keys.LASTQUARTERS:
-				case Keys.LASTYEARS:
-				case Keys.NEXTDAYS:
-				case Keys.NEXTWEEKS:
-				case Keys.NEXTMONTHS:
-				case Keys.NEXTQUARTERS:
-				case Keys.NEXTYEARS:
-					return [
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_LASTNEXTX_LABEL"),
-							type: "int"
-						})];
-				case Keys.TODAYFROMTO:
-					return [
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_TODAYFROMTO_FROM_LABEL"),
-							type: "int"
-						}),
-						new DynamicDateValueHelpUIType({
-							text: _resourceBundle.getText("DDR_TODAYFROMTO_TO_LABEL"),
-							type: "int"
-						})];
+			if (!this.aValueHelpUITypes) { //the empty array is still an initialized value and can be reused
+				switch (sKey) {
+					case Keys.TODAY:
+					case Keys.YESTERDAY:
+					case Keys.TOMORROW:
+					case Keys.FIRSTDAYWEEK:
+					case Keys.LASTDAYWEEK:
+					case Keys.FIRSTDAYMONTH:
+					case Keys.LASTDAYMONTH:
+					case Keys.FIRSTDAYQUARTER:
+					case Keys.LASTDAYQUARTER:
+					case Keys.FIRSTDAYYEAR:
+					case Keys.LASTDAYYEAR:
+					case Keys.THISWEEK:
+					case Keys.THISMONTH:
+					case Keys.THISQUARTER:
+					case Keys.THISYEAR:
+					case Keys.LASTWEEK:
+					case Keys.LASTMONTH:
+					case Keys.LASTQUARTER:
+					case Keys.LASTYEAR:
+					case Keys.NEXTWEEK:
+					case Keys.NEXTMONTH:
+					case Keys.NEXTQUARTER:
+					case Keys.NEXTYEAR:
+					case Keys.YEARTODATE:
+					case Keys.DATETOYEAR:
+					case Keys.QUARTER1:
+					case Keys.QUARTER2:
+					case Keys.QUARTER3:
+					case Keys.QUARTER4:
+						this.aValueHelpUITypes = [];
+						break;
+					case Keys.DATETIME:
+					case Keys.FROMDATETIME:
+					case Keys.TODATETIME:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "datetime"
+							})];
+						break;
+					case Keys.DATE:
+					case Keys.FROM:
+					case Keys.TO:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "date"
+							})];
+						break;
+					case Keys.DATERANGE:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "daterange"
+							})];
+						break;
+					case Keys.SPECIFICMONTH:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "month"
+							})];
+						break;
+					case Keys.SPECIFICMONTHINYEAR:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								type: "custommonth"
+							})];
+						break;
+					case Keys.LASTDAYS:
+					case Keys.LASTWEEKS:
+					case Keys.LASTMONTHS:
+					case Keys.LASTQUARTERS:
+					case Keys.LASTYEARS:
+					case Keys.NEXTDAYS:
+					case Keys.NEXTWEEKS:
+					case Keys.NEXTMONTHS:
+					case Keys.NEXTQUARTERS:
+					case Keys.NEXTYEARS:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_LASTNEXTX_LABEL"),
+								type: "int"
+							})];
+						break;
+					case Keys.TODAYFROMTO:
+						this.aValueHelpUITypes = [
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_TODAYFROMTO_FROM_LABEL"),
+								type: "int",
+								additionalText: _resourceBundle.getText("DDR_TODAYFROMTO_TO_ADDITIONAL_LABEL")
+							}),
+							new DynamicDateValueHelpUIType({
+								text: _resourceBundle.getText("DDR_TODAYFROMTO_TO_LABEL"),
+								type: "int",
+								additionalText: _resourceBundle.getText("DDR_TODAYFROMTO_TO_ADDITIONAL_LABEL")
+							})];
+						break;
+					case Keys.DATETIMERANGE:
+							this.aValueHelpUITypes = [
+								new DynamicDateValueHelpUIType({
+									text: _resourceBundle.getText("DDR_DATETIMERANGE_FROM_LABEL"),
+									type: "datetime"
+								}),
+								new DynamicDateValueHelpUIType({
+									text: _resourceBundle.getText("DDR_DATETIMERANGE_TO_LABEL"),
+									type: "datetime"
+								})];
+							break;
+				}
 			}
+
+			return this.aValueHelpUITypes.slice(0);
 		};
 
 		/**
@@ -243,19 +363,21 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		 * @param {*} oOptions some parameters that can adapt the UI from outside
 		 * @param {function} fnControlsUpdated A callback invoked when any of the created controls updates its value
 		 *
-		 * Returns an array of controls which is mapped to the parameters of this DynamicDateOption.
+		 * @return {Object[]} Returns an array of controls which is mapped to the parameters of this DynamicDateOption.
 		 */
 		StandardDynamicDateOption.prototype.createValueHelpUI = function(oControl, fnControlsUpdated) {
-			var oOptions = oControl._getOptions();
-			var oValue = oControl.getValue();
-			var aParams = this.getValueHelpUITypes(oControl);
-			var aControls = [];
+			var oOptions = oControl._getOptions(),
+				oValue = oControl.getValue(),
+				aParams = this.getValueHelpUITypes(oControl),
+				aControls = [];
+
 			if (!oControl.aControlsByParameters) {
 				oControl.aControlsByParameters = {};
 			}
 			oControl.aControlsByParameters[this.getKey()] = [];
-			var oLastOptionParam = this._getOptionParams(aLastOptions, oOptions);
-			var oNextOptionParam = this._getOptionParams(aNextOptions, oOptions);
+
+			var oLastOptionParam = this._getOptionParams(aLastOptions, oOptions),
+				oNextOptionParam = this._getOptionParams(aNextOptions, oOptions);
 
 			if (oLastOptionParam) {
 				aParams.push(oLastOptionParam);
@@ -291,18 +413,40 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					case "date":
 						oInputControl = this._createDateControl(oValue, iIndex, fnControlsUpdated);
 						break;
+					case "datetime":
+						if (aParams.length === 1) {
+							// creates "single" DateTime option (embedded in the DynamicDateRange popup)
+							oInputControl = this._createDateTimeInnerControl(oValue, iIndex, fnControlsUpdated);
+						} else if (aParams.length === 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;
 					case "options":
 						oInputControl = this._createOptionsControl(oValue, iIndex, fnControlsUpdated, aParams);
 						break;
+					default:
+						break;
 				}
 
 				aControls.push(oInputControl);
+
+				if (aParams[iIndex].getAdditionalText()) {
+					aControls.push(
+						new Label({
+							vAlign: VerticalAlign.Bottom,
+							text: aParams[iIndex].getAdditionalText()
+						}).addStyleClass("sapMDDRAdditionalLabel")
+					);
+				}
 				oControl.aControlsByParameters[this.getKey()].push(oInputControl);
 			}
 
@@ -350,7 +494,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 		StandardDynamicDateOption.prototype._getOptionParams = function(aGroupOptions, oOptions){
 			if (aGroupOptions.indexOf(this.getKey()) !== -1) {
 				return new DynamicDateValueHelpUIType({
-					text: "Time Periods:",
+					text: _resourceBundle.getText("DDR_LASTNEXTX_TIME_PERIODS_LABEL"),
 					type: "options",
 					options: oOptions ? oOptions.filter(function(option) {
 						return aGroupOptions.indexOf(option.getKey()) !== -1;
@@ -386,17 +530,30 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 						}
 						break;
 					case "month":
+					case "custommonth":
 					case "date":
 					case "daterange":
 						if (!oInputControl.getSelectedDates() || oInputControl.getSelectedDates().length == 0) {
 							return false;
 						}
 						break;
+					case "datetime":
+						if (aParams.length === 1) {
+							// validates "single" DateTime option (embedded in the DynamicDateRange popup)
+							if (!oInputControl.getCalendar().getSelectedDates() || oInputControl.getCalendar().getSelectedDates().length == 0) {
+								return false;
+							}
+						} else if (!oInputControl.getDateValue() && aParams.length === 2) {
+							return false;
+						}
+						break;
 					case "options":
 						if (oInputControl.getSelectedIndex() < 0) {
 							return false;
 						}
 						break;
+					default:
+						break;
 				}
 			}
 
@@ -439,6 +596,13 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 						vOutput = oInputControl.getSelectedDates()[0].getStartDate().getMonth();
 						break;
+					case "custommonth":
+						if (!oInputControl.getSelectedDates() || !oInputControl.getSelectedDates().length) {
+							return null;
+						}
+
+						vOutput = [oInputControl.getSelectedDates()[0].getStartDate().getMonth(), oInputControl.getSelectedDates()[0].getStartDate().getFullYear()];
+						break;
 					case "date":
 						if (!oInputControl.getSelectedDates().length) {
 							return null;
@@ -446,6 +610,31 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 
 						vOutput = oInputControl.getSelectedDates()[0].getStartDate();
 						break;
+					case "datetime":
+						if (aParams.length === 1) {
+							// "single" DateTime picker (embedded in the DynamicDateRange popup)
+							var oDate,
+								oTimeDate,
+								oCalendar,
+								oClocks;
+
+							oCalendar = oInputControl.getCalendar();
+							oClocks = oInputControl.getClocks();
+							if (!oCalendar.getSelectedDates().length) {
+								return null;
+							}
+							oDate = oCalendar.getSelectedDates()[0].getStartDate();
+							oTimeDate = oClocks.getTimeValues();
+							oDate.setHours(oTimeDate.getHours(), oTimeDate.getMinutes(), oTimeDate.getSeconds());
+							vOutput = oDate;
+						} else if (aParams.length === 2) {
+							if (!oInputControl.getDateValue()) {
+								return null;
+							}
+
+							vOutput = oInputControl.getDateValue();
+						}
+						break;
 					case "daterange":
 						if (!oInputControl.getSelectedDates().length) {
 							return null;
@@ -454,6 +643,8 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 						var oEndDate = oInputControl.getSelectedDates()[0].getEndDate() || oInputControl.getSelectedDates()[0].getStartDate();
 						vOutput = [oInputControl.getSelectedDates()[0].getStartDate(), oEndDate];
 						break;
+					default:
+						break;
 				}
 
 				if (Array.isArray(vOutput)) {
@@ -496,19 +687,49 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					oDate.setMonth(oValue.values[0]);
 					oDate = UniversalDateUtils.getMonthStartDate(oDate);
 					return UniversalDateUtils.getRange(0, "MONTH", oDate);
+				case "SPECIFICMONTHINYEAR":
+					var oDate = new UniversalDate();
+					oDate.setMonth(oValue.values[0]);
+					oDate.setYear(oValue.values[1]);
+					oDate = UniversalDateUtils.getMonthStartDate(oDate);
+					return UniversalDateUtils.getRange(0, "MONTH", oDate);
 				case "DATE":
 					return UniversalDateUtils.getRange(0, "DAY", UniversalDate.getInstance(oValue.values[0]));
+				case "DATETIME":
+					var oDateTime = new UniversalDate.getInstance(oValue.values[0]);
+					return [oDateTime, oDateTime];
 				case "DATERANGE":
 					var oStart = UniversalDate.getInstance(oValue.values[0]);
 					var oEnd = UniversalDate.getInstance(oValue.values[1]);
 
 					return [UniversalDateUtils.resetStartTime(oStart), UniversalDateUtils.resetEndTime(oEnd)];
+				case "DATETIMERANGE":
+					var oStart = UniversalDate.getInstance(oValue.values[0]);
+					var oEnd = UniversalDate.getInstance(oValue.values[1]);
+
+					return [oStart, oEnd];
 				case "TODAY":
 					return UniversalDateUtils.ranges.today();
 				case "YESTERDAY":
 					return UniversalDateUtils.ranges.yesterday();
 				case "TOMORROW":
 					return UniversalDateUtils.ranges.tomorrow();
+				case "FIRSTDAYWEEK":
+					return UniversalDateUtils.ranges.firstDayOfWeek();
+				case "LASTDAYWEEK":
+					return UniversalDateUtils.ranges.lastDayOfWeek();
+				case "FIRSTDAYMONTH":
+					return UniversalDateUtils.ranges.firstDayOfMonth();
+				case "LASTDAYMONTH":
+					return UniversalDateUtils.ranges.lastDayOfMonth();
+				case "FIRSTDAYQUARTER":
+					return UniversalDateUtils.ranges.firstDayOfQuarter();
+				case "LASTDAYQUARTER":
+					return UniversalDateUtils.ranges.lastDayOfQuarter();
+				case "FIRSTDAYYEAR":
+					return UniversalDateUtils.ranges.firstDayOfYear();
+				case "LASTDAYYEAR":
+					return UniversalDateUtils.ranges.lastDayOfYear();
 				case "THISWEEK":
 					return UniversalDateUtils.ranges.currentWeek();
 				case "THISMONTH":
@@ -557,8 +778,14 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 					return [oValue.values[0], oValue.values[0]];
 				case "TO":
 					return [oValue.values[0], oValue.values[0]];
+				case "FROMDATETIME":
+					return [oValue.values[0], oValue.values[0]];
+				case "TODATETIME":
+					return [oValue.values[0], oValue.values[0]];
 				case "YEARTODATE":
 					return UniversalDateUtils.ranges.yearToDate();
+				case "DATETOYEAR":
+					return UniversalDateUtils.ranges.dateToYear();
 				case "TODAYFROMTO":
 					if (oValue.values.length !== 2) {
 						return [];
@@ -592,6 +819,14 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 				case "TODAY":
 				case "YESTERDAY":
 				case "TOMORROW":
+				case "FIRSTDAYWEEK":
+				case "LASTDAYWEEK":
+				case "FIRSTDAYMONTH":
+				case "LASTDAYMONTH":
+				case "FIRSTDAYQUARTER":
+				case "LASTDAYQUARTER":
+				case "FIRSTDAYYEAR":
+				case "LASTDAYYEAR":
 				case "THISWEEK":
 				case "THISMONTH":
 				case "THISQUARTER":
@@ -605,6 +840,7 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 				case "NEXTQUARTER":
 				case "NEXTYEAR":
 				case "YEARTODATE":
+				case "DATETOYEAR":
 				case "QUARTER1":
 				case "QUARTER2":
 				case "QUARTER3":
@@ -615,8 +851,36 @@ sap.ui.define(['sap/ui/core/Element', './DynamicDateOption', './Label', './StepI
 			}
 		};
 
+		/**
+		 * Gets a combined option title for the last x or the next x option.
+		 *
+		 * @param {*} aOptions A combination of the following string values: days, weeks, months, quarters, years
+		 * @returns {string} A combined option title
+		 * @private
+		 */
+		StandardDynamicDateOption.prototype._getXPeriodTitle = function(aOptions) {
+			var sCombinedOptions,
+				sKey = this.getKey();
+
+			if (aOptions.length === 1) {
+				return _resourceBundle.getText("DYNAMIC_DATE_" + sKey + "_TITLE");
+			}
+
+			sCombinedOptions = aOptions.map(function(sOption) {
+				return _resourceBundle.getText("DYNAMIC_DATE_" + sOption.toUpperCase());
+			}).join(" / ");
+
+			if (sKey.indexOf("LAST") === 0) {
+				return _resourceBundle.getText("DYNAMIC_DATE_LASTX_TITLE", sCombinedOptions);
+			}
+
+			if (sKey.indexOf("NEXT") === 0) {
+				return _resourceBundle.getText("DYNAMIC_DATE_NEXTX_TITLE", sCombinedOptions);
+			}
+		};
+
 		function makeRadioButton(sOptionName) {
-			return new RadioButton({ text: sOptionName });
+			return new RadioButton({ text: _resourceBundle.getText("DYNAMIC_DATE_" + sOptionName.toUpperCase()) });
 		}
 
 		return StandardDynamicDateOption;

package/src/sap/m/StandardListItem.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public
@@ -145,6 +145,17 @@ sap.ui.define([
 			 */
 			wrapCharLimit : {type : "int", group : "Behavior", defaultValue : 0}
 		},
+		aggregations : {
+			/**
+			 * A <code>sap.m.Avatar</code> control instance that, if set, is used instead of an icon or image.
+			 *
+			 * The size of the <code>Avatar</code> control depends on the <code>insetIcon</code> property of <code>StandardListItem</code>.
+			 * The <code>displaySize</code> property of the <code>Avatar</code> control is not supported. If the <code>insetIcon</code> property of <code>StandardListItem</code> is set to <code>true</code>, the size of the <code>Avatar</code> control is set to XS; if the <code>insetIcon</code> property of <code>StandardListItem</code> is set to <code>false</code>, the size of the <code>Avatar</code> control is set to "S".
+			 *
+			 * @since 1.98
+			 */
+			avatar: {type: 'sap.m.Avatar', multiple: false}
+	},
 		designtime: "sap/m/designtime/StandardListItem.designtime"
 	}});
 
@@ -169,6 +180,20 @@ sap.ui.define([
 		return this;
 	};
 
+	// overwrite setter of Avatar to control it's display size
+	StandardListItem.prototype.setAvatar = function(oAvatar) {
+		if (this.getAvatar() === oAvatar) {
+			return this;
+		}
+		if (oAvatar) {
+			oAvatar.addStyleClass("sapMSLIAvatar");
+			oAvatar.setDisplaySize = function(){return this;};
+		}
+		this.setAggregation("avatar", oAvatar);
+
+		return this;
+	};
+
 	StandardListItem.prototype.setWrapCharLimit = function(iLimit) {
 		var iOldCharLimit = this.getWrapCharLimit();
 
@@ -211,6 +236,14 @@ sap.ui.define([
 		return this._oImage;
 	};
 
+	// overwrite base method to hook into the inactive handling
+	StandardListItem.prototype._getAvatar = function() {
+		var oAvatar = this.getAvatar();
+		var sSize = this.getIconInset() ? library.AvatarSize.XS : library.AvatarSize.S;
+		oAvatar.setProperty("displaySize", sSize, true);
+		return oAvatar;
+	};
+
 	// overwrite base method to hook into the active handling
 	StandardListItem.prototype._activeHandlingInheritor = function() {
 		if (this._oImage) {