@openui5/sap.m 1.111.6 → 1.112.1

package/src/sap/m/PlanningCalendar.js

@@ -35,6 +35,7 @@ sap.ui.define([
 	'sap/ui/core/date/CalendarWeekNumbering',
 	'sap/ui/core/date/CalendarUtils',
 	'sap/ui/core/Locale',
+	"sap/ui/core/date/UI5Date",
 	'sap/m/Toolbar',
 	'sap/m/Table',
 	'sap/m/Column',
@@ -81,6 +82,7 @@ sap.ui.define([
 	CalendarWeekNumbering,
 	CalendarDateUtils,
 	Locale,
+	UI5Date,
 	Toolbar,
 	Table,
 	Column,
@@ -193,7 +195,7 @@ sap.ui.define([
 	 * {@link sap.m.PlanningCalendarView PlanningCalendarView}'s properties.
 	 *
 	 * @extends sap.ui.core.Control
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @constructor
 	 * @public
@@ -793,7 +795,7 @@ sap.ui.define([
 		oTable.getStickyFocusOffset = getStickyFocusOffset.bind(this);
 		this.setAggregation("table", oTable, true);
 
-		this.setStartDate(new Date());
+		this.setStartDate(UI5Date.getInstance());
 
 		this._resizeProxy = handleResize.bind(this);
 		this._fnCustomSortedAppointments = undefined; //transfers a custom appointments sorter function to the CalendarRow
@@ -871,7 +873,7 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._updateHeader = function () {
-		this._getHeader().setProperty("_primaryCalendarType", this._getPrimaryCalendarType());
+		this._getHeader().setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
 		if (this._getSecondaryCalendarType()) {
 			this.setShowDayNamesLine(true);
 			this._getHeader().setProperty("_secondaryCalendarType", this.getSecondaryCalendarType());
@@ -960,9 +962,9 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype._applyArrowsLogic = function(bBackwards) {
 		if (bBackwards) {
-			this._dateNav.previous(this._getPrimaryCalendarType());
+			this._dateNav.previous(this.getPrimaryCalendarType());
 		} else {
-			this._dateNav.next(this._getPrimaryCalendarType());
+			this._dateNav.next(this.getPrimaryCalendarType());
 		}
 
 		if (this.getMinDate() && this._dateNav.getStart().getTime() <= this.getMinDate().getTime()) {
@@ -1013,7 +1015,7 @@ sap.ui.define([
 
 		switch (sViewType) {
 			case CalendarIntervalType.Hour:
-				oDateFormat = DateFormat.getDateInstance({format: "yMMMMd", calendarType: this._getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "yMMMMd", calendarType: this.getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 				if (oStartDate.getDate() !== oEndDate.getDate()) {
 					sEndResult = oDateFormat.format(oEndDate);
@@ -1039,7 +1041,7 @@ sap.ui.define([
 					var iEndingParameter = this._getRelativeInfo().iIntervalSize === 1 ? iBeginning + iEnding : iBeginning + iEnding - 1;
 					sEndResult = fnIntervalLabelFormatter ? fnIntervalLabelFormatter(iEndingParameter) : iBeginning + iEnding;
 				} else {
-					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this._getPrimaryCalendarType() });
+					oDateFormat = DateFormat.getDateInstance({ format: "yMMMMd", calendarType: this.getPrimaryCalendarType() });
 					sBeginningResult = oDateFormat.format(oStartDate);
 					sEndResult = oDateFormat.format(oEndDate);
 					if (this._getSecondaryCalendarType()) {
@@ -1053,7 +1055,7 @@ sap.ui.define([
 
 			case CalendarIntervalType.OneMonth:
 			case "OneMonth":
-				oDateFormat = DateFormat.getDateInstance({format: "yMMMM", calendarType: this._getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 				if (this._getSecondaryCalendarType()) {
 					oDateFormatInSecType = DateFormat.getDateInstance({format: "yMMMM", calendarType: this.getSecondaryCalendarType()});
@@ -1062,7 +1064,7 @@ sap.ui.define([
 				break;
 
 			case CalendarIntervalType.Month:
-				oDateFormat = DateFormat.getDateInstance({format: "y", calendarType: this._getPrimaryCalendarType()});
+				oDateFormat = DateFormat.getDateInstance({format: "y", calendarType: this.getPrimaryCalendarType()});
 				sBeginningResult = oDateFormat.format(oStartDate);
 
 				if (this._getSecondaryCalendarType()) {
@@ -1112,10 +1114,6 @@ sap.ui.define([
 		return { primaryType: sResult, secondaryType: sResultInSecType };
 	};
 
-    PlanningCalendar.prototype._getPrimaryCalendarType = function(){
-		return this.getProperty("primaryCalendarType") || Configuration.getCalendarType();
-	};
-
 	/**
 	 * Calculates the first and the last date of the range to be displayed. The size of the range depends on the
 	 * currently selected view.
@@ -1123,8 +1121,8 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._getFirstAndLastRangeDate = function () {
-		var oUniStartDate = CalendarUtils._createUniversalUTCDate(this.getStartDate(), this._getPrimaryCalendarType(), true),
-			oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this._getPrimaryCalendarType(), true);
+		var oUniStartDate = CalendarUtils._createUniversalUTCDate(this.getStartDate(), this.getPrimaryCalendarType(), true),
+			oUniEndDate = CalendarUtils._createUniversalUTCDate(this._dateNav.getEnd(), this.getPrimaryCalendarType(), true);
 
 		return {
 			oStartDate: oUniStartDate,
@@ -1189,7 +1187,7 @@ sap.ui.define([
 	 * @public
 	 */
 	PlanningCalendar.prototype.getEndDate = function () {
-		return this._dateNav.getEnd(this._getPrimaryCalendarType());
+		return this._dateNav.getEnd(this.getPrimaryCalendarType());
 	};
 
 	/**
@@ -1202,7 +1200,7 @@ sap.ui.define([
 		if ((sViewKey === CalendarIntervalType.OneMonth || sViewKey === "OneMonth") && this._iSize < 2) {
 			var oFirstVisibleDate = CalendarUtils.getFirstDateOfWeek(this.getStartDate()),
 				oFirstDateInLastWeek = CalendarUtils.getFirstDateOfWeek(this._dateNav.getEnd()),
-				oLastVisibleDate = new Date(oFirstDateInLastWeek.getTime());
+				oLastVisibleDate = UI5Date.getInstance(oFirstDateInLastWeek.getTime());
 
 			oLastVisibleDate.setDate(oLastVisibleDate.getDate() + 6);
 
@@ -1234,7 +1232,7 @@ sap.ui.define([
 			return;
 		}
 
-		this._oTodayButton.setEnabled(!this._dateMatchesVisibleRange(new Date(), this.getViewKey()));
+		this._oTodayButton.setEnabled(!this._dateMatchesVisibleRange(UI5Date.getInstance(), this.getViewKey()));
 	};
 
 	/**
@@ -1419,10 +1417,10 @@ sap.ui.define([
 
 		if (!oDate) {
 			//set default value
-			oStartDate = new Date();
+			oStartDate = UI5Date.getInstance();
 		} else {
 			CalendarUtils._checkJSDateObject(oDate);
-			oStartDate = new Date(oDate.getTime());
+			oStartDate = UI5Date.getInstance(oDate.getTime());
 		}
 
 		oStartDate = this._shiftStartDate(oStartDate);
@@ -1442,15 +1440,15 @@ sap.ui.define([
 		var oMinDate = this.getMinDate();
 		if (oMinDate && oMinDate.getTime() > oStartDate.getTime()) {
 			Log.warning("StartDate < minDate -> StartDate set to minDate", this);
-			oStartDate = new Date(oMinDate.getTime());
+			oStartDate = UI5Date.getInstance(oMinDate.getTime());
 		} else {
 			var oMaxDate = this.getMaxDate();
 			if (oMaxDate && oMaxDate.getTime() < oStartDate.getTime()) {
 				Log.warning("StartDate > maxDate -> StartDate set to minDate", this);
 				if (oMinDate) {
-					oStartDate = new Date(oMinDate.getTime());
+					oStartDate = UI5Date.getInstance(oMinDate.getTime());
 				} else {
-					oStartDate = new Date(1, 0, 1);
+					oStartDate = UI5Date.getInstance(1, 0, 1);
 					oStartDate.setFullYear(1);
 				}
 			}
@@ -1463,7 +1461,7 @@ sap.ui.define([
 
 		INTERVAL_CTR_REFERENCES.forEach(function (sControlRef) {
 			if (this[sControlRef]) {
-				this[sControlRef].setStartDate(new Date(oStartDate.getTime())); // use new date object
+				this[sControlRef].setStartDate(UI5Date.getInstance(oStartDate.getTime())); // use new date object
 			}
 		}, this);
 
@@ -1472,7 +1470,7 @@ sap.ui.define([
 		if ((this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") && this._oOneMonthsRow.getMode() < 2 && this._oOneMonthsRow.getSelectedDates().length) {
 			this._setRowsStartDate(this._oOneMonthsRow.getSelectedDates()[0].getStartDate());
 		} else {
-			this._setRowsStartDate(new Date(oStartDate.getTime()));
+			this._setRowsStartDate(UI5Date.getInstance(oStartDate.getTime()));
 		}
 
 		if (this.getViewKey() === PlanningCalendarBuiltInView.Week || this.getViewKey() === PlanningCalendarBuiltInView.OneMonth || this.getViewKey() === "OneMonth") {
@@ -1523,10 +1521,14 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._getSecondaryCalendarType = function() {
-		var sSecondaryCalendarType = this.getSecondaryCalendarType();
+		var sSecondaryCalendarType;
+
+		if (this._bSecondaryCalendarTypeSet) {
+			sSecondaryCalendarType = this.getSecondaryCalendarType();
 
-		if (sSecondaryCalendarType === this._getPrimaryCalendarType()) {
-			return undefined;
+			if (sSecondaryCalendarType === this.getPrimaryCalendarType()) {
+				sSecondaryCalendarType = undefined;
+			}
 		}
 
 		return sSecondaryCalendarType;
@@ -1540,7 +1542,7 @@ sap.ui.define([
 	 */
 	PlanningCalendar.prototype.setSecondaryCalendarType = function (sSecondaryCalendarType) {
 		this.setProperty("secondaryCalendarType", sSecondaryCalendarType);
-
+		this._bSecondaryCalendarTypeSet = true;
 		if (this._getHeader()) {
 			this._getHeader().setProperty("_secondaryCalendarType", sSecondaryCalendarType);
 		}
@@ -1581,13 +1583,13 @@ sap.ui.define([
 			this.setProperty("minDate", oDate, true);
 			this._bNoStartDateChange = true; // set the start date after all calendars are updated
 
-			oHeader.getAggregation("_calendarPicker").setMinDate(new Date(oDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMinDate(new Date(oDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMinDate(new Date(oDate.getTime()));
+			oHeader.getAggregation("_calendarPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_monthPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_yearPicker").setMinDate(UI5Date.getInstance(oDate.getTime()));
 
 			if (oMaxDate && oMaxDate.getTime() < oDate.getTime()) {
 				Log.warning("minDate > maxDate -> maxDate set to end of the month", this);
-				oMaxDate = new Date(oDate.getTime());
+				oMaxDate = UI5Date.getInstance(oDate.getTime());
 				oMaxDate.setMonth(oMaxDate.getMonth() + 1, 0);
 				oMaxDate.setHours(23);
 				oMaxDate.setMinutes(59);
@@ -1600,7 +1602,7 @@ sap.ui.define([
 			var oStartDate = this.getStartDate();
 			if (oStartDate && oStartDate.getTime() < oDate.getTime()) {
 				Log.warning("StartDate < minDate -> StartDate set to minDate", this);
-				oStartDate = new Date(oDate.getTime());
+				oStartDate = UI5Date.getInstance(oDate.getTime());
 				this.setStartDate(oStartDate);
 				oHeader.updatePickerText(this._formatPickerText());
 			}
@@ -1611,7 +1613,7 @@ sap.ui.define([
 			oHeader.getAggregation("_yearPicker").setMinDate();
 		}
 
-		var oToday = new Date();
+		var oToday = UI5Date.getInstance();
 		if (oDate && oToday.getTime() < oDate.getTime()) {
 			this._oTodayButton.setVisible(false);
 		} else if (!oMaxDate || oToday.getTime() < oMaxDate.getTime()) {
@@ -1640,13 +1642,13 @@ sap.ui.define([
 			this.setProperty("maxDate", oDate, true);
 			this._bNoStartDateChange = true; // set the start date after all calendars are updated
 
-			oHeader.getAggregation("_calendarPicker").setMaxDate(new Date(oDate.getTime()));
-			oHeader.getAggregation("_monthPicker").setMaxDate(new Date(oDate.getTime()));
-			oHeader.getAggregation("_yearPicker").setMaxDate(new Date(oDate.getTime()));
+			oHeader.getAggregation("_calendarPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_monthPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
+			oHeader.getAggregation("_yearPicker").setMaxDate(UI5Date.getInstance(oDate.getTime()));
 
 			if (oMinDate && oMinDate.getTime() > oDate.getTime()) {
 				Log.warning("maxDate < minDate -> maxDate set to begin of the month", this);
-				oMinDate = new Date(oDate.getTime());
+				oMinDate = UI5Date.getInstance(oDate.getTime());
 				oMinDate.setDate(1);
 				oMinDate.setHours(0);
 				oMinDate.setMinutes(0);
@@ -1660,9 +1662,9 @@ sap.ui.define([
 			if (oStartDate && oStartDate.getTime() > oDate.getTime()) {
 				Log.warning("StartDate > maxDate -> StartDate set to minDate", this);
 				if (oMinDate) {
-					oStartDate = new Date(oMinDate.getTime());
+					oStartDate = UI5Date.getInstance(oMinDate.getTime());
 				} else {
-					oStartDate = new Date(1, 0, 1);
+					oStartDate = UI5Date.getInstance(1, 0, 1);
 					oStartDate.setFullYear(1);
 				}
 				this.setStartDate(oStartDate);
@@ -1676,7 +1678,7 @@ sap.ui.define([
 			oHeader.getAggregation("_yearPicker").setMaxDate();
 		}
 
-		var oToday = new Date();
+		var oToday = UI5Date.getInstance();
 		if (oDate && oToday.getTime() > oDate.getTime()) {
 			this._oTodayButton.setVisible(false);
 		} else if (!oMinDate || oToday.getTime() > oMinDate.getTime()) {
@@ -1761,7 +1763,7 @@ sap.ui.define([
 				case CalendarIntervalType.Hour:
 					if (!this._oTimesRow) {
 						this._oTimesRow = new TimesRow(this.getId() + "-TimesRow", {
-							startDate: new Date(oStartDate.getTime()), // use new date object
+							startDate: UI5Date.getInstance(oStartDate.getTime()), // use new date object
 							items: iIntervals,
 							legend: this.getLegend()
 						});
@@ -1796,7 +1798,7 @@ sap.ui.define([
 					oInterval = this[oIntervalMetadata.sInstanceName];
 					if (!oInterval) {
 						oInterval = new oIntervalMetadata.oClass(this.getId() + oIntervalMetadata.sIdSuffix, {
-							startDate: new Date(oStartDate.getTime()), // use new date object
+							startDate: UI5Date.getInstance(oStartDate.getTime()), // use new date object
 							days: iIntervals,
 							showDayNamesLine: this.getShowDayNamesLine(),
 							legend: this.getLegend(),
@@ -1859,11 +1861,11 @@ sap.ui.define([
 				case CalendarIntervalType.Month:
 					if (!this._oMonthsRow) {
 						this._oMonthsRow = new MonthsRow(this.getId() + "-MonthsRow", {
-							startDate: new Date(oStartDate.getTime()), // use new date object
+							startDate: UI5Date.getInstance(oStartDate.getTime()), // use new date object
 							months: iIntervals,
 							legend: this.getLegend()
 						});
-						this._oMonthsRow.setProperty("primaryCalendarType", this._getPrimaryCalendarType());
+						this._oMonthsRow.setProperty("primaryCalendarType", this.getPrimaryCalendarType());
 						if (sSecondaryCalendarType) {
 							this._oMonthsRow.setProperty("secondaryCalendarType", sSecondaryCalendarType);
 						}
@@ -1895,9 +1897,9 @@ sap.ui.define([
 			var oContent = this.getAggregation("table").getInfoToolbar().getContent()[1];
 
 			if (oContent.getMetadata().hasProperty("_primaryCalendarType")) {
-				oContent.setProperty("_primaryCalendarType", this._getPrimaryCalendarType());
+				oContent.setProperty("_primaryCalendarType", this.getPrimaryCalendarType());
 			} else if (oContent.getMetadata().hasProperty("primaryCalendarType")) {
-				oContent.setPrimaryCalendarType(this._getPrimaryCalendarType());
+				oContent.setPrimaryCalendarType(this.getPrimaryCalendarType());
 			}
 
 			if (sSecondaryCalendarType && oContent.getMetadata().hasProperty("_secondaryCalendarType") ) {
@@ -1907,7 +1909,7 @@ sap.ui.define([
 			}
 
 			if (this._oOneMonthsRow) {
-				this._oOneMonthsRow.setPrimaryCalendarType(this._getPrimaryCalendarType());
+				this._oOneMonthsRow.setPrimaryCalendarType(this.getPrimaryCalendarType());
 			}
 
 			if (oContent.setFirstDayOfWeek) {
@@ -1936,7 +1938,7 @@ sap.ui.define([
 		if (sKey === PlanningCalendarBuiltInView.Week || sKey === PlanningCalendarBuiltInView.OneMonth || sKey === PlanningCalendarBuiltInView.Month || sKey === "OneMonth") {
 			oOldStartDate = this.getStartDate();
 
-			this.setStartDate(new Date(oOldStartDate.getTime())); //make sure the start date is aligned according to the week/month rules
+			this.setStartDate(UI5Date.getInstance(oOldStartDate.getTime())); //make sure the start date is aligned according to the week/month rules
 			if (oOldStartDate.getTime() !== this.getStartDate().getTime()) {
 				this.fireStartDateChange();
 			}
@@ -1944,8 +1946,8 @@ sap.ui.define([
 
 		if (this._oOneMonthsRow && (sKey === PlanningCalendarBuiltInView.OneMonth || sKey === "OneMonth")) {
 			this._oOneMonthsRow.setMode(this._iSize);
-			this._oOldStartDate = new Date(this.getStartDate().getTime());
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate, this._getPrimaryCalendarType()));
+			this._oOldStartDate = UI5Date.getInstance(this.getStartDate().getTime());
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oOldStartDate, this.getPrimaryCalendarType()));
 
 			if (this._iSize < 2) {
 				this._setRowsStartDate(oOldStartDate);
@@ -1964,14 +1966,14 @@ sap.ui.define([
 		}
 
 		if (oMinDate) {
-			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMinDate(new Date(oMinDate.getTime()));
-			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMinDate(new Date(oMinDate.getTime()));
-			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMinDate(new Date(oMinDate.getTime()));
+			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMinDate(UI5Date.getInstance(oMinDate.getTime()));
+			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMinDate(UI5Date.getInstance(oMinDate.getTime()));
+			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMinDate(UI5Date.getInstance(oMinDate.getTime()));
 		}
 		if (oMaxDate) {
-			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMaxDate(new Date(oMaxDate.getTime()));
-			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMaxDate(new Date(oMaxDate.getTime()));
-			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMaxDate(new Date(oMaxDate.getTime()));
+			oHeader.getAggregation("_calendarPicker") && oHeader.getAggregation("_calendarPicker").setMaxDate(UI5Date.getInstance(oMaxDate.getTime()));
+			oHeader.getAggregation("_yearPicker") && oHeader.getAggregation("_yearPicker").setMaxDate(UI5Date.getInstance(oMaxDate.getTime()));
+			oHeader.getAggregation("_monthPicker") && oHeader.getAggregation("_monthPicker").setMaxDate(UI5Date.getInstance(oMaxDate.getTime()));
 		}
 
 		this._updateTodayButtonState();
@@ -2042,13 +2044,13 @@ sap.ui.define([
 			oStart,
 			oCurrent;
 
-		this._dateNav.toDate(oDate, this._getPrimaryCalendarType());
+		this._dateNav.toDate(oDate, this.getPrimaryCalendarType());
 
 		oStart = this._dateNav.getStart();
 		oCurrent = this._dateNav.getCurrent();
 
 		if (this._dateNav.getCurrent() > this._dateNav.getEnd()){
-			oStart = new Date(this._dateNav.getStart());
+			oStart = UI5Date.getInstance(this._dateNav.getStart());
 			oStart.setDate(oStart.getDate() + 1);
 		}
 
@@ -2112,7 +2114,7 @@ sap.ui.define([
 			 * CalendarUtils.getFirstDateOfMonth works with UTC dates (this is because the dates are timezone irrelevant),
 			 * it should be called with the local datetime values presented as UTC ones.
 			 */
-			var oFirstDateOfMonth = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oStartDate, this._getPrimaryCalendarType()));
+			var oFirstDateOfMonth = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oStartDate, this.getPrimaryCalendarType()));
 			var oJSDate = oFirstDateOfMonth.toLocalJSDate();
 			oJSDate.setHours(oStartDate.getHours(), oStartDate.getMinutes(), oStartDate.getSeconds());
 			//CalendarUtils.getFirstDateOfMonth works with UTC based date values, restore the result back in local timezone.
@@ -2894,7 +2896,7 @@ sap.ui.define([
 			return;
 		}
 
-		this.setStartDate(new Date(oStartDate.getTime()));
+		this.setStartDate(UI5Date.getInstance(oStartDate.getTime()));
 		this._updatePickerSelection();
 		this.fireStartDateChange();
 	};
@@ -2920,7 +2922,7 @@ sap.ui.define([
 		}
 
 		// set timer only if date is in visible area or one hour before
-		var oNowDate = new Date();
+		var oNowDate = UI5Date.getInstance();
 		var oStartDate = this.getStartDate();
 		var sKey = this.getViewKey();
 		var oView = this._getView(sKey);
@@ -2971,12 +2973,12 @@ sap.ui.define([
 	 * @private
 	 */
 	PlanningCalendar.prototype._handleTodayPress = function (oEvent) {
-		var oDate = new Date(),
+		var oDate = UI5Date.getInstance(),
 			oStartDate,
 			sViewKey = this.getViewKey(),
 			oFocusMonthDelegate = {
 				onAfterRendering: function() {
-					this._focusDate(CalendarDate.fromLocalJSDate(new Date(), this._getPrimaryCalendarType()));
+					this._focusDate(CalendarDate.fromLocalJSDate(UI5Date.getInstance(), this.getPrimaryCalendarType()));
 					this.removeDelegate(oFocusMonthDelegate);
 				}
 			};
@@ -2984,8 +2986,8 @@ sap.ui.define([
 		// if the OneMonth view is selected and Today btn is pressed,
 		// the calendar should start from the 1st date of the current month
 		if (sViewKey === PlanningCalendarBuiltInView.OneMonth || sViewKey === "OneMonth") {
-			oStartDate = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate, this._getPrimaryCalendarType()));
+			oStartDate = CalendarUtils._getFirstDateOfMonth(CalendarDate.fromLocalJSDate(oDate, this.getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oDate, this.getPrimaryCalendarType()));
 
 			oDate = oStartDate.toLocalJSDate();
 		}
@@ -3040,7 +3042,7 @@ sap.ui.define([
 			oCurrentStartDate = this.getStartDate();
 
 		if (this.isRelative()) {
-			oStartDate = new Date(this.getMinDate().getTime());
+			oStartDate = UI5Date.getInstance(this.getMinDate().getTime());
 			oStartDate.setDate(
 				oStartDate.getDate() + oEvent.getSource()._oIndexPicker.getSelectedIndex() * this._getView(this.getViewKey()).getIntervalSize()
 			);
@@ -3086,10 +3088,10 @@ sap.ui.define([
 			return;
 		}
 
-		var oEvtSelectedStartDate = new Date(aSelectedDates[0].getStartDate());
-		var oEvtSelectedStartCalendarDate = CalendarDate.fromLocalJSDate(oEvtSelectedStartDate, this._getPrimaryCalendarType());
+		var oEvtSelectedStartDate = UI5Date.getInstance(aSelectedDates[0].getStartDate());
+		var oEvtSelectedStartCalendarDate = CalendarDate.fromLocalJSDate(oEvtSelectedStartDate, this.getPrimaryCalendarType());
 		// calculate end date
-		var oEndDate = CalendarUtils._createUniversalUTCDate(oEvtSelectedStartDate, this._getPrimaryCalendarType(), true);
+		var oEndDate = CalendarUtils._createUniversalUTCDate(oEvtSelectedStartDate, this.getPrimaryCalendarType(), true);
 		var sKey = this.getViewKey();
 		var oView = this._getView(sKey);
 		var sIntervalType = oView.getIntervalType();
@@ -3114,13 +3116,13 @@ sap.ui.define([
 			case CalendarIntervalType.OneMonth:
 			case "OneMonth":
 				if (this._iSize < 2) { // change rows' startDate on S and M sizes
-					var oFocusedDate = new Date(oEvtSelectedStartCalendarDate.toLocalJSDate().getTime());
+					var oFocusedDate = UI5Date.getInstance(oEvtSelectedStartCalendarDate.toLocalJSDate().getTime());
 					if (CalendarUtils.monthsDiffer(this.getStartDate(), oEvtSelectedStartCalendarDate.toLocalJSDate())) {
 						this.setStartDate(oEvtSelectedStartCalendarDate.toLocalJSDate());
 						this._getHeader().updatePickerText(this._formatPickerText());
 					}
 					this._setRowsStartDate(oFocusedDate);
-					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this._getPrimaryCalendarType()), true);
+					this._oOneMonthsRow._focusDate(CalendarDate.fromLocalJSDate(oFocusedDate, this.getPrimaryCalendarType()), true);
 				} else if (CalendarUtils._isNextMonth(oEvtSelectedStartCalendarDate.toLocalJSDate(), this.getStartDate())) {
 					this.shiftToDate(oEvtSelectedStartCalendarDate);
 					this._addMonthFocusDelegate(this._getRowInstanceByViewKey(this.getViewKey()));
@@ -3258,7 +3260,7 @@ sap.ui.define([
 						this._dateNav.setStep(iIntervals * iIntervalSize);
 						if (this._iSize > 1) {
 							//set start date to 1st of the month
-							this._setRowsStartDate(new Date(this.getStartDate().getTime()));
+							this._setRowsStartDate(UI5Date.getInstance(this.getStartDate().getTime()));
 						}
 					}
 					break;
@@ -3280,7 +3282,7 @@ sap.ui.define([
 			oSelectedDate = (this._getSelectedDates().length && this._getSelectedDates()[0].getStartDate()) ?
 				this._getSelectedDates()[0].getStartDate() : this.getStartDate();
 			this._oOneMonthsRow.setMode(this._iSize);
-			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oSelectedDate, this._getPrimaryCalendarType()));
+			this._adjustSelectedDate(CalendarDate.fromLocalJSDate(oSelectedDate, this.getPrimaryCalendarType()));
 		}
 
 		// Call _updateStickyHeader only if the property stickyHeader is set to true
@@ -3924,18 +3926,18 @@ sap.ui.define([
 				var fnDayMatchesCurrentDate = function (iDay) {
 					return iDay === oCurrentDate.getDay();
 				};
-				oCurrentDate = new Date(oRowStartDate.getTime());
+				oCurrentDate = UI5Date.getInstance(oRowStartDate.getTime());
 				oCurrentDate.setHours(0, 0, 0);
 				oCurrentDate.setDate(oRowStartDate.getDate() + iInterval);
 
 				for (var i = 0; i < aAllNonworkingDates.length; i++) {
 					if (aAllNonworkingDates[i].getStartDate()) {
-						oNonWorkingStartDate = new Date(aAllNonworkingDates[i].getStartDate().getTime());
+						oNonWorkingStartDate = UI5Date.getInstance(aAllNonworkingDates[i].getStartDate().getTime());
 					}
 					if (aAllNonworkingDates[i].getEndDate()) {
-						oNonWorkingEndDate = new Date(aAllNonworkingDates[i].getEndDate().getTime());
+						oNonWorkingEndDate = UI5Date.getInstance(aAllNonworkingDates[i].getEndDate().getTime());
 					} else {
-						oNonWorkingEndDate = new Date(aAllNonworkingDates[i].getStartDate().getTime());
+						oNonWorkingEndDate = UI5Date.getInstance(aAllNonworkingDates[i].getStartDate().getTime());
 						oNonWorkingEndDate.setHours(23, 59, 59);
 					}
 					if (oCurrentDate.getTime() >= oNonWorkingStartDate.getTime() && oCurrentDate.getTime() <= oNonWorkingEndDate.getTime()) {
@@ -4184,15 +4186,15 @@ sap.ui.define([
 				if (oSourceTimeline.hasListeners("appointmentDragEnter")) {
 
 					if (sIntervalType === CalendarIntervalType.Hour) {
-						newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Day
 						|| sIntervalType === CalendarIntervalType.Week
 						|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
 
-						newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Month) {
 
-						newPos = this._calcNewMonthsAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcNewMonthsAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					}
 
 					var bDropabbleArea = oSourceTimeline.fireAppointmentDragEnter({
@@ -4237,20 +4239,20 @@ sap.ui.define([
 					bCopy = (oBrowserEvent.metaKey || oBrowserEvent.ctrlKey);
 
 				if (sIntervalType === CalendarIntervalType.Hour) {
-					newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+					newPos = this._calcNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 				} else if (sIntervalType === CalendarIntervalType.Day
 					|| sIntervalType === CalendarIntervalType.Week
 					|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTargetTimeline._isOneMonthsRowOnSmallSizes())) {
 
-					newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+					newPos = this._calcNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 				} else if (sIntervalType === CalendarIntervalType.Month) {
 
-					newPos = this._calcNewMonthsAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+					newPos = this._calcNewMonthsAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 				}
 
 				oTargetTimeline.$().find(".sapUiCalendarRowAppsOverlay").removeClass("sapUiCalendarRowAppsOverlayDragging");
 
-				if (oAppointment._getStartDateWithTimezoneAdaptation().getTime() === newPos.startDate.getTime()
+				if (oAppointment.getStartDate().getTime() === newPos.startDate.getTime()
 					&& oAppointment.getParent() === getRow(oTargetTimeline.getParent())) {
 
 					return;
@@ -4271,11 +4273,11 @@ sap.ui.define([
 		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(oRowStartDate, null, true),
 			oAppStartUTC = CalendarUtils._createUniversalUTCDate(oAppStartDate, null, true),
 			oAppEndUTC = CalendarUtils._createUniversalUTCDate(oAppEndDate, null, true),
-			oStartDateUTC = new Date(oRowStartUTC.setUTCMinutes(0, 0, 0) + (iIndex * 30 * 60 * 1000));
+			oStartDateUTC = UI5Date.getInstance(oRowStartUTC.setUTCMinutes(0, 0, 0) + (iIndex * 30 * 60 * 1000));
 
 		return {
 			startDate: CalendarUtils._createLocalDate(oStartDateUTC, true),
-			endDate: CalendarUtils._createLocalDate(new Date(oStartDateUTC.getTime() + oAppEndUTC.getTime() - oAppStartUTC.getTime()), true)
+			endDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oStartDateUTC.getTime() + oAppEndUTC.getTime() - oAppStartUTC.getTime()), true)
 		};
 	};
 
@@ -4286,7 +4288,7 @@ sap.ui.define([
 			iAppDelta = oAppEndUTC.getTime() - oAppStartUTC.getTime();
 
 		oAppStartUTC.setUTCFullYear(oRowStartUTC.getUTCFullYear(), oRowStartUTC.getUTCMonth(), oRowStartUTC.getUTCDate() + iIndex);
-		oAppEndUTC = new Date(oAppStartUTC.getTime() + iAppDelta);
+		oAppEndUTC = UI5Date.getInstance(oAppStartUTC.getTime() + iAppDelta);
 
 		return {
 			startDate: CalendarUtils._createLocalDate(oAppStartUTC, true),
@@ -4301,7 +4303,7 @@ sap.ui.define([
 			iAppDelta = oAppEndUTC.getTime() - oAppStartUTC.getTime();
 
 		oAppStartUTC.setUTCFullYear(oRowStartUTC.getUTCFullYear(), oRowStartUTC.getUTCMonth() + iIndex);
-		oAppEndUTC = new Date(oAppStartUTC.getTime() + iAppDelta);
+		oAppEndUTC = UI5Date.getInstance(oAppStartUTC.getTime() + iAppDelta);
 
 		return {
 			startDate: CalendarUtils._createLocalDate(oAppStartUTC, true),
@@ -4400,15 +4402,15 @@ sap.ui.define([
 						newPos;
 
 					if (sIntervalType === CalendarIntervalType.Hour) {
-						newPos = this._calcResizeNewHoursAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcResizeNewHoursAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Day
 						|| sIntervalType === CalendarIntervalType.Week
 						|| ((sIntervalType === CalendarIntervalType.OneMonth || sIntervalType === "OneMonth") && !oTimeline._isOneMonthsRowOnSmallSizes())) {
 
-						newPos = this._calcResizeNewDaysAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcResizeNewDaysAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					} else if (sIntervalType === CalendarIntervalType.Month) {
 
-						newPos = this._calcResizeNewMonthsAppPos(oRowStartDate, oAppointment._getStartDateWithTimezoneAdaptation(), oAppointment._getEndDateWithTimezoneAdaptation(), iIndex);
+						newPos = this._calcResizeNewMonthsAppPos(oRowStartDate, oAppointment.getStartDate(), oAppointment.getEndDate(), iIndex);
 					}
 
 					oTimeline.$().find(".sapUiCalendarRowAppsOverlay").removeClass("sapUiCalendarRowAppsOverlayDragging");
@@ -4421,7 +4423,7 @@ sap.ui.define([
 						opacity: 1
 					});
 
-					if (oAppointment._getEndDateWithTimezoneAdaptation().getTime() === newPos.endDate.getTime() ) {
+					if (oAppointment.getEndDate().getTime() === newPos.endDate.getTime() ) {
 						return;
 					}
 
@@ -4440,14 +4442,14 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._calcResizeNewHoursAppPos = function(oRowStartDate, oAppStartDate, oAppEndDate, iIndex) {
-		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(new Date(oRowStartDate.getTime()), null, true),
+		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(UI5Date.getInstance(oRowStartDate.getTime()), null, true),
 			iMinutesStep = 30 * 60 * 1000, // 30 min
 			oAppStartUTC = CalendarUtils._createUniversalUTCDate(oAppStartDate, null, true),
-			oAppEndUTC = new Date(oRowStartUTC.setUTCMinutes(0, 0, 0) + ((iIndex + 1) *  iMinutesStep));
+			oAppEndUTC = UI5Date.getInstance(oRowStartUTC.setUTCMinutes(0, 0, 0) + ((iIndex + 1) *  iMinutesStep));
 
 		// check if the start date/time is after the end date/time and if so it just adds 1 period to the start date/time
 		if (oAppEndUTC.getTime() <= oAppStartUTC.getTime()) {
-			oAppEndUTC = new Date(oAppStartUTC.getTime() + iMinutesStep);
+			oAppEndUTC = UI5Date.getInstance(oAppStartUTC.getTime() + iMinutesStep);
 		}
 
 		return {
@@ -4459,7 +4461,7 @@ sap.ui.define([
 	PlanningCalendar.prototype._calcResizeNewDaysAppPos = function(oRowStartDate, oAppStartDate, oAppEndDate, iIndex) {
 		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(oRowStartDate, null, true),
 			oAppStartUTC = CalendarUtils._createUniversalUTCDate(oAppStartDate, null, true),
-			oAppEndUTC = new Date(oRowStartUTC.setUTCDate(oRowStartUTC.getUTCDate() + iIndex + 1)),
+			oAppEndUTC = UI5Date.getInstance(oRowStartUTC.setUTCDate(oRowStartUTC.getUTCDate() + iIndex + 1)),
 			oDateTimes = {};
 
 		oDateTimes.startDate = CalendarUtils._createLocalDate(oAppStartUTC);
@@ -4468,7 +4470,7 @@ sap.ui.define([
 
 		// check if the start date is after the end date and if so it just adds 1 day to the start date
 		if (oDateTimes.endDate <= oDateTimes.startDate) {
-			oDateTimes.endDate = CalendarUtils._createLocalDate(new Date(oAppEndUTC.setUTCDate(oAppStartUTC.getUTCDate() + 1)));
+			oDateTimes.endDate = CalendarUtils._createLocalDate(UI5Date.getInstance(oAppEndUTC.setUTCDate(oAppStartUTC.getUTCDate() + 1)));
 		}
 
 		return {
@@ -4480,11 +4482,11 @@ sap.ui.define([
 	PlanningCalendar.prototype._calcResizeNewMonthsAppPos = function(oRowStartDate, oAppStartDate, oAppEndDate, iIndex) {
 		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(oRowStartDate, null, true),
 			oAppStartUTC = CalendarUtils._createUniversalUTCDate(oAppStartDate, null, true),
-			oAppEndUTC = new Date(oRowStartUTC.setUTCMonth(oRowStartUTC.getUTCMonth() + iIndex + 1, 1));
+			oAppEndUTC = UI5Date.getInstance(oRowStartUTC.setUTCMonth(oRowStartUTC.getUTCMonth() + iIndex + 1, 1));
 
 		// check if the start date is after the end date and if so it just adds 1 month to the start date
 		if (CalendarUtils._monthsBetween(oAppStartUTC, oAppEndUTC, true) < 0) {
-				oAppEndUTC = new Date(oAppEndUTC.setUTCFullYear(oAppStartUTC.getUTCFullYear(), oAppStartUTC.getUTCMonth() + 1, 1));
+				oAppEndUTC = UI5Date.getInstance(oAppEndUTC.setUTCFullYear(oAppStartUTC.getUTCFullYear(), oAppStartUTC.getUTCMonth() + 1, 1));
 		}
 
 		return {
@@ -4498,9 +4500,9 @@ sap.ui.define([
 			iMinutesStep = 30 * 60 * 1000,  // 30 min
 			iStartAddon = (iStartIndex <= iEndIndex) ? iStartIndex : iEndIndex,
 			iEndAddon = (iStartIndex <= iEndIndex) ? iEndIndex + 1 : iStartIndex,
-			oRowStartDateTimeUTC = new Date(oRowStartUTC.setUTCMinutes(0, 0, 0)),
-			oAppStartUTC = new Date(oRowStartDateTimeUTC.getTime() + iStartAddon * iMinutesStep),
-			oAppEndUTC = new Date(oRowStartDateTimeUTC.getTime() + iEndAddon * iMinutesStep);
+			oRowStartDateTimeUTC = UI5Date.getInstance(oRowStartUTC.setUTCMinutes(0, 0, 0)),
+			oAppStartUTC = UI5Date.getInstance(oRowStartDateTimeUTC.getTime() + iStartAddon * iMinutesStep),
+			oAppEndUTC = UI5Date.getInstance(oRowStartDateTimeUTC.getTime() + iEndAddon * iMinutesStep);
 
 		return {
 			startDate: CalendarUtils._createLocalDate(oAppStartUTC, true),
@@ -4512,12 +4514,12 @@ sap.ui.define([
 		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(oRowStartDate, null, true),
 			iStartAddon = (iStartIndex <= iEndIndex) ? iStartIndex : iEndIndex,
 			iEndAddon = (iStartIndex <= iEndIndex) ? iEndIndex + 1 : iStartIndex,
-			oAppStartUTC = new Date(oRowStartUTC.getTime()),
-			oAppEndUTC = new Date(oRowStartUTC.getTime());
+			oAppStartUTC = UI5Date.getInstance(oRowStartUTC.getTime()),
+			oAppEndUTC = UI5Date.getInstance(oRowStartUTC.getTime());
 
 		return {
-			startDate: CalendarUtils._createLocalDate(new Date(oAppStartUTC.setUTCDate(oAppStartUTC.getUTCDate() + iStartAddon))),
-			endDate: CalendarUtils._createLocalDate(new Date(oAppEndUTC.setUTCDate(oAppEndUTC.getUTCDate() + iEndAddon)))
+			startDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oAppStartUTC.setUTCDate(oAppStartUTC.getUTCDate() + iStartAddon))),
+			endDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oAppEndUTC.setUTCDate(oAppEndUTC.getUTCDate() + iEndAddon)))
 		};
 	};
 
@@ -4525,12 +4527,12 @@ sap.ui.define([
 		var oRowStartUTC = CalendarUtils._createUniversalUTCDate(oRowStartDate, null, true),
 			iStartAddon = (iStartIndex <= iEndIndex) ? iStartIndex : iEndIndex,
 			iEndAddon = (iStartIndex <= iEndIndex) ? iEndIndex + 1 : iStartIndex,
-			oAppStartUTC = new Date(oRowStartUTC.getTime()),
-			oAppEndUTC = new Date(oRowStartUTC.getTime());
+			oAppStartUTC = UI5Date.getInstance(oRowStartUTC.getTime()),
+			oAppEndUTC = UI5Date.getInstance(oRowStartUTC.getTime());
 
 		return {
-			startDate: CalendarUtils._createLocalDate(new Date(oAppStartUTC.setUTCMonth(oAppStartUTC.getUTCMonth() + iStartAddon, 1))),
-			endDate: CalendarUtils._createLocalDate(new Date(oAppEndUTC.setUTCMonth(oAppEndUTC.getUTCMonth() + iEndAddon, 1)))
+			startDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oAppStartUTC.setUTCMonth(oAppStartUTC.getUTCMonth() + iStartAddon, 1))),
+			endDate: CalendarUtils._createLocalDate(UI5Date.getInstance(oAppEndUTC.setUTCMonth(oAppEndUTC.getUTCMonth() + iEndAddon, 1)))
 		};
 	};
 
@@ -4640,10 +4642,10 @@ sap.ui.define([
 		var sViewKey = this.getViewKey(),
 			oCurrentView = this._getView(sViewKey, true),
 			sCurrentViewIntervalType = oCurrentView && oCurrentView.getIntervalType(),
-			oStartDate = new Date(this._dateNav.getStart().getTime()),
-			oEndDate = new Date(this._dateNav.getEnd().getTime()),
-			oMinDate = this.getMinDate() ? new Date(this.getMinDate().getTime()) : undefined,
-			oMaxDate = this.getMaxDate() ? new Date(this.getMaxDate().getTime()) : undefined;
+			oStartDate = UI5Date.getInstance(this._dateNav.getStart().getTime()),
+			oEndDate = UI5Date.getInstance(this._dateNav.getEnd().getTime()),
+			oMinDate = this.getMinDate() ? UI5Date.getInstance(this.getMinDate().getTime()) : undefined,
+			oMaxDate = this.getMaxDate() ? UI5Date.getInstance(this.getMaxDate().getTime()) : undefined;
 
 		if (sCurrentViewIntervalType !== "Hour") {
 			oMinDate && oMinDate.setHours(0, 0, 0, 0);
@@ -4835,7 +4837,7 @@ sap.ui.define([
 		switch (sType) {
 			case "sapup":
 				oAppointment = oTimeline.getFocusedAppointment();
-				oDate = oAppointment._getStartDateWithTimezoneAdaptation();
+				oDate = oAppointment.getStartDate();
 
 				// get nearest appointment in row above
 				if (iIndex > 0) {
@@ -4849,7 +4851,7 @@ sap.ui.define([
 
 			case "sapdown":
 				oAppointment = oTimeline.getFocusedAppointment();
-				oDate = oAppointment._getStartDateWithTimezoneAdaptation();
+				oDate = oAppointment.getStartDate();
 
 				// get nearest appointment in row above
 				if (iIndex < aRows.length - 1) {
@@ -4987,7 +4989,7 @@ sap.ui.define([
 	};
 
 	PlanningCalendar.prototype._getDateFromIndex = function(iIndex) {
-		var oDate = new Date(this.getMinDate());
+		var oDate = UI5Date.getInstance(this.getMinDate());
 
 		oDate.setDate(oDate.getDate() + iIndex * this._getView(this.getViewKey()).getIntervalSize());