@openui5/sap.m 1.109.0 → 1.111.0

package/src/sap/m/SinglePlanningCalendar.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,8 @@ sap.ui.define([
 	'sap/ui/unified/DateTypeRange',
 	'sap/ui/unified/library',
 	'sap/ui/base/ManagedObjectObserver',
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/date/CalendarWeekNumbering"
 ],
 function(
 	library,
@@ -43,7 +44,8 @@ function(
 	DateTypeRange,
 	unifiedLibrary,
 	ManagedObjectObserver,
-	jQuery
+	jQuery,
+	CalendarWeekNumbering
 ) {
 	"use strict";
 
@@ -102,7 +104,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -210,10 +212,19 @@ function(
 				 *
 				 * Note: This property will only have effect in Week view and Month view of the SinglePlanningCalendar,
 				 * but it wouldn't have effect in WorkWeek view.
+				 * This property should not be used with the calendarWeekNumbering property.
 				 *
 				 * @since 1.98
 				 */
-				firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1}
+				firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1},
+
+				/**
+			 	 * If set, the calendar week numbering is used for display.
+				 * If not set, the calendar week numbering of the global configuration is used.
+				 * Note: This property should not be used with firstDayOfWeek property.
+				 * @since 1.110.0
+				 */
+				calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 			},
 
 			aggregations : {
@@ -503,6 +514,11 @@ function(
 	SinglePlanningCalendar.prototype.onBeforeRendering = function () {
 		// We can apply/remove sticky classes even before the control is rendered.
 		this._toggleStickyClasses();
+
+		if (this.getFirstDayOfWeek() !== -1 && this.getCalendarWeekNumbering()) {
+			Log.warning("Both properties firstDayOfWeek and calendarWeekNumbering should not be used at the same time!");
+		}
+
 	};
 
 	/**
@@ -541,7 +557,7 @@ function(
 	 * Called when the navigation toolbar changes its width or height.
 	 *
 	 * @param oEvent The resize event
-	 * @returns {this} <code>this</code> for chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._onHeaderResize = function (oEvent) {
@@ -581,6 +597,12 @@ function(
 		return this;
 	};
 
+	/**
+	 * Sets the start date of the grid.
+	 * @param {Date} oDate A JavaScript Date
+	 * @returns {this} Reference to <code>this</code> for method chaining
+	 * @public
+	 */
 	SinglePlanningCalendar.prototype.setStartDate = function (oDate) {
 		this.setProperty("startDate", oDate);
 		this._alignColumns();
@@ -631,7 +653,7 @@ function(
 	/**
 	 * Applies or removes sticky classes based on <code>stickyMode</code>'s value.
 	 *
-	 * @returns {this} <code>this</code> for chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._toggleStickyClasses = function () {
@@ -647,7 +669,7 @@ function(
 	 * Makes sure that the column headers are offset in such a way, that they are positioned right
 	 * after the navigation toolbar.
 	 *
-	 * @returns {this} <code>this</code> for chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._adjustColumnHeadersTopOffset = function () {
@@ -842,7 +864,7 @@ function(
 	/**
 	 * Returns the ManagedObjectObserver for the views
 	 *
-	 * @return {sap.ui.base.ManagedObjectObserver} the views observer object
+	 * @returns {sap.ui.base.ManagedObjectObserver} the views observer object
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._getViewsObserver = function () {
@@ -963,11 +985,28 @@ function(
 		return this;
 	};
 
+	SinglePlanningCalendar.prototype.setCalendarWeekNumbering = function(sCalendarWeekNumbering) {
+		this.setProperty("calendarWeekNumbering", sCalendarWeekNumbering);
+		this.getViews().forEach(function (oView) {
+			oView.setCalendarWeekNumbering(sCalendarWeekNumbering);
+		});
+		var oHeader = this._getHeader(),
+			oPicker = oHeader.getAggregation("_calendarPicker") ? oHeader.getAggregation("_calendarPicker") : oHeader._oPopup.getContent()[0],
+			oMonthGrid = this.getAggregation("_mvgrid");
+
+		oMonthGrid.setCalendarWeekNumbering(this.getCalendarWeekNumbering());
+		oPicker.setCalendarWeekNumbering(this.getCalendarWeekNumbering());
+
+		this._alignColumns();
+
+		return this;
+	};
+
 	/**
 	 * Switches the visibility of the SegmentedButton in the _header and aligns the columns in the grid after an
 	 * operation (add, insert, remove, removeAll, destroy) with the views is performed.
 	 *
-	 * @returns {this} this for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._alignView = function () {
@@ -1067,7 +1106,7 @@ function(
 	 * If the SinglePlanningCalendar has only one view added to its view aggregation, the button is not visible.
 	 * Otherwise, it is displayed in the _header.
 	 *
-	 * @returns {this} this for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._switchViewButtonVisibility = function () {
@@ -1082,7 +1121,7 @@ function(
 	/**
 	 * Attaches handlers to the events in the _header aggregation.
 	 *
-	 * @returns {this} this for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._attachHeaderEvents = function () {
@@ -1119,7 +1158,7 @@ function(
 	/**
 	 * Attaches handlers to the events in the _grid aggregation.
 	 *
-	 * @returns {this} this for method chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._attachGridEvents = function () {
@@ -1331,7 +1370,7 @@ function(
 			endDate: oRangeDates.oEndDate.toLocalJSDate()
 		});
 
-		oCalPicker.removeAllSelectedDates();
+		oCalPicker.destroySelectedDates();
 		oCalPicker.addSelectedDate(oSelectedRange);
 	};
 
@@ -1424,7 +1463,7 @@ function(
 			oCalViewDate = CalendarDate.fromLocalJSDate(oViewStartDate);
 
 		oHeader.setStartDate(oViewStartDate);
-		oHeader.updatePickerText(this._formatPickerText(oCalViewDate));
+		oHeader.setPickerText(this._formatPickerText(oCalViewDate));
 		this._updateCalendarPickerSelection();
 		oGrid.setStartDate(oViewStartDate);
 		oGridMV.setStartDate(oViewStartDate);
@@ -1479,7 +1518,7 @@ function(
 	 * @param {string} sHandler the handler ID
 	 * @param {Object} oObject
 	 * @param {Function} fnHandler
-	 * @returns {this} <code>this</code> for chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._registerResizeHandler = function (sHandler, oObject, fnHandler) {
@@ -1493,7 +1532,7 @@ function(
 	/**
 	 * De-registers resize handler.
 	 * @param {string} sHandler the handler ID
-	 * @returns {this} <code>this</code> for chaining
+	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._deRegisterResizeHandler = function (sHandler) {

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -102,7 +102,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -181,7 +181,14 @@ sap.ui.define([
 					 * Acceptable range is from 1 to 6.
 					 * @since 1.99
 					 */
-					scaleFactor: {type: "float", group: "Data", defaultValue: 1}
+					scaleFactor: {type: "float", group: "Data", defaultValue: 1},
+
+					/**
+			 	 	* If set, the calendar week numbering is used for display.
+					 * If not set, the calendar week numbering of the global configuration is used.
+					 * @since 1.110.0
+					 */
+					calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 				},
 				aggregations: {
 
@@ -349,7 +356,8 @@ sap.ui.define([
 				oDatesRow = new DatesRow(this.getId() + "-columnHeaders", {
 					showDayNamesLine: false,
 					showWeekNumbers: false,
-					startDate: oStartDate
+					startDate: oStartDate,
+					calendarWeekNumbering: this.getCalendarWeekNumbering()
 				}).addStyleClass("sapMSinglePCColumnHeader"),
 				iDelay = (60 - oStartDate.getSeconds()) * 1000,
 				sTimePattern = this._getCoreLocaleData().getTimePattern("medium");
@@ -403,6 +411,13 @@ sap.ui.define([
 			this._oInvisibleMessage = InvisibleMessage.getInstance();
 		};
 
+		SinglePlanningCalendarGrid.prototype.setCalendarWeekNumbering = function (sCalendarWeekNumbering){
+			this.setProperty("calendarWeekNumbering",sCalendarWeekNumbering);
+			var oDatesRow = this.getAggregation("_columnHeaders");
+			oDatesRow.setCalendarWeekNumbering(sCalendarWeekNumbering);
+			return this;
+		};
+
 		SinglePlanningCalendarGrid.prototype.onmousedown = function(oEvent) {
 			var oClassList = oEvent.target.classList;
 			this._isResizeHandleBottomMouseDownTarget = oClassList.contains("sapMSinglePCAppResizeHandleBottom");
@@ -758,6 +773,7 @@ sap.ui.define([
 					oBrowserEvent.dataTransfer.setDragImage(getResizeGhost(), 0, 0);
 
 					var oGrid = oEvent.getParameter("target"),
+						bIsRtl = Configuration.getRTL(),
 						aIntervalPlaceholders = oGrid.getAggregation("_intervalPlaceholders"),
 						oFirstIntervalRectangle = aIntervalPlaceholders[0].getDomRef().getBoundingClientRect(),
 						iIntervalHeight = oFirstIntervalRectangle.height,
@@ -770,10 +786,9 @@ sap.ui.define([
 					if (this._iColumns === 1) {
 						iIntervalIndex = iIndexInColumn;
 					} else {
-						var iHeaderSize = 64,
-							iBordersWidth = 2,
-							iIntervalWidth = Math.floor(aIntervalPlaceholders[0].getDomRef().getBoundingClientRect().width) - iBordersWidth,
-							iColumnsFromStart = Math.floor(Math.floor((oBrowserEvent.offsetX - iHeaderSize)) / iIntervalWidth),
+						var iHeaderWidthSize = bIsRtl ? 0 : this.getDomRef().querySelector(".sapMSinglePCRowHeaders").getClientRects()[0].width,
+							iIntervalWidth = oGrid._aGridCells[0].getClientRects()[0].width,
+							iColumnsFromStart = Math.floor(Math.floor((oBrowserEvent.offsetX - iHeaderWidthSize)) / iIntervalWidth),
 							iIntervalsInColumn = aIntervalPlaceholders.length / this._iColumns;
 
 						iIntervalIndex = iIndexInColumn + ((iColumnsFromStart) * iIntervalsInColumn);
@@ -2103,32 +2118,43 @@ sap.ui.define([
 			}
 		};
 
-		SinglePlanningCalendarGrid.prototype._createAppointmentsDndPlaceholders = function (oStartDate, iColumns) {
+		SinglePlanningCalendarGrid.prototype._createAppointmentsMatrix = function (oStartDate, index) {
+			var oColumnCalDate = new CalendarDate(oStartDate.getFullYear(), oStartDate.getMonth(), oStartDate.getDate() + index);
 			var iStartHour = this._getVisibleStartHour(),
-				iEndHour = this._getVisibleEndHour();
+			iEndHour = this._getVisibleEndHour();
 
-			this._dndPlaceholdersMap = {};
-			this.destroyAggregation("_intervalPlaceholders");
+			if (!this._dndPlaceholdersMap[oColumnCalDate]) {
+				this._dndPlaceholdersMap[oColumnCalDate] = [];
+			}
 
-			for (var i = 0; i < iColumns; i++) {
-				var oColumnCalDate = new CalendarDate(oStartDate.getFullYear(), oStartDate.getMonth(), oStartDate.getDate() + i);
+			for (var j = iStartHour; j <= iEndHour; j++) {
+				var aDndForTheDay = this._dndPlaceholdersMap[oColumnCalDate],
+					iYear = oColumnCalDate.getYear(),
+					iMonth = oColumnCalDate.getMonth(),
+					iDate = oColumnCalDate.getDate(),
+					iCurrentScale = this.getScaleFactor() * 2,
+					iTimeSlot = 60 / iCurrentScale * 60;
 
-				if (!this._dndPlaceholdersMap[oColumnCalDate]) {
-					this._dndPlaceholdersMap[oColumnCalDate] = [];
+				for (var y = 0; y < iCurrentScale; y++) {
+					aDndForTheDay.push(this._createAppointmentsDndPlaceHolder(new UniversalDate(iYear, iMonth, iDate, j, 0, iTimeSlot * y)));
 				}
+			}
+		};
 
-				for (var j = iStartHour; j <= iEndHour; j++) {
-					var aDndForTheDay = this._dndPlaceholdersMap[oColumnCalDate],
-						iYear = oColumnCalDate.getYear(),
-						iMonth = oColumnCalDate.getMonth(),
-						iDate = oColumnCalDate.getDate(),
-						iCurrentScale = this.getScaleFactor() * 2,
-						iTimeSlot = 60 / iCurrentScale * 60;
+		SinglePlanningCalendarGrid.prototype._createAppointmentsDndPlaceholders = function (oStartDate, iColumns) {
+			var bIsRtl = Configuration.getRTL(),
+				i;
 
-					for (var y = 0; y < iCurrentScale; y++) {
-						aDndForTheDay.push(this._createAppointmentsDndPlaceHolder(new UniversalDate(iYear, iMonth, iDate, j, 0, iTimeSlot * y)));
-					}
+			this._dndPlaceholdersMap = {};
+			this.destroyAggregation("_intervalPlaceholders");
 
+			if (bIsRtl) {
+				for (i = iColumns - 1; i >= 0; i--) {
+					this._createAppointmentsMatrix(oStartDate, i);
+				}
+			} else {
+				for (i = 0; i <  iColumns; i++) {
+					this._createAppointmentsMatrix(oStartDate, i);
 				}
 			}
 		};

package/src/sap/m/SinglePlanningCalendarGridRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/SinglePlanningCalendarMonthGrid.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,10 @@ sap.ui.define([
 	'./SinglePlanningCalendarMonthGridRenderer',
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/core/InvisibleMessage',
-	'sap/ui/core/library'
+	'sap/ui/core/library',
+	"sap/ui/core/date/CalendarWeekNumbering",
+	"sap/ui/core/date/CalendarUtils",
+	"sap/ui/core/Configuration"
 	],
 	function (
 		Control,
@@ -47,7 +50,10 @@ sap.ui.define([
 		SinglePlanningCalendarMonthGridRenderer,
 		jQuery,
 		InvisibleMessage,
-		coreLibrary
+		coreLibrary,
+		CalendarWeekNumbering,
+		CalendarDateUtils,
+		Configuration
 	) {
 		"use strict";
 
@@ -83,7 +89,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.109.0
+		 * @version 1.111.0
 		 *
 		 * @constructor
 		 * @private
@@ -116,7 +122,14 @@ sap.ui.define([
 					 *
 					 * @since 1.98
 					 */
-					firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1}
+					firstDayOfWeek : {type : "int", group : "Appearance", defaultValue : -1},
+					/**
+			 		 * If set, the calendar week numbering is used for display.
+					 * If not set, the calendar week numbering of the global configuration is used.
+					 * Note: This property should not be used with firstDayOfWeek property.
+					 * @since 1.110.0
+					 */
+					calendarWeekNumbering : { type : "sap.ui.core.date.CalendarWeekNumbering", group : "Appearance", defaultValue: null}
 				},
 				aggregations: {
 
@@ -262,6 +275,10 @@ sap.ui.define([
 			this._oAppointmentsToRender = this._calculateAppointmentsNodes(oStartDate);
 			this._createAppointmentsDndPlaceholders(oStartDate);
 			this._oInvisibleMessage = InvisibleMessage.getInstance();
+
+			if (this.getFirstDayOfWeek() !== -1 && this.getCalendarWeekNumbering()) {
+				Log.warning("Both properties firstDayOfWeek and calendarWeekNumbering should not be used at the same time!");
+			}
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype.onAfterRendering = function() {
@@ -376,7 +393,7 @@ sap.ui.define([
 				iTimestamp = parseInt(oTarget.getAttribute("sap-ui-date"));
 
 				oStartDate = new Date(iTimestamp);
-				oStartDate = new Date(oStartDate.getFullYear(), oStartDate.getMonth(), oStartDate.getDate());
+				oStartDate = new Date(oStartDate.getUTCFullYear(), oStartDate.getUTCMonth(), oStartDate.getUTCDate());
 
 				oEndDate = new Date(oStartDate);
 				oEndDate.setDate(oEndDate.getDate() + 1);
@@ -471,7 +488,7 @@ sap.ui.define([
 			var iTimestamp = parseInt(oEvent.getSource().getCustomData()[0].getValue()),
 				oDate = new Date(iTimestamp);
 
-			oDate = new Date(oDate.getFullYear(), oDate.getMonth(), oDate.getDate());
+			oDate = new Date(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate());
 
 			this.fireEvent("moreLinkPress", { date: oDate });
 		};
@@ -491,15 +508,13 @@ sap.ui.define([
 			var aDays = this._getVisibleDays(this.getStartDate()),
 				iColumns = this._getColumns(),
 				aResult = [],
-				sLocale = Core.getConfiguration().getFormatLocale().toString(),
-				oLocaleData = this._getCoreLocaleData();
+				sLocale = Core.getConfiguration().getFormatLocale().toString();
 
 			for (var i = 0; i < this._getRows(); i++) {
-				aResult.push(CalendarUtils.calculateWeekNumber(
-					aDays[i * iColumns].toUTCJSDate(),
-					aDays[i * iColumns].getYear(),
-					sLocale,
-					oLocaleData));
+				var oDateFormat = DateFormat.getInstance({pattern: "w", calendarType: "Gregorian", calendarWeekNumbering: this.getCalendarWeekNumbering()}, new Locale(sLocale));
+				var iWeekNumber = Number(oDateFormat.format(aDays[i * iColumns].toUTCJSDate(), true));
+
+				aResult.push(iWeekNumber);
 			}
 
 			return aResult;
@@ -522,7 +537,18 @@ sap.ui.define([
 
 			oCalStartDate = CalendarDate.fromLocalJSDate(oStartDate);
 			iAPIFirstDayOfWeek = this.getFirstDayOfWeek();
-			iFirstDayOfWeek = iAPIFirstDayOfWeek > 0 ? iAPIFirstDayOfWeek : this._getCoreLocaleData().getFirstDayOfWeek();
+
+			if (iAPIFirstDayOfWeek < 0 || iAPIFirstDayOfWeek > 6) {
+				var oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(this.getCalendarWeekNumbering(), new Locale(Configuration.getFormatSettings().getFormatLocale().toString()));
+
+				if (oWeekConfigurationValues) {
+					iFirstDayOfWeek = oWeekConfigurationValues.firstDayOfWeek;
+				} else {
+					var oLocaleData = this._getCoreLocaleData();
+					iFirstDayOfWeek = oLocaleData.getFirstDayOfWeek();
+				}
+			}
+
 
 			// determine weekday of first day in month
 			oFirstDay = new CalendarDate(oCalStartDate);
@@ -555,14 +581,14 @@ sap.ui.define([
 			var aVisibleDays = this._getVisibleDays(oStartDate),
 				oFirstVisibleDay = aVisibleDays[0],
 				oLastVisibleDay = aVisibleDays[aVisibleDays.length - 1],
-					// we do not need appointments without start and end dates
+					// We do not need appointments without start and end dates
 				aApps = this.getAppointments().filter(function(app) {
 					var bValid = app._getStartDateWithTimezoneAdaptation() && app._getEndDateWithTimezoneAdaptation();
 					if (!bValid) {
 						Log.warning("Appointment " + app.getId() + " has no start or no end date. It is ignored.");
 					}
 					return bValid;
-					// map to a structure ready for calculations
+					// Map to a structure ready for calculations
 				}).map(function(app) {
 					var oStart = CalendarDate.fromLocalJSDate(app._getStartDateWithTimezoneAdaptation()),
 						oEnd = CalendarDate.fromLocalJSDate(app._getEndDateWithTimezoneAdaptation());
@@ -572,21 +598,21 @@ sap.ui.define([
 						end: oEnd,
 						len: CalendarUtils._daysBetween(oEnd, oStart)
 					};
-					// get only the visible appointments
+					// Get only the visible appointments
 				}).filter(function(app) {
 					return CalendarUtils._isBetween(app.start, oFirstVisibleDay, oLastVisibleDay, true) // app starts in the current view port
 						|| CalendarUtils._isBetween(app.end, oFirstVisibleDay, oLastVisibleDay, true) // app ends in the current view port
 						|| (CalendarUtils._isBetween(oFirstVisibleDay, app.start, oLastVisibleDay, true) // app starts before the view port...
 							&& CalendarUtils._isBetween(oLastVisibleDay, oFirstVisibleDay, app.end,true)); // ...and ends after the view port
-					// sort by start date
+					// Sort by start date
 				}).sort(function compare(a, b) {
 					return a.start.valueOf() - b.start.valueOf();
 				}),
-				// array of taken levels per visible day
+				// Array of taken levels per visible day
 				aVisibleDaysLevels = [],
 				oApp,
-				iStartIndexVisibleDays,
-				iEndIndexVisibleDays,
+				iAppointmentStartIndex,
+				iAppointmentEndIndex,
 				iFirstFreeIndex,
 				i,
 				j,
@@ -596,25 +622,29 @@ sap.ui.define([
 				aVisibleDaysLevels.push([]);
 			}
 
-			// each appointment gets its width and level
+			// Each appointment gets its width and level
 			for (i = 0; i < aApps.length; i++) {
 				oApp = aApps[i];
-				iStartIndexVisibleDays = CalendarUtils._daysBetween(oApp.start, aVisibleDays[0]);
-				iEndIndexVisibleDays = iStartIndexVisibleDays + oApp.len;
-				iStartIndexVisibleDays = iStartIndexVisibleDays > 0 ? iStartIndexVisibleDays : 0;
-				iEndIndexVisibleDays = iEndIndexVisibleDays < aVisibleDays.length ? iEndIndexVisibleDays : aVisibleDays.length - 1;
+				iAppointmentStartIndex = CalendarUtils._daysBetween(oApp.start, aVisibleDays[0]);
+				iAppointmentEndIndex = iAppointmentStartIndex + oApp.len;
+
+				// If appointment is out of bounds, set it in bounds
+				iAppointmentStartIndex = iAppointmentStartIndex > 0 ? iAppointmentStartIndex : 0;
+				iAppointmentEndIndex = iAppointmentEndIndex < aVisibleDays.length ? iAppointmentEndIndex : aVisibleDays.length - 1;
 
 				oApp.width = oApp.len + 1;
 
-				// find the first level that is not taken for the start date of the appointment
-				iFirstFreeIndex = aVisibleDaysLevels[iStartIndexVisibleDays].indexOf(true);
+				// Find the first level that is not taken for the start date of the appointment
+				iFirstFreeIndex = aVisibleDaysLevels[iAppointmentStartIndex].indexOf(true);
 				if (iFirstFreeIndex === -1) {
-					iFirstFreeIndex = aVisibleDaysLevels[iStartIndexVisibleDays].length;
+					iFirstFreeIndex = aVisibleDaysLevels[iAppointmentStartIndex].length;
 				}
+
+				// Rendered position of appointment in day
 				oApp.level = iFirstFreeIndex;
 
-				// adjust the taken levels for all days of the current appointment
-				for (j = iStartIndexVisibleDays; j <= iEndIndexVisibleDays; j++) {
+				// Adjust the taken levels for all days of the current appointment
+				for (j = iAppointmentStartIndex; j <= iAppointmentEndIndex; j++) {
 					aVisibleDaysLevels[j][iFirstFreeIndex] = false;
 
 					for (k = 0; k < iFirstFreeIndex; k++) {
@@ -633,24 +663,19 @@ sap.ui.define([
 		SinglePlanningCalendarMonthGrid.prototype._getMoreCountPerCell = function(iCellIndex) {
 			var aLevelsForADay = this._aAppsLevelsPerDay[iCellIndex];
 			var iMaxAppointmentsRendered = this._getMaxAppointments();
-			var iAllApps = 0;
-			var iSlotsToRender = 0;
+			var iMoreCount = 0;
 
-			if (aLevelsForADay.length <= iMaxAppointmentsRendered) {
+			if (aLevelsForADay.length < iMaxAppointmentsRendered) {
 				return 0;
 			}
 
-			for (var i = 0; i < aLevelsForADay.length; i++) {
+			// Count the number of hidden appointments
+			for (var i = iMaxAppointmentsRendered - 1; i < aLevelsForADay.length; i++){
 				if (!aLevelsForADay[i]) {
-					iAllApps++;
-				}
-
-				if (i < iMaxAppointmentsRendered - 1) {
-					iSlotsToRender++;
+					iMoreCount++;
 				}
 			}
-
-			return iAllApps - iSlotsToRender;
+			return iMoreCount;
 		};
 
 		SinglePlanningCalendarMonthGrid.prototype._configureAppointmentsDragAndDrop = function() {

package/src/sap/m/SinglePlanningCalendarMonthGridRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -12,7 +12,10 @@ sap.ui.define([
 	'./PlanningCalendarLegend',
 	'sap/ui/core/InvisibleText',
 	'sap/ui/core/Core',
-	'sap/ui/unified/library'
+	'sap/ui/unified/library',
+	"sap/ui/core/date/CalendarUtils",
+	'sap/ui/core/Locale',
+	"sap/ui/core/Configuration"
 	],
 	function(
 		CalendarDate,
@@ -22,7 +25,11 @@ sap.ui.define([
 		PlanningCalendarLegend,
 		InvisibleText,
 		Core,
-		unifiedLibrary) {
+		unifiedLibrary,
+		CalendarDateUtils,
+		Locale,
+		Configuration
+		) {
 		"use strict";
 
 		// shortcut for sap.ui.unified.CalendarDayType
@@ -379,7 +386,7 @@ sap.ui.define([
 
 		SinglePlanningCalendarMonthGridRenderer.renderDayNames = function(oRm, oControl, oLocaleData) {
 			var iAPIFirstDayOfWeek = oControl.getFirstDayOfWeek(),
-				iFirstDayOfWeek = iAPIFirstDayOfWeek > 0 ? iAPIFirstDayOfWeek : oLocaleData.getFirstDayOfWeek(),
+				iFirstDayOfWeek,
 				sId = oControl.getId(),
 				sDayId,
 				sCalendarType = Core.getConfiguration().getCalendarType(),
@@ -389,6 +396,19 @@ sap.ui.define([
 				oFirstRenderedDate,
 				iDayIndex;
 
+
+				if (iAPIFirstDayOfWeek < 0 || iAPIFirstDayOfWeek > 6) {
+					var oWeekConfigurationValues = CalendarDateUtils.getWeekConfigurationValues(oControl.getCalendarWeekNumbering(), new Locale(Configuration.getFormatSettings().getFormatLocale().toString()));
+
+					if (oWeekConfigurationValues) {
+						iFirstDayOfWeek = oWeekConfigurationValues.firstDayOfWeek;
+					} else {
+						iFirstDayOfWeek = oControl._getCoreLocaleData().getFirstDayOfWeek();
+					}
+				} else {
+					iFirstDayOfWeek = iAPIFirstDayOfWeek;
+				}
+
 			oStartDate.setDate(oStartDate.getDate() - oStartDate.getDay() + iFirstDayOfWeek);
 			oFirstRenderedDate = CalendarDate.fromLocalJSDate(oStartDate);
 			oRm.openStart("div", sId + "-Names");