@openui5/sap.ui.unified 1.111.2 → 1.112.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.unified",
-  "version": "1.111.2",
+  "version": "1.112.2",
   "description": "OpenUI5 UI Library sap.ui.unified",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.111.2"
+    "@openui5/sap.ui.core": "1.112.2"
   }
 }

package/src/sap/ui/unified/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.111.2</version>
+  <version>1.112.2</version>
 
   <documentation>Unified controls intended for both, mobile and desktop scenarios</documentation>
 

package/src/sap/ui/unified/Calendar.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * Basic Calendar.
 	 * This calendar is used for DatePickers
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public
@@ -569,6 +569,7 @@ sap.ui.define([
 		this._updateHeader(oCalDate);
 
 		this._updateHeadersButtons();
+		this._adjustYearRangeDisplay();
 
 		this._updateLegendParent();
 		if (this.getInitialFocusedDate()) {
@@ -864,7 +865,6 @@ sap.ui.define([
 			i;
 
 		this.setProperty("primaryCalendarType", sCalendarType);
-		this._adjustYearRangeDisplay();
 
 		this._oYearFormat = DateFormat.getDateInstance({format: "y", calendarType: sCalendarType});
 
@@ -2142,15 +2142,19 @@ sap.ui.define([
 			oMonthPicker = this._getMonthPicker(),
 			iFocusedMonth = oMonthPicker.getProperty("_focusedMonth"),
 			iMonth = (iFocusedMonth || iFocusedMonth === 0) ? iFocusedMonth : oMonthPicker.getMonth(),
-			oSecondDate = oMonthPicker._iYear ?
-				new CalendarDate(oMonthPicker._iYear, iMonth - 1, 1) :
+			oSecondCalDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(), this.getPrimaryCalendarType());
+
+			oSecondCalDate = oMonthPicker._iYear ?
+				oSecondCalDate
+					.setYear(oMonthPicker._iYear)
+					.setMonth(iMonth - 1, 1) :
 				new CalendarDate(this._getFocusedDate().getYear(), iMonth - 1, 1);
 
 		if (_getMonths.call(this) > 1) {
-			if (this._bActionTriggeredFromSecondHeader && oSecondDate.getYear() >= CalendarUtils._minDate().getYear()) {
-				oFocusedDate.setYear(oSecondDate.getYear());
-				iMonth = oSecondDate.getMonth();
-			} else if (oFocusedDate.getYear() === CalendarUtils._maxDate().getYear() && iMonth === 11) {
+			if (this._bActionTriggeredFromSecondHeader && oSecondCalDate.getYear() >= CalendarUtils._minDate(this.getPrimaryCalendarType()).getYear()) {
+				oFocusedDate.setYear(oSecondCalDate.getYear());
+				iMonth = oSecondCalDate.getMonth();
+			} else if (oFocusedDate.getYear() === CalendarUtils._maxDate(this.getPrimaryCalendarType()).getYear() && iMonth === 11) {
 				iMonth -= 1;
 			}
 		}
@@ -2489,21 +2493,25 @@ sap.ui.define([
 	};
 
 	Calendar.prototype._adjustYearRangeDisplay = function() {
-		var oYearRangePicker = this.getAggregation("yearRangePicker");
+		var oYearRangePicker = this.getAggregation("yearRangePicker"),
+			sLang = sap.ui.getCore().getConfiguration().getLanguage().toLocaleLowerCase(),
+			sPrimaryCalendarType = this.getPrimaryCalendarType();
 
 		if (!this._getSucessorsPickerPopup()) {
-			switch (this.getPrimaryCalendarType()) {
-				case CalendarType.Japanese:
-					oYearRangePicker.setColumns(1);
-					oYearRangePicker.setYears(4);
-					break;
-				case CalendarType.Gregorian:
-					oYearRangePicker.setColumns(3);
-					oYearRangePicker.setYears(9);
-					break;
-				default:
-					oYearRangePicker.setColumns(2);
-					oYearRangePicker.setYears(8);
+			// An evaluation about the count of year cells that could fit in the sap.ui.unified.calendar.YearRangePicker
+			// has to be made based not only on the sap.ui.core.CalendarType, but also on the language configuration.
+			// Based on those two criteria a couple of groups with different year cells count would be indicated and we
+			// could cover those scenarios with visual tests afterwards. Currently only the scenario with korean language
+			// is covered.
+			if (sPrimaryCalendarType == CalendarType.Japanese) {
+				oYearRangePicker.setColumns(1);
+				oYearRangePicker.setYears(4);
+			} else if (sLang == "ko" || sLang == "ko-kr" || sPrimaryCalendarType != CalendarType.Gregorian) {
+				oYearRangePicker.setColumns(2);
+				oYearRangePicker.setYears(8);
+			} else if (sPrimaryCalendarType == CalendarType.Gregorian) {
+				oYearRangePicker.setColumns(3);
+				oYearRangePicker.setYears(9);
 			}
 		}
 	};

package/src/sap/ui/unified/CalendarAppointment.js

@@ -5,8 +5,30 @@
  */
 
 // Provides control sap.ui.unified.CalendarAppointment.
-sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/format/NumberFormat', 'sap/ui/core/format/TimezoneUtil', 'sap/ui/core/Core', './calendar/CalendarUtils', './library', "sap/base/Log", "sap/ui/core/Configuration"],
-	function(DateTypeRange, DateFormat, NumberFormat, TimezoneUtil, Core, CalendarUtils, library, Log, Configuration) {
+sap.ui.define([
+	'./DateTypeRange',
+	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/NumberFormat',
+	'sap/ui/core/format/TimezoneUtil',
+	'sap/ui/core/Core',
+	'./calendar/CalendarUtils',
+	'./library',
+	"sap/base/Log",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/date/UI5Date"
+],
+	function(
+		DateTypeRange,
+		DateFormat,
+		NumberFormat,
+		TimezoneUtil,
+		Core,
+		CalendarUtils,
+		library,
+		Log,
+		Configuration,
+		UI5Date
+		) {
 	"use strict";
 
 	/**
@@ -21,7 +43,7 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 *
 	 * Applications could inherit from this element to add own fields.
 	 * @extends sap.ui.unified.DateTypeRange
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public
@@ -124,12 +146,12 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 * @private
 	 */
 	CalendarAppointment.prototype._getDateRangeIntersectionText = function (oCurrentlyDisplayedDate) {
-		var oStartDate = this._getStartDateWithTimezoneAdaptation(),
-			oEndDate = this._getEndDateWithTimezoneAdaptation() ? this._getEndDateWithTimezoneAdaptation() : new Date(864000000000000), //in case of emergency call this number
+		var oStartDate = this.getStartDate(),
+			oEndDate = this.getEndDate() ? this.getEndDate() : UI5Date.getInstance(864000000000000), //in case of emergency call this number
 			sFirstLineText,
 			sSecondLineText,
-			oCurrentDayStart = new Date(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
-			oNextDayStart = new Date(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
+			oCurrentDayStart = UI5Date.getInstance(oCurrentlyDisplayedDate.getFullYear(), oCurrentlyDisplayedDate.getMonth(), oCurrentlyDisplayedDate.getDate(), 0, 0, 0),
+			oNextDayStart = UI5Date.getInstance(oCurrentDayStart.getFullYear(), oCurrentDayStart.getMonth(), oCurrentDayStart.getDate() + 1),
 			oTimeFormat = DateFormat.getTimeInstance({pattern: "HH:mm"}),
 			oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
 			oHourFormat = NumberFormat.getUnitInstance({
@@ -180,14 +202,14 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 	 */
 	CalendarAppointment._getComparer = function(oDate) {
 		var ONE_DAY = 24 * 60 * 60 * 1000,
-			iCurrentDayStartTime = new Date(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), 0, 0, 0).getTime(),
+			iCurrentDayStartTime = UI5Date.getInstance(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), 0, 0, 0).getTime(),
 			iNextDayStart = iCurrentDayStartTime + ONE_DAY;
 
 		return function(oAppInfo1, oAppInfo2) {
-			var iStartDateTime1 = oAppInfo1.appointment._getStartDateWithTimezoneAdaptation().getTime(),
-				iStartDateTime2 = oAppInfo2.appointment._getStartDateWithTimezoneAdaptation().getTime(),
-				iEndDateTime1 = oAppInfo1.appointment._getEndDateWithTimezoneAdaptation() ? oAppInfo1.appointment._getEndDateWithTimezoneAdaptation().getTime() : 864000000000000, //this is max date in case of no max date
-				iEndDateTime2 = oAppInfo2.appointment._getEndDateWithTimezoneAdaptation() ? oAppInfo2.appointment._getEndDateWithTimezoneAdaptation().getTime() : 864000000000000,
+			var iStartDateTime1 = oAppInfo1.appointment.getStartDate().getTime(),
+				iStartDateTime2 = oAppInfo2.appointment.getStartDate().getTime(),
+				iEndDateTime1 = oAppInfo1.appointment.getEndDate() ? oAppInfo1.appointment.getEndDate().getTime() : 864000000000000, //this is max date in case of no max date
+				iEndDateTime2 = oAppInfo2.appointment.getEndDate() ? oAppInfo2.appointment.getEndDate().getTime() : 864000000000000,
 				bWholeDay1 = iStartDateTime1 <= iCurrentDayStartTime && iEndDateTime1 >= iNextDayStart,
 				bWholeDay2 = iStartDateTime2 <= iCurrentDayStartTime && iEndDateTime2 >= iNextDayStart,
 				iResult;
@@ -252,42 +274,6 @@ sap.ui.define(['./DateTypeRange', 'sap/ui/core/format/DateFormat', 'sap/ui/core/
 		return oAppointmentParts.length > 0 ? oAppointmentParts[0] : null;
 	};
 
-	CalendarAppointment.prototype._getEndDateWithTimezoneAdaptation = function() {
-		if (!this.getProperty("endDate")) {
-			return null;
-		}
-
-		var oEndDate = this._convertToTimezone(this.getEndDate());
-
-		return oEndDate;
-	};
-
-	CalendarAppointment.prototype._getStartDateWithTimezoneAdaptation = function() {
-		if (!this.getProperty("startDate")) {
-			return null;
-		}
-
-		var oStartDate = this._convertToTimezone(this.getStartDate());
-
-		return oStartDate;
-	};
-
-	/**
-	 * Aligns a date to the timezone from the configuration.
-	 *
-	 * @returns {Object} <code>oNewDate</code> aligned to the configured timezone.
-	 * @private
-	 */
-	CalendarAppointment.prototype._convertToTimezone = function(oDate) {
-		var sConfigTimezone = Core.getConfiguration().getTimezone();
-		var sLocalTimezone = TimezoneUtil.getLocalTimezone();
-
-		var iConfigOffsetMillis = TimezoneUtil.calculateOffset(oDate, sConfigTimezone) * 1000;
-		var iLocalOffsetMillis = TimezoneUtil.calculateOffset(oDate, sLocalTimezone) * 1000;
-
-		return new Date(oDate.getTime() - iConfigOffsetMillis + iLocalOffsetMillis);
-	};
-
 	return CalendarAppointment;
 
 });

package/src/sap/ui/unified/CalendarDateInterval.js

@@ -21,7 +21,9 @@ sap.ui.define([
 	"sap/ui/core/CalendarType",
 	"sap/ui/core/Core",
 	"sap/base/Log",
-	"./DateRange"
+	"./DateRange",
+	"sap/ui/core/date/UI5Date"
+
 ], function(
 	CalendarUtils,
 	Calendar,
@@ -38,7 +40,8 @@ sap.ui.define([
 	CalendarType,
 	Core,
 	Log,
-	DateRange
+	DateRange,
+    UI5Date
 ) {
 	"use strict";
 
@@ -56,7 +59,7 @@ sap.ui.define([
 	 * @class
 	 * <code>CalendarDateInterval</code> only visualizes the dates in a one-line interval and allows the selection of a single day.
 	 * @extends sap.ui.unified.Calendar
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public
@@ -321,7 +324,7 @@ sap.ui.define([
 			sAriaLabel = oTexts.sAriaLabel,
 			oHeader = this.getAggregation("header");
 		var oLocaleData = this._getLocaleData();
-		var oEndDate = CalendarDate.fromLocalJSDate(new Date(oDate.toLocalJSDate().getTime() + (this._getDays() - 1) * 24 * 60 * 60 * 1000), this.getPrimaryCalendarType());
+		var oEndDate = CalendarDate.fromLocalJSDate(UI5Date.getInstance(oDate.toLocalJSDate().getTime() + (this._getDays() - 1) * 24 * 60 * 60 * 1000), this.getPrimaryCalendarType());
 		oEndDate.setDate(1); // always use the first of the month to have stable year in Japanese calendar
 		var sDelimiter = oLocaleData.getIntervalPattern().replace("{0}", "").replace("{1}", "");
 		var sEndYear = this._oYearFormat.format(oEndDate.toUTCJSDate(), true);
@@ -352,7 +355,7 @@ sap.ui.define([
 		var oStartDate = this.getStartDate(),
 			oCalPicker = this._getCalendar(),
 			oSelectedRange = new DateRange(),
-			oEndDate = new Date(oStartDate.getTime());
+			oEndDate = UI5Date.getInstance(oStartDate.getTime());
 
 		oEndDate.setDate(oEndDate.getDate() + this._getDays() - 1);
 		oSelectedRange.setStartDate(oStartDate);
@@ -432,13 +435,13 @@ sap.ui.define([
 		var oMinDate = this.getMinDate();
 		if (oMinDate && oStartDate.getTime() < oMinDate.getTime()) {
 			Log.warning("startDate < minDate -> minDate as startDate set", this);
-			oStartDate = new Date(oMinDate.getTime());
+			oStartDate = UI5Date.getInstance(oMinDate.getTime());
 		}
 
 		var oMaxDate = this.getMaxDate();
 		if (oMaxDate && oStartDate.getTime() > oMaxDate.getTime()) {
 			Log.warning("startDate > maxDate -> maxDate as startDate set", this);
-			oStartDate = new Date(oMaxDate.getTime());
+			oStartDate = UI5Date.getInstance(oMaxDate.getTime());
 		}
 
 		this.setProperty("startDate", oStartDate, true);

package/src/sap/ui/unified/CalendarLegend.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarLegendItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['sap/ui/core/Element', './library'],
 	 * @class
 	 * Item to be displayed in a CalendarLegend.
 	 * @extends sap.ui.core.Element
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarMonthInterval.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * <b>Note:</b> JavaScript Date objects are used to set and return the months, mark them as selected or as a special type.
 	 * But the date part of the Date object is not used. If a Date object is returned the date will be set to the 1st of the corresponding month.
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/unified/CalendarOneMonthInterval.js

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * Navigation via year picker switches to the corresponding year and the same month as before the navigation.
 		 *
 		 * @extends sap.ui.unified.CalendarDateInterval
-		 * @version 1.111.2
+		 * @version 1.112.2
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/unified/CalendarRow.js

@@ -24,7 +24,8 @@ sap.ui.define([
 	"sap/ui/unified/CalendarAppointment",
 	'sap/ui/core/InvisibleMessage',
 	'sap/ui/core/library',
-	'sap/ui/core/Configuration'
+	'sap/ui/core/Configuration',
+	"sap/ui/core/date/UI5Date"
 ], function(
 	Control,
 	Device,
@@ -44,7 +45,8 @@ sap.ui.define([
 	CalendarAppointment,
 	InvisibleMessage,
 	corelibrary,
-	Configuration
+	Configuration,
+	UI5Date
 ) {
 	"use strict";
 
@@ -86,7 +88,7 @@ sap.ui.define([
 	 * @class
 	 * A calendar row with a header and appointments. The Appointments will be placed in the defined interval.
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @public
@@ -369,7 +371,7 @@ sap.ui.define([
 		this._aVisibleAppointments = [];
 		this._aVisibleIntervalHeaders = [];
 
-		this.setStartDate(new Date());
+		this.setStartDate(UI5Date.getInstance());
 
 		this._resizeProxy = jQuery.proxy(this.handleResize, this);
 
@@ -472,7 +474,7 @@ sap.ui.define([
 
 		if (!oStartDate) {
 			//set default value
-			oStartDate = new Date();
+			oStartDate = UI5Date.getInstance();
 		}
 
 		CalendarUtils._checkJSDateObject(oStartDate);
@@ -615,19 +617,19 @@ sap.ui.define([
 	CalendarRow.prototype.onsapselect = function(oEvent){
 		// focused appointment must be selected
 		var aVisibleAppointments = this._getVisibleAppointments(),
-			sBundleKey;
+			oAppointment, sBundleKey;
 
 
 		for (var i = 0; i < aVisibleAppointments.length; i++) {
-			var oAppointment = aVisibleAppointments[i].appointment;
+			oAppointment = aVisibleAppointments[i].appointment;
 			if (containsOrEquals(oAppointment.getDomRef(), oEvent.target)) {
 				var bRemoveOldSelection = !(this.getMultipleAppointmentsSelection() || oEvent.ctrlKey || oEvent.metaKey);
 				_selectAppointment.call(this, oAppointment, bRemoveOldSelection);
-				sBundleKey = oAppointment.getSelected() ? "APPOINTMENT_SELECTED" : "APPOINTMENT_UNSELECTED";
 				break;
 			}
 		}
 
+		sBundleKey = oAppointment.getSelected() ? "APPOINTMENT_SELECTED" : "APPOINTMENT_UNSELECTED";
 		this._oInvisibleMessage.announce(this._oRb.getText(sBundleKey), InvisibleMessageMode.Polite);
 
 		//To prevent bubbling into PlanningCalendar.
@@ -711,9 +713,8 @@ sap.ui.define([
 	 * @public
 	 */
 	CalendarRow.prototype.updateCurrentTimeVisualization = function() {
-
 		var $Now = this.$("Now");
-		var oNowDate = CalendarUtils._createUniversalUTCDate(new Date(), undefined, true);
+		var oNowDate = CalendarUtils._createUniversalUTCDate(UI5Date.getInstance(), undefined, true);
 		var iIntervals = this.getIntervals();
 		var sIntervalType = this.getIntervalType();
 		var oStartDate = this._getStartDate();
@@ -723,8 +724,6 @@ sap.ui.define([
 
 		this._sUpdateCurrentTime = undefined;
 
-		oNowDate = this._convertToTimezone(oNowDate);
-
 		if (oNowDate.getTime() <= iEndTime && oNowDate.getTime() >= iStartTime) {
 			var iBegin = _calculateBegin.call(this, sIntervalType, iIntervals, oStartDate, oEndDate, iStartTime, oNowDate);
 			var iTime = 0;
@@ -766,23 +765,6 @@ sap.ui.define([
 
 	};
 
-	/**
-	 * Aligns a date to the timezone from the configuration.
-	 *
-	 * @returns {Object} <code>oNewDate</code> aligned to the configured timezone.
-	 * @private
-	 */
-	CalendarRow.prototype._convertToTimezone = function(oDate) {
-		var sTimezone = Core.getConfiguration().getTimezone();
-		var oNewDate = CalendarUtils._createUniversalUTCDate(oDate, undefined, true);
-
-		oNewDate = new Date(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(), oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds());
-		oNewDate.setUTCFullYear(oDate.getUTCFullYear());
-		oNewDate = TimezoneUtil.convertToTimezone(oNewDate, sTimezone);
-
-		return oNewDate;
-	};
-
 	/**
 	 * Returns the focused <code>CalendarAppointment</code> of the <code>CalendarRow</code>.
 	 *
@@ -862,7 +844,7 @@ sap.ui.define([
 
 		for (var i = 0; i < aAppointments.length; i++) {
 			oNextAppointment = aAppointments[i];
-			if (oNextAppointment._getStartDateWithTimezoneAdaptation() > oDate) {
+			if (oNextAppointment.getStartDate() > oDate) {
 				if (i > 0) {
 					oPrevAppointment = aAppointments[i - 1];
 				} else {
@@ -873,7 +855,7 @@ sap.ui.define([
 		}
 
 		if (oNextAppointment) {
-			if (oPrevAppointment && Math.abs(oNextAppointment._getStartDateWithTimezoneAdaptation() - oDate) >= Math.abs(oPrevAppointment._getStartDateWithTimezoneAdaptation() - oDate)) {
+			if (oPrevAppointment && Math.abs(oNextAppointment.getStartDate() - oDate) >= Math.abs(oPrevAppointment.getStartDate() - oDate)) {
 				oAppointment = oPrevAppointment;
 			} else {
 				oAppointment = oNextAppointment;
@@ -972,8 +954,8 @@ sap.ui.define([
 			};
 		}
 
-		var oAppStartDate = oAppointment._getStartDateWithTimezoneAdaptation(),
-			oAppEndDate = oAppointment._getEndDateWithTimezoneAdaptation(),
+		var oAppStartDate = oAppointment.getStartDate(),
+			oAppEndDate = oAppointment.getEndDate(),
 			oUniversalAppStartDate = new UniversalDate(oAppStartDate.getFullYear(), oAppStartDate.getMonth(), oAppStartDate.getDate(), oAppStartDate.getHours(), oAppStartDate.getMinutes()),
 			oUniversalAppEndDate = new UniversalDate(oAppEndDate.getFullYear(), oAppEndDate.getMonth(), oAppEndDate.getDate(), oAppEndDate.getHours(), oAppEndDate.getMinutes()),
 			sIntervalType = this.getIntervalType(),
@@ -1182,13 +1164,13 @@ sap.ui.define([
 
 		for (i = 0; i < aAppointments.length; i++) {
 			oAppointment = aAppointments[i];
-			var oAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oAppointment._getStartDateWithTimezoneAdaptation(), undefined, true);
+			var oAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oAppointment.getStartDate(), undefined, true);
 			var oAppointmentStartDateTime = oAppointmentStartDate.getTime();
 			oAppointmentStartDate.setUTCSeconds(0); // ignore seconds
 			oAppointmentStartDate.setUTCMilliseconds(0); // ignore milliseconds
-			var oAppointmentEndDate = oAppointment._getEndDateWithTimezoneAdaptation()
-				? CalendarUtils._createUniversalUTCDate(oAppointment._getEndDateWithTimezoneAdaptation(), undefined, true)
-				: CalendarUtils._createUniversalUTCDate(new Date(864000000000000), undefined, true); //max date
+			var oAppointmentEndDate = oAppointment.getEndDate()
+				? CalendarUtils._createUniversalUTCDate(oAppointment.getEndDate(), undefined, true)
+				: CalendarUtils._createUniversalUTCDate(UI5Date.getInstance(864000000000000), undefined, true); //max date
 			var oAppointmentEndDateTime = oAppointmentEndDate.getTime();
 			oAppointmentEndDate.setUTCSeconds(0); // ignore seconds
 			oAppointmentEndDate.setUTCMilliseconds(0); // ignore milliseconds
@@ -1226,7 +1208,7 @@ sap.ui.define([
 					// in month mode, group appointment < one week
 
 					oGroupAppointment = _getGroupAppointment.call(this, oAppointmentStartDate, oAppointment, sIntervalType, iIntervals, oStartDate, oEndDate, iStartTime, aVisibleAppointments);
-					var oGroupEndDate = CalendarUtils._createUniversalUTCDate(oGroupAppointment._getEndDateWithTimezoneAdaptation(), undefined, true);
+					var oGroupEndDate = CalendarUtils._createUniversalUTCDate(oGroupAppointment.getEndDate(), undefined, true);
 
 					if (oAppointmentEndDate.getTime() > oGroupEndDate.getTime()) {
 						// appointment ends in next group
@@ -1355,7 +1337,7 @@ sap.ui.define([
 
 		for (var j = 0; j < aGroupAppointments.length; j++) {
 			oGroupAppointment = aGroupAppointments[j];
-			var oGroupAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oGroupAppointment._getStartDateWithTimezoneAdaptation(), undefined, true);
+			var oGroupAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oGroupAppointment.getStartDate(), undefined, true);
 			if (oGroupAppointmentStartDate.getTime() == oGroupStartDate.getTime()) {
 				break;
 			}
@@ -1368,8 +1350,8 @@ sap.ui.define([
 			oGroupEndDate.setMilliseconds(-1);
 			oGroupAppointment = new CalendarAppointment(this.getId() + "-Group" + aGroupAppointments.length, {
 				type: oAppointment.getType(),
-				startDate: CalendarUtils._createLocalDate(new Date(oGroupStartDate.getTime()), true),
-				endDate: CalendarUtils._createLocalDate(new Date(oGroupEndDate.getTime()), true)
+				startDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oGroupStartDate.getTime()), true),
+				endDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oGroupEndDate.getTime()), true)
 			});
 			oGroupAppointment._aAppointments = [];
 			this.addAggregation("groupAppointments", oGroupAppointment, true);
@@ -1479,12 +1461,12 @@ sap.ui.define([
 
 			for (i = 0; i < aAppointments.length; i++) {
 				oAppointment = aAppointments[i];
-				var oAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oAppointment._getStartDateWithTimezoneAdaptation(), undefined, true);
+				var oAppointmentStartDate = CalendarUtils._createUniversalUTCDate(oAppointment.getStartDate(), undefined, true);
 				oAppointmentStartDate.setUTCSeconds(0); // ignore seconds
 				oAppointmentStartDate.setUTCMilliseconds(0); // ignore milliseconds
-				var oAppointmentEndDate = oAppointment._getEndDateWithTimezoneAdaptation()
-					? CalendarUtils._createUniversalUTCDate(oAppointment._getEndDateWithTimezoneAdaptation(), undefined, true)
-					: CalendarUtils._createUniversalUTCDate(new Date(864000000000000), undefined, true); //max date;
+				var oAppointmentEndDate = oAppointment.getEndDate()
+					? CalendarUtils._createUniversalUTCDate(oAppointment.getEndDate(), undefined, true)
+					: CalendarUtils._createUniversalUTCDate(UI5Date.getInstance(864000000000000), undefined, true); //max date;
 				oAppointmentEndDate.setUTCSeconds(0); // ignore seconds
 				oAppointmentEndDate.setUTCMilliseconds(0); // ignore milliseconds
 
@@ -1701,6 +1683,7 @@ sap.ui.define([
 		var sAriaLabelNotSelected;
 		var sAriaLabelSelected;
 		var sSelectedTextId = InvisibleText.getStaticId("sap.ui.unified", "APPOINTMENT_SELECTED");
+		var sUnselectedTextId = InvisibleText.getStaticId("sap.ui.unified", "APPOINTMENT_UNSELECTED");
 		var bSelect = !oAppointment.getSelected();
 
 		if (bRemoveOldSelection) {
@@ -1720,14 +1703,14 @@ sap.ui.define([
 						}
 					}
 					sAriaLabel = oApp.$().attr("aria-labelledby");
-					sAriaLabelNotSelected = sAriaLabel ? sAriaLabel.replace(sSelectedTextId, "") : "";
+					sAriaLabelNotSelected = sAriaLabel ? sAriaLabel.replace(sSelectedTextId, sUnselectedTextId) : "";
 					oApp.$().attr("aria-labelledby", sAriaLabelNotSelected);
 				}
 			}
 		}
 
-		sAriaLabelSelected = oAppointment.$().attr("aria-labelledby") + " " + sSelectedTextId;
-		sAriaLabelNotSelected = oAppointment.$().attr("aria-labelledby").replace(sSelectedTextId, "").trim();
+		sAriaLabelSelected = oAppointment.$().attr("aria-labelledby").replace(sUnselectedTextId, sSelectedTextId).trim();
+		sAriaLabelNotSelected = oAppointment.$().attr("aria-labelledby").replace(sSelectedTextId, sUnselectedTextId).trim();
 
 		if (oAppointment.getSelected()) {
 			oAppointment.setProperty("selected", false, true); // do not invalidate CalendarRow
@@ -1748,8 +1731,6 @@ sap.ui.define([
 			for (i = 0; i < oAppointment._aAppointments.length; i++) {
 				oApp = oAppointment._aAppointments[i];
 				oApp.setProperty("selected", bSelect, true); // do not invalidate CalendarRow
-				sAriaLabelSelected = oApp.$().attr("aria-labelledby") + " " + sSelectedTextId;
-				oApp.$().attr("aria-labelledby", sAriaLabelSelected);
 			}
 			this.fireSelect({
 				appointments: oAppointment._aAppointments,
@@ -1809,13 +1790,13 @@ sap.ui.define([
 		var iNewStartHour,
 			iNewEndHour;
 
-			iNewStartHour = oAppointment._getStartDateWithTimezoneAdaptation().getHours() - oAppointment._getStartDateWithTimezoneAdaptation().getHours() % iRound;
+			iNewStartHour = oAppointment.getStartDate().getHours() - oAppointment.getStartDate().getHours() % iRound;
 			oAppointmentStartDate.setUTCHours(iNewStartHour);
 			oAppointmentStartDate.setUTCMinutes(0);
 			oAppointmentStartDate.setUTCSeconds(0);
 			oAppointmentStartDate.setUTCMilliseconds(0);
 
-			iNewEndHour = oAppointment._getEndDateWithTimezoneAdaptation().getHours() - oAppointment._getEndDateWithTimezoneAdaptation().getHours() % iRound + iRound;
+			iNewEndHour = oAppointment.getEndDate().getHours() - oAppointment.getEndDate().getHours() % iRound + iRound;
 			oAppointmentEndDate.setUTCHours(iNewEndHour);
 			oAppointmentEndDate.setUTCMinutes(0);
 			oAppointmentEndDate.setUTCSeconds(0);
@@ -1976,7 +1957,7 @@ sap.ui.define([
 
 				if (oAppointment) {
 					this._sFocusedAppointmentId = oAppointment.getId();
-					var oUTCStartDate = _calculateStartDate.call(this, oAppointment._getStartDateWithTimezoneAdaptation());
+					var oUTCStartDate = _calculateStartDate.call(this, oAppointment.getStartDate());
 					this.setStartDate(CalendarUtils._createLocalDate(oUTCStartDate, true));
 					if (!containsOrEquals(this.getDomRef(), document.activeElement)) {
 						// focus is outside control -> set focus after rerendering
@@ -2086,13 +2067,13 @@ sap.ui.define([
 		var oLocalStartDate = CalendarUtils._createLocalDate(oStartDate, true);
 		var oLocalEndDate = CalendarUtils._createLocalDate(oEndDate, true);
 		for (var i = 0; i < aAppointments.length; i++) {
-			if (aAppointments[i]._getStartDateWithTimezoneAdaptation() >= oLocalStartDate && aAppointments[i]._getStartDateWithTimezoneAdaptation() <= oLocalEndDate) {
+			if (aAppointments[i].getStartDate() >= oLocalStartDate && aAppointments[i].getStartDate() <= oLocalEndDate) {
 				oAppointment = aAppointments[i];
 				sId = oAppointment.getId();
 				if (oEvent.type == "saphome") {
 					break;
 				}
-			} else if (aAppointments[i]._getStartDateWithTimezoneAdaptation() > oLocalEndDate) {
+			} else if (aAppointments[i].getStartDate() > oLocalEndDate) {
 				break;
 			}
 		}
@@ -2193,10 +2174,10 @@ sap.ui.define([
 	}
 
 	function _fnDefaultAppointmentsSorter(oApp1, oApp2) {
-		var iResult = oApp1._getStartDateWithTimezoneAdaptation() - oApp2._getStartDateWithTimezoneAdaptation();
+		var iResult = oApp1.getStartDate() - oApp2.getStartDate();
 		if (iResult == 0) {
 			// same start date -> longest appointment should be on top
-			iResult = oApp2._getEndDateWithTimezoneAdaptation() - oApp1._getEndDateWithTimezoneAdaptation();
+			iResult = oApp2.getEndDate() - oApp1.getEndDate();
 		}
 		return iResult;
 	}