@sapui5/sap.gantt 1.119.0 → 1.120.1

package/src/sap/gantt/simple/BasePseudoShape.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.MultiActivityGroup
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 * @since 1.109
 	 *
 	 * @constructor
@@ -130,16 +130,23 @@ sap.ui.define([
 
 		if (bIsExpandRequired) {
 			var sModelName = oTable.getBindingInfo("rows").model;
-			var oTaskBindingInfo = oRowSettingsTemplate.getBindingInfo("tasks");
 			var oSettings = oRow.getAggregation("_settings");
-			var iCloneIndex = oSettings.getAggregation("tasks").length;
 			oGantt.oOverlapShapeIds[oRow.getIndex()] = [];
+			var aPossibleShapes = oGantt._getPossibleShapesInGantt();
+			var aBindingInfos = [];
+			aPossibleShapes.forEach(function(shape){
+				var oBindingInfo = oRowSettingsTemplate.getBindingInfo(shape);
+				aBindingInfos.push(oBindingInfo);
+			});
 			this.aShapeContexts.forEach(function (oContext) {
-				var oClone = oTaskBindingInfo.template.clone();
-				oClone.setBindingContext(oContext, sModelName);
-				oSettings.addAggregation("tasks", oClone, true);
-				oGantt.oOverlapShapeIds[oRow.getIndex()].push(oSettings.getAggregation("tasks")[iCloneIndex].getShapeId());
-				iCloneIndex++;
+				var sAggrType = aPossibleShapes.indexOf(oContext.aggrType);
+				var oClone = aBindingInfos[sAggrType] && aBindingInfos[sAggrType].template.clone();
+				if (oClone){
+					oClone.setBindingContext(oContext, sModelName);
+					oSettings.addAggregation(oContext.aggrType, oClone, true);
+					oGantt.oOverlapShapeIds[iIndex].push(oSettings.getAggregation(oContext.aggrType)[oSettings.getAggregation(oContext.aggrType).length - 1].getShapeId());
+					// iCloneIndex++;
+				}
 			});
 
 			oGantt._expand(sScheme, iIndex, true);
@@ -149,17 +156,15 @@ sap.ui.define([
 	 * Formats the time of a shape given according to the formatter provided through template of binding.
 	 * @private
 	 */
-	BasePseudoShape.prototype._timeFormatter = function (oTaskBindingInfo, oBasePseudo, oShape, oGantt) {
-		var startTimeformatterMethod = oTaskBindingInfo.template.getBindingInfo("time").formatter;
-		var endTimeformatterMethod = oTaskBindingInfo.template.getBindingInfo("endTime").formatter;
-		var oTime = startTimeformatterMethod ? startTimeformatterMethod.call(oBasePseudo, oShape.startTime) : oShape.startTime,
-		oEndTime = endTimeformatterMethod ? endTimeformatterMethod.call(oBasePseudo, oShape.endTime) : oShape.endTime;
-
+	BasePseudoShape.prototype._timeFormatter = function (oContext, oShapePropertyPath) {
+		var startTime = oContext.getProperty(oShapePropertyPath.startTime);
+		var endTime = oContext.getProperty(oShapePropertyPath.endTime);
+		var oTime = oContext.timeFormatter ? oContext.timeFormatter(startTime) : startTime,
+		oEndTime = oContext.endTimeFormatter ? oContext.endTimeFormatter(endTime) : endTime;
 		if (Format._getEnableDateTimezoneFormatter()) {
 			oTime = GanttUtils.getFormatedDateByTimeZone(oTime);
 			oEndTime = GanttUtils.getFormatedDateByTimeZone(oEndTime);
 		}
-
 		return {
 			time: oTime,
 			endTime: oEndTime
@@ -169,7 +174,7 @@ sap.ui.define([
 	 * Creates a pseudo shape for the provided binding information
 	 * @private
 	 */
-	BasePseudoShape.prototype._createPseudoShape = function (oShapeGroup, oTaskBindingInfo, oRow,oGantt,expanded) {
+	BasePseudoShape.prototype._createPseudoShape = function (oShapeGroup, oRow, oGantt, expanded) {
 		var horizontalTextAlignment = sap.gantt.simple.horizontalTextAlignment,
 			oPseudoShapeIcon;
 			var obasePseudo = new BasePseudoShape();
@@ -184,10 +189,9 @@ sap.ui.define([
 				endTime: oTask.getEndTime()
 			});
 		};
-		var oFormatedTime = this._timeFormatter(oTaskBindingInfo, obasePseudo, oShapeGroup, oGantt);
 		obasePseudo.setAggregation("task", new BaseRectangle({
-			time: oFormatedTime.time,
-			endTime: oFormatedTime.endTime,
+			time: oShapeGroup.startTime,
+			endTime: oShapeGroup.endTime,
 			horizontalTextAlignment: horizontalTextAlignment.Start,
 			fontSize: parseFloat(Parameters.get("sapUiChartAxisTitleFontSize"), 100) * 16,
 			fontWeight: Parameters.get("sapUiChartTitleFontWeight")
@@ -197,14 +201,13 @@ sap.ui.define([
 			if (obasePseudo.getTypeOfOverlapIndicator() != "Gradient") {
 				oTask._iBaseRowHeight = oGantt._oExpandModel.getBaseRowHeight() ? oGantt._oExpandModel.getBaseRowHeight() : oTask._iBaseRowHeight;
 				var iShapeHeight = oTask.getHeight();
-				var oFormatedTime = this._timeFormatter(oTaskBindingInfo, obasePseudo, overlap, oGantt);
 				obasePseudo.addAggregation("indicators",  new BaseRectangle({
-					time: oFormatedTime.time,
-					endTime: oFormatedTime.endTime,
+					time: overlap.startTime,
+					endTime: overlap.endTime,
 					yBias: iShapeHeight + 2
 				}).addStyleClass("sapGanttPseudoShapeOverlapIndicatorStyle"));
 			}
-		}.bind(this));
+		});
 		if (expanded && oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[oRow.getIndex()] && oShapeGroup.aShapeIds && oShapeGroup.aShapeIds.some(function (shapeId) {
 				return oGantt.oOverlapShapeIds[oRow.getIndex()].includes(shapeId);
 			})) {
@@ -257,20 +260,27 @@ sap.ui.define([
 	 * Create shapes for the provided binding information from the context
 	 * @private
 	 */
-	BasePseudoShape.prototype._createShapesFromContext = function(aContext, oRow,oTaskBindingInfo,oGantt,expanded,index, needGradientCalculations){
+	BasePseudoShape.prototype._createShapesFromContext = function(aContext, oRow, aBindingInfos, oGantt, expanded, index, needGradientCalculations){
 		var oSettings = oRow.getAggregation("_settings");
-        var oAxisTime = oGantt.getAxisTime();
-		var oPseudoShapeTemplate = oSettings.getPseudoShapeTemplate();
+        var oAxisTime = oGantt.getAxisTime(), oShapePropertyPaths = {};
+		var oPseudoShapeTemplate = oSettings.getPseudoShapeTemplate && oSettings.getPseudoShapeTemplate();
 		var sModelName = oGantt.getTable().getBindingInfo("rows").model;
+		var aPossibleShapes = oGantt._getPossibleShapesInGantt();
 		// Getting start and end time and indicator binding.
-		var oStartTimeBindingInfo = oTaskBindingInfo.template.getBindingInfo("time"),
-		oEndTimeBindingIndo = oTaskBindingInfo.template.getBindingInfo("endTime"),
-		oShapeIdBinding = oTaskBindingInfo.template.getBindingInfo("shapeId");
-		var oShapePropertyPaths  = {
-			endTime: oEndTimeBindingIndo.parts[0].path || oEndTimeBindingIndo.path,
-			startTime: oStartTimeBindingInfo.parts[0].path || oStartTimeBindingInfo.path,
-			shapeId: oShapeIdBinding.parts[0].path || oShapeIdBinding.path
-		};
+		aBindingInfos.forEach(function(oBindingInfo, index){
+			if (oBindingInfo){
+				var aShapes = oBindingInfo.template.getAggregation("shapes");
+				var oStartTimeBindingInfo = oBindingInfo.template.getBindingInfo("time") || aShapes && aShapes[0] && aShapes[0].getBindingInfo("time"),
+				oEndTimeBindingIndo = oBindingInfo.template.getBindingInfo("endTime") || aShapes && aShapes[0] && aShapes[0].getBindingInfo("endTime"),
+				oShapeIdBinding = oBindingInfo.template.getBindingInfo("shapeId");
+				oShapePropertyPaths[index] = {
+					endTime: oEndTimeBindingIndo.parts[0].path || oEndTimeBindingIndo.path,
+					startTime: oStartTimeBindingInfo.parts[0].path || oStartTimeBindingInfo.path,
+					shapeId: oShapeIdBinding.parts[0].path || oShapeIdBinding.path
+				};
+			}
+		});
+
 		var getIcon = function(sIconSrc, oTask){
 			return new BaseImage( {
 				height:parseFloat(Parameters.get("sapUiChartAxisTitleFontSize"), 100) * 16,
@@ -282,8 +292,17 @@ sap.ui.define([
 				endTime: oTask.getEndTime()
 			});
 		};
-		aContext.sort(function(oContext1, oContext2){return oContext1.getProperty(oShapePropertyPaths.startTime) - oContext2.getProperty(oShapePropertyPaths.startTime);});
-		var aFinalShapeGroupArray = this._findPseudoShapeContextArray(aContext, oShapePropertyPaths ,oRow, oGantt);
+		aContext.sort(function(oContext1, oContext2){
+			var oContext1StartTimeformatter = oContext1.timeFormatter;
+			var oContext2StartTimeformatter = oContext2.timeFormatter;
+		var oContext1StartTime = oContext1.getProperty(oShapePropertyPaths[aPossibleShapes.indexOf(oContext1.aggrType)].startTime);
+		var oContext2StartTime = oContext2.getProperty(oShapePropertyPaths[aPossibleShapes.indexOf(oContext2.aggrType)].startTime);
+		var oTime1 = oContext1StartTimeformatter ? oContext1StartTimeformatter(oContext1StartTime) : oContext1StartTime,
+		oTime2 = oContext2StartTimeformatter ? oContext2StartTimeformatter(oContext2StartTime) : oContext2StartTime;
+
+			return oTime1 - oTime2;
+		});
+		var aFinalShapeGroupArray = this._findPseudoShapeContextArray(aContext, oShapePropertyPaths ,oRow, oGantt, aBindingInfos);
 		var title, oTask, oPseudoShapeIcon;
 		oRow.aFinalShapeGroupArray = aFinalShapeGroupArray;
 		aFinalShapeGroupArray.forEach(function(oShapeGroup) {
@@ -294,9 +313,8 @@ sap.ui.define([
 					oShapeClone = oPseudoShapeTemplate.clone();
 					oTask = oShapeClone.getTask();
 					oShapeGroup.shapeFill = oTask.getFill() ? oTask.getFill() : oShapeClone.getFill();
-					var oFormatedTime = this._timeFormatter(oTaskBindingInfo, this, oShapeGroup, oGantt);
-					oTask.setTime(oFormatedTime.time);
-					oTask.setEndTime(oFormatedTime.endTime);
+					oTask.setTime(oShapeGroup.startTime);
+					oTask.setEndTime(oShapeGroup.endTime);
 					oTask.setSelectable(true);
 					if (expanded && oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[oRow.getIndex()] && oShapeGroup.aShapeIds &&  oShapeGroup.aShapeIds.some(function(shapeId){return oGantt.oOverlapShapeIds[oRow.getIndex()].includes(shapeId);})){
 							oPseudoShapeIcon = getIcon("sap-icon://collapse", oTask);
@@ -311,16 +329,15 @@ sap.ui.define([
 						indicator.addStyleClass("sapGanttPseudoShapeOverlapIndicatorStyle");
 						oShapeGroup.overlapIndicatorFill = indicator.getFill() ? indicator.getFill() : oShapeClone.getOverlapFill();
 						if (oShapeClone.getTypeOfOverlapIndicator() != "Gradient"){
-							var oFormatedTime = this._timeFormatter(oTaskBindingInfo, this, overlap, oGantt);
-							indicator.setTime(oFormatedTime.time);
-							indicator.setEndTime(oFormatedTime.endTime);
+							indicator.setTime(overlap.startTime);
+							indicator.setEndTime(overlap.endTime);
 							oShapeClone.addAggregation("indicators",indicator);
 						}
-					}.bind(this));
+					});
 					oPseudoShapeIcon.aCustomStyleClasses = ["pseudoShapeIcon"];
 					oShapeClone.addAggregation("button",oPseudoShapeIcon);
 				} else {
-					oShapeClone = this._createPseudoShape(oShapeGroup,oTaskBindingInfo,oRow,oGantt,expanded);
+					oShapeClone = this._createPseudoShape(oShapeGroup,oRow,oGantt,expanded);
 					oTask = oShapeClone.getTask();
 				}
 				oShapeClone.isPseudoShape = true;
@@ -330,8 +347,8 @@ sap.ui.define([
 				if (oShapeClone.getTypeOfOverlapIndicator() != "Indicator"){
 					oShapeClone.getTask().setFill('url(#' + oShapeGroup.id + ')');
 				}
-				oSettings.addAggregation("tasks", oShapeClone, true);
-				oShapeClone._birdEye(oTaskBindingInfo,oGantt,oShapeClone,oRow,index > -1 ? oGantt._aExpandedIndices.indexOf(oRow.getIndex()) == -1 : true);
+				oSettings.addAggregation("pseudoShapes", oShapeClone, true);
+				oShapeClone._birdEye(aBindingInfos,oGantt,oShapeClone,oRow,index > -1 ? oGantt._aExpandedIndices.indexOf(oRow.getIndex()) == -1 : true, oShapePropertyPaths);
                 if (needGradientCalculations){
                     var pseudoShapeStartTime = oShapeGroup.startTime,
                     pseudoShapeEndTime = oShapeGroup.endTime;
@@ -370,13 +387,14 @@ sap.ui.define([
             } else {
 				//if there are no overlaps, create original shape
 				if (oShapeGroup.iShapeCount === 1) {
-					var oClone = oTaskBindingInfo.template.clone();
+					var sAggrType = oShapeGroup.aShapeContexts[0].aggrType;
+					var oClone = aBindingInfos[aPossibleShapes.indexOf(sAggrType)].template.clone();
 					oClone.setBindingContext(oShapeGroup.aShapeContexts[0], sModelName);
 					// add back to the rows aggregation
-					oSettings.addAggregation("tasks", oClone, true);
-					var cloneIndex = oSettings.getAggregation("tasks").length - 1;
+					oSettings.addAggregation(sAggrType, oClone, true);
+					var cloneIndex = oSettings.getAggregation(sAggrType).length - 1;
 					var iIndex = oRow.getIndex();
-					var overlapIndex = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iIndex] && oGantt.oOverlapShapeIds[iIndex].indexOf(oSettings.getAggregation("tasks")[cloneIndex].getShapeId());
+					var overlapIndex = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iIndex] && oGantt.oOverlapShapeIds[iIndex].indexOf(oSettings.getAggregation(sAggrType)[cloneIndex].getShapeId());
 					if (overlapIndex > -1){
 						if (oGantt.oOverlapShapeIds[iIndex].length > 1){
 							oGantt.oOverlapShapeIds[iIndex].splice(overlapIndex,1);
@@ -395,26 +413,29 @@ sap.ui.define([
 	 * Creates shape groups for the provided binding information from the context
 	 * @private
 	 */
-	BasePseudoShape.prototype._findPseudoShapeContextArray  = function(aContext, oShapePropertyPaths ,oRow, oGantt) {
-		var aShapeGroups = [], iGroupIndex = 0, iOverlapIndex = 0, oGanttId = oGantt.getId();
+	BasePseudoShape.prototype._findPseudoShapeContextArray  = function(aContext, oShapePropertyPaths, oRow, oGantt) {
+		var aShapeGroups = [], sAggrType, iGroupIndex = 0, iOverlapIndex = 0, oGanttId = oGantt.getId();
 		// Verified that operations are sorted in ascending order of their start time. If not, we need to sort it that way.
+		var aPossibleShapes = oGantt._getPossibleShapesInGantt();
 		if (aContext[0]){
+			sAggrType = aPossibleShapes.indexOf(aContext[0].aggrType);
 			aShapeGroups.push({
 				id: oGanttId + "_row-" + oRow.getIndex() + "group-" + iGroupIndex,
 				iShapeCount: 1, //number of overlapping shapes
-				startTime: aContext[0].getProperty(oShapePropertyPaths.startTime), //start time of pseudo shape
-				endTime: aContext[0].getProperty(oShapePropertyPaths.endTime), //end time of pseudo shape
+				startTime: this._timeFormatter(aContext[0], oShapePropertyPaths[sAggrType], oGantt).time,//start time of pseudo shape
+				endTime: this._timeFormatter(aContext[0], oShapePropertyPaths[sAggrType], oGantt).endTime, //end time of pseudo shape
 				overlaps: [], //array of overlap start and end time objects
 				aShapeContexts: [aContext[0]], //mostly not needed in original implementation, adding so you get all necessary info here
-				aShapeIds: [aContext[0].getProperty(oShapePropertyPaths.shapeId)]
+				aShapeIds: [aContext[0].getProperty(oShapePropertyPaths[sAggrType].shapeId)]
 			});
 		}
 		for (var i = 1; i < aContext.length; i++) {
 			var oOperation = aContext[i];
 			//check for complete overlaps
 			//incoming shape's start and end time
-			var dShapeStartTime = oOperation.getProperty(oShapePropertyPaths.startTime),
-			dShapeEndTime = oOperation.getProperty(oShapePropertyPaths.endTime),
+			sAggrType = aPossibleShapes.indexOf(oOperation.aggrType);
+			var dShapeStartTime = this._timeFormatter(oOperation, oShapePropertyPaths[sAggrType], oGantt).time,
+			dShapeEndTime = this._timeFormatter(oOperation, oShapePropertyPaths[sAggrType], oGantt).endTime,
 			//Pseudo shape's start and end time
 			oShapeGroup = aShapeGroups[iGroupIndex],
 			dExistingShapeStartTime = oShapeGroup.startTime,
@@ -426,7 +447,7 @@ sap.ui.define([
 				//fully coinciding do nothing to pseudo shape's start and end time
 				oShapeGroup.aShapeContexts.push(oOperation);
 				oShapeGroup.iShapeCount ++;
-				oShapeGroup.aShapeIds.push(oOperation.getProperty(oShapePropertyPaths.shapeId));
+				oShapeGroup.aShapeIds.push(oOperation.getProperty(oShapePropertyPaths[aPossibleShapes.indexOf(oOperation.aggrType)].shapeId));
 				//if overlap are not there yet, add first overlap
 				//start time of overlap -> start time of incoming shape, end time of overlap -> end time of incoming shape
 				if (oShapeGroup.overlaps.length === 0) {
@@ -456,7 +477,7 @@ sap.ui.define([
 				//when incoming shape partially coincides with pseudo shape
 				oShapeGroup.aShapeContexts.push(oOperation);
 				oShapeGroup.iShapeCount++;
-				oShapeGroup.aShapeIds.push(oOperation.getProperty(oShapePropertyPaths.shapeId));
+				oShapeGroup.aShapeIds.push(oOperation.getProperty(oShapePropertyPaths[aPossibleShapes.indexOf(oOperation.aggrType)].shapeId));
 				//indicator endtime update
 				if (oShapeGroup.overlaps.length === 0) {
 					//if overlap are not there yet, add first overlap
@@ -499,7 +520,7 @@ sap.ui.define([
 					endTime: dShapeEndTime,
 					overlaps: [],
 					aShapeContexts: [oOperation],
-					aShapeIds: [oOperation.getProperty(oShapePropertyPaths.shapeId)]
+					aShapeIds: [oOperation.getProperty(oShapePropertyPaths[aPossibleShapes.indexOf(oOperation.aggrType)].shapeId)]
 				});
 			}
 		}
@@ -510,30 +531,27 @@ sap.ui.define([
 	 *Calculates bird eye ranges
 	 * @private
 	 */
-	BasePseudoShape.prototype._birdEye = function (oTaskBindingInfo, oGantt, oShapeClone, oRow,expanded) {
+	BasePseudoShape.prototype._birdEye = function (aBindingInfos, oGantt, oShapeClone, oRow, expanded, oShapePropertyPaths) {
 		var iRowIndex = oRow.getIndex(),
 		oSettings = oRow.getAggregation("_settings");
-		var countInBirdEyeBindingInfo = oTaskBindingInfo.template.getBindingInfo("countInBirdEye"),
-			countInBirdEyeVal;
-		if (countInBirdEyeBindingInfo) {
-			countInBirdEyeVal = countInBirdEyeBindingInfo.parts[0].path || countInBirdEyeBindingInfo.path;
-		} else {
-			countInBirdEyeVal = oTaskBindingInfo.template.getCountInBirdEye();
-		}
-		if (typeof (countInBirdEyeVal) == "boolean") {
-			oShapeClone.setCountInBirdEye(countInBirdEyeVal);
-			oShapeClone.groupBirdEyeRangeStartTime = oShapeClone.getAggregation("task").getTime();
-			oShapeClone.groupBirdEyeRangeEndTime = oShapeClone.getAggregation("task").getEndTime();
-		}
-		var calculateBirdEyeRange = function () {
+		var aPossibleShapes = oGantt._getPossibleShapesInGantt();
+		var calculateBirdEyeRange = function (oShapePropertyPaths, oPseudoShape) {
 			var pseudoCountInBirdEye = false,
 				startTime, endTime;
 			for (var i = 0; i < oShapeClone.aShapeContexts.length; i++) {
 				var oShape = oShapeClone.aShapeContexts[i];
-				if (oShape.getProperty(countInBirdEyeVal)) {
+				var sAggrType = aPossibleShapes.indexOf(oShape.aggrType);
+				var oShapeBindingInfo = aBindingInfos[sAggrType];
+				var countInBirdEyeBindingInfo = oShapeBindingInfo.template.getBindingInfo("countInBirdEye"), countInBirdEyeVal;
+				if (countInBirdEyeBindingInfo) {
+					countInBirdEyeVal = countInBirdEyeBindingInfo.parts[0].path || countInBirdEyeBindingInfo.path;
+				} else {
+					countInBirdEyeVal = oShapeBindingInfo.template.getCountInBirdEye();
+				}
+				if (typeof (countInBirdEyeVal) != "boolean" && oShape.getProperty(countInBirdEyeVal) || countInBirdEyeVal == true) {
 					pseudoCountInBirdEye = true;
-					var oCurrentStartTime = oShape.getProperty("StartDate");
-					var oCurrentEndTime = oShape.getProperty("EndDate");
+					var oCurrentStartTime = oPseudoShape._timeFormatter(oShape, oShapePropertyPaths[sAggrType], oGantt).time;
+					var oCurrentEndTime = oPseudoShape._timeFormatter(oShape, oShapePropertyPaths[sAggrType], oGantt).endTime;
 					if (!startTime || oCurrentStartTime < startTime) {
 						startTime = oCurrentStartTime;
 					}
@@ -553,16 +571,22 @@ sap.ui.define([
 				return oGantt.oOverlapShapeIds[iRowIndex].includes(shapeId);
 			}) && expanded) {
 			var sModelName = oGantt.getTable().getBindingInfo("rows").model;
-			var aTasks = oSettings.getAggregation("tasks");
-			var cloneIndex = aTasks ? aTasks.length : 0;
 			var pseudoCountInBirdEye = false,
 				startTime, endTime;
-				oShapeClone.aShapeContexts.forEach(function (oContext) {
+			oShapeClone.aShapeContexts.forEach(function (oContext) {
+				var sAggrType = aPossibleShapes.indexOf(oContext.aggrType);
+				var oShapeBindingInfo = aBindingInfos[sAggrType];
+				var countInBirdEyeBindingInfo = oShapeBindingInfo.template.getBindingInfo("countInBirdEye"), countInBirdEyeVal;
+				if (countInBirdEyeBindingInfo) {
+					countInBirdEyeVal = countInBirdEyeBindingInfo.parts[0].path || countInBirdEyeBindingInfo.path;
+				} else {
+					countInBirdEyeVal = oShapeBindingInfo.template.getCountInBirdEye();
+				}
 				if (typeof (countInBirdEyeVal) != "boolean") {
 					if (oContext.getProperty(countInBirdEyeVal)) {
 						pseudoCountInBirdEye = true;
-						var oCurrentStartTime = oContext.getProperty("StartDate");
-						var oCurrentEndTime = oContext.getProperty("EndDate");
+						var oCurrentStartTime = this._timeFormatter(oContext, oShapePropertyPaths[sAggrType], oGantt).time;
+						var oCurrentEndTime = this._timeFormatter(oContext, oShapePropertyPaths[sAggrType], oGantt).endTime;
 						if (!startTime || oCurrentStartTime < startTime) {
 							startTime = oCurrentStartTime;
 						}
@@ -571,23 +595,25 @@ sap.ui.define([
 						}
 					}
 				}
-				var oClone = oTaskBindingInfo.template.clone();
-				oClone.setBindingContext(oContext, sModelName);
-				oClone._parent = oShapeClone.getAggregation("task");
-				// add back to the rows aggregation
-				oSettings.addAggregation("tasks", oClone, true);
-				oSettings.getAggregation("tasks")[cloneIndex].isPartOfExpandedPseudoShape = true;
+				var oClone;
+				var oBindingInfo = aBindingInfos[sAggrType];
+					if (oBindingInfo){
+						oClone = oBindingInfo.template.clone();
+						oClone.setBindingContext(oContext, sModelName);
+						// add back to the rows aggregation
+						oSettings.addAggregation(oContext.aggrType, oClone, true);
+					}
+				oSettings.getAggregation(oContext.aggrType)[oSettings.getAggregation(oContext.aggrType).length - 1].isPartOfExpandedPseudoShape = true;
 				var index = index > -1 ? index : iRowIndex;
 				oGantt.oOverlapShapeIds[index] = oShapeClone.aShapeIds;
-				cloneIndex++;
-			});
+			}.bind(this));
 			if (typeof (countInBirdEyeVal) != "boolean") {
 				oShapeClone.groupBirdEyeRangeStartTime = startTime;
 				oShapeClone.groupBirdEyeRangeEndTime = endTime;
 				oShapeClone.setCountInBirdEye(pseudoCountInBirdEye);
 			}
-		} else if (typeof (countInBirdEyeVal) != "boolean") {
-			var oBirdEyeCalculationInfo = calculateBirdEyeRange();
+		} else {
+			var oBirdEyeCalculationInfo = calculateBirdEyeRange(oShapePropertyPaths, this);
 			oShapeClone.groupBirdEyeRangeStartTime = oBirdEyeCalculationInfo.startTime;
 			oShapeClone.groupBirdEyeRangeEndTime = oBirdEyeCalculationInfo.endTime;
 			oShapeClone.setCountInBirdEye(oBirdEyeCalculationInfo.pseudoCountInBirdEye);

package/src/sap/gantt/simple/BaseRectangle.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/BaseShape.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @abstract
 	 * @constructor
@@ -650,7 +650,13 @@ sap.ui.define([
 	BaseShape.prototype._shallWriteElementData = function(oShape) {
 		var bShallWrite = !oShape.getParent();
 		if (bShallWrite === false) {
-			bShallWrite = AggregationUtils.isParentRowSetting(oShape);
+			//since the overlay shape is nested inside GanttRowOverlay and overlay control, move up two level for rowsettings.
+			var oGanttRowOverlay = oShape.getParent().getParent();
+			if (oGanttRowOverlay &&  oGanttRowOverlay.isA("sap.gantt.overlays.GanttRowOverlay")){
+				bShallWrite =  AggregationUtils.isParentRowSetting(oGanttRowOverlay);
+			} else  {
+				bShallWrite = AggregationUtils.isParentRowSetting( oShape);
+			}
 		}
 		if (bShallWrite === false){
 			bShallWrite = AggregationUtils.isAdhocLine(oShape);

package/src/sap/gantt/simple/BaseText.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/BaseTriangle.js

@@ -14,7 +14,7 @@ sap.ui.define(
 		 * @extends sap.gantt.simple.BaseRectangle
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.1
      	 * @since 1.84
 		 *
 		 * @constructor

package/src/sap/gantt/simple/ContainerToolbar.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbar
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -519,10 +519,12 @@ sap.ui.define([
 			press: function () {
 				if (this.getParent().getShowSearchSidePanel()) {
 					var oInputField = this.getParent().getSearchSidePanel()._oSearchSidePanel.getItems()[1].getContent()[0];
-					var iInputLength = oInputField.getValue().length;
-					var oSearchTextDom = oInputField.getDomRef().getElementsByTagName("input")[0];
-					oInputField.focus();
-					oSearchTextDom.setSelectionRange(0, iInputLength);
+					if (oInputField.getDomRef()){
+						var iInputLength = oInputField.getValue().length;
+						var oSearchTextDom = oInputField.getDomRef().getElementsByTagName("input")[0];
+						oInputField.focus();
+						oSearchTextDom.setSelectionRange(0, iInputLength);
+					}
 				} else {
 					this.fireFindButtonPress();
 					var findMode = library.config.FindMode;
@@ -1137,8 +1139,8 @@ sap.ui.define([
 	ContainerToolbar.prototype.updateSettingItems = function(mChanges) {
 		var aSettingItems = this._oSettingsBox.getItems();
 		Object.keys(mChanges).forEach(function(property){
-			var oSettingItem = aSettingItems.filter(function(oItem){
-				return oItem.getName().endsWith(property);
+			var oSettingItem = aSettingItems.filter(function(oCheckBox){
+				return oCheckBox.getName().endsWith(property);
 			})[0];
 
 			if (oSettingItem) {

package/src/sap/gantt/simple/ContainerToolbarPlaceholder.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 * @since 1.66.0
 	 *
 	 * @constructor

package/src/sap/gantt/simple/CoordinateUtils.js

@@ -17,7 +17,7 @@ sap.ui.define(['sap/ui/thirdparty/jquery', "sap/ui/Device"], function(jQuery, De
 	 * @class Utility functionality to work with SVG coordination, e.g. find x position of cursor
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @private
 	 * @static

package/src/sap/gantt/simple/CustomVariantHandler.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/DeltaLine.js

@@ -25,7 +25,7 @@ sap.ui.define(
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.1
 		 * @since 1.84
 		 *
 		 * @constructor

package/src/sap/gantt/simple/DeltaLineRenderer.js

@@ -372,6 +372,8 @@ sap.ui.define(
 			}
 			// Rendering the Chart Delta Area between the lines
 			var oChartDeltaArea = oDeltaLine._getChartDeltaArea();
+            var iDiff = Math.abs(iX2 - iX1);
+            var iWidth = iDiff - (oDeltaLine.getVisibleDeltaStartEndLines() && iDiff >= 2 ? 2 : 0);
 			if (oGantt.getDeltaAreaHighlightColor() === "") {
 				oGantt.setDeltaAreaHighlightColor("@sapUiListSelectionBackgroundColor");
 			}
@@ -380,14 +382,14 @@ sap.ui.define(
 					x: iX1 + 1,
 					y: 0,
 					height: "100%",
-					width: Math.abs(iX2 - iX1) - 2,
+					width: iWidth,
 					fill: oGantt.getDeltaAreaHighlightColor(),
 					opacity: opacity
 				});
 				oDeltaLine._setChartDeltaArea(oChartDeltaArea);
 			} else {
 				oChartDeltaArea.setProperty("x", iX1 + 1, true);
-				oChartDeltaArea.setProperty("width", Math.abs(iX2 - iX1) - 2, true);
+				oChartDeltaArea.setProperty("width", iWidth, true);
 				oChartDeltaArea.setProperty("opacity", opacity, true);
 			}
 			oChartDeltaArea.renderElement(oRm, oChartDeltaArea);

package/src/sap/gantt/simple/ExpandModel.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.ExpandModel
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @private
@@ -59,15 +59,21 @@ sap.ui.define([
 		var bExpandToggled = false;
 		this.rowMaxLevelMap = {};
 		var aShapeSchemeKeys = [];
+		var oGantt = oTable.getParent();
 		Array.isArray(aExpandSchemes) && aExpandSchemes.forEach(function(scheme){
 			aShapeSchemeKeys.push(scheme.getKey());
 		});
 		for (var iIndex = 0; iIndex < aSelectedIndices.length; iIndex++) {
 			var iSelectedIndex = aSelectedIndices[iIndex];
 
-			var oRowSettings = GanttUtils.getSelectedTableRowSettings(oTable, iSelectedIndex);
-			var oGantt = oTable.getParent(),
-			bUseParentShapesOnExpand = oGantt.getUseParentShapeOnExpand();
+			var oRowSettings = GanttUtils.getSelectedTableRowSettings(oTable, iSelectedIndex),overlayAggList;
+			if (oRowSettings){
+				//add expand or staticOverlay aggreagtion shapes
+				AggregationUtils._addExpandStaticOverlay(oRowSettings,bExpanded,oGantt);
+				//fetch overlay aggreagtion shapes
+				overlayAggList = AggregationUtils._fetchOverlayAggregation(oRowSettings,false);
+			}
+			var bUseParentShapesOnExpand = oGantt.getUseParentShapeOnExpand();
 			if (!oGantt._bExpandRows && (oRowSettings == null)) {
 				// possible that the Control haven't been placed At anywhere
 				break;
@@ -87,7 +93,7 @@ sap.ui.define([
 				aExpandableShapes.forEach(function(oMainshape){ // eslint-disable-line
 					if (bUseParentShapesOnExpand) {
 						//experimental code
-						var aNonMultiActivityShapes = (aShapeSchemeKeys.indexOf(oMainshape.getScheme()) > -1)  ? [oMainshape] : [];
+						var aNonMultiActivityShapes = (aShapeSchemeKeys.indexOf(oMainshape.getScheme()) > -1 || aShapeSchemeKeys.length == 0)  ? [oMainshape] : [];
 						aChild = oMainshape instanceof sap.gantt.simple.MultiActivityGroup ? AggregationUtils.getNonLazyElementsByScheme(oMainshape, aShapeSchemeKeys) : aNonMultiActivityShapes;
 						childArraay = GanttUtils._getExpandedChildArray(aChild, oGantt, aShapeSchemeKeys, childArraay);
 						if (childArraayLength != childArraay.length){
@@ -125,6 +131,7 @@ sap.ui.define([
 				aLength.push(aChildWithLevels.maxLevel);
 				var iMaxLength = Math.max.apply(null, aLength);
 				if (iMaxLength > 0) {
+					iMaxLength  = AggregationUtils._addLevelAndUpdateMaxLength(overlayAggList,iMaxLength,oRowSettings);
 					this.toggle(bExpanded, oRowSettings, oPrimaryScheme, aExpandSchemes, iMaxLength, bUseParentShapesOnExpand);
 					this.rowMaxLevelMap["row" + iSelectedIndex] = iMaxLength;
 					bExpandToggled = true;

package/src/sap/gantt/simple/FindAndSelectUtils.js

@@ -66,7 +66,7 @@ sap.ui.define([
             function _findShapeInRow () {
                 that._oFoundShape = null;
                 that._bExpandPseudoShape = false;
-                var oRowSetting = sap.ui.getCore().byId(oRowDomRef.parentElement.id);
+                var oRowSetting = Core.byId(oRowDomRef.parentElement.id);
                 if (oRowSetting) {
                     var mAggregations = AggregationUtils.getAllNonLazyAggregations(oRowSetting);
                     var aShapesInRow = Object.keys(mAggregations).filter(function(sName){
@@ -96,6 +96,12 @@ sap.ui.define([
                         oRowDetails = Utility.parseUid(oShape.getShapeUid());
                         if (that.rowIndex !== parseInt(oRowDetails.rowIndex, 10)) {
                             that.rowIndex = parseInt(oRowDetails.rowIndex, 10);
+                            if (oGantt){
+                                if (!oGantt.pseudoShapeSpecificData){
+                                    oGantt.pseudoShapeSpecificData = {};
+                                }
+                                oGantt.pseudoShapeSpecificData.needUpdateForTasksInAggr = true;
+                            }
                             oGantt.getTable().setFirstVisibleRow(that.rowIndex);
                         }
                     }

package/src/sap/gantt/simple/GanttAdaptationData.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.CustomData
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 * @since 1.90
 	 *
 	 * @constructor