@sapui5/sap.gantt 1.119.0 → 1.120.1

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

@@ -345,7 +345,7 @@ sap.ui.define([
 
 	InnerGanttChartRenderer.renderRowBackgrounds = function(oRm, oGantt, aRowStates) {
 		var nHeightOfPreviousRows = 0;
-		var visibleRowCount = oGantt.getTable().getVisibleRowCount();
+		var visibleRowCount = oGantt.getTable().getRows().length - 1;
 		oRm.openStart("g", oGantt.getId() + "-rowBackgrounds");
 		oRm.class("rowBackgrounds");
 		oRm.openEnd();
@@ -412,15 +412,8 @@ sap.ui.define([
 			var oDate = Format.abapTimestampToDate(oValue.getTimeStamp());
 			return oDate >= oMinTime && oDate <= oMaxTime && oValue.getProperty("visible");
 		});
-		var aAdhocLines = oGantt.getAdhocLines();
 
-		aAdhocLines = aAdhocLines.filter(function(oValue) {
-			var oDate = sap.gantt.misc.Format.abapTimestampToDate(oValue.getTimeStamp());
-			return oDate >= oMinTime && oDate <= oMaxTime;
-		});
-
-		if (aAdhocLines.length === 0 && aAdhocLinesSimple.length === 0) { return; }
-		var oAxisTime = oGantt.getAxisTime();
+		if (aAdhocLinesSimple.length === 0) { return; }
 		oRm.openStart("g");
 		oRm.class("sapGanttChartAdhocLine");
 		oRm.openEnd();
@@ -430,23 +423,6 @@ sap.ui.define([
 			AdhocLineRenderer.renderLine(oRm, oAdhocLine, oGantt);
 		});
 
-		//render adhoc lines
-		aAdhocLines.map(function(oAdhocLine) {
-			var iX = oAxisTime.timeToView(Format.abapTimestampToDate(oAdhocLine.getTimeStamp()));
-			return new BaseLine({
-				x1: iX,
-				y1: 0,
-				x2: iX,
-				y2: "100%",
-				stroke: oAdhocLine.getStroke(),
-				strokeWidth: oAdhocLine.getStrokeWidth(),
-				strokeDasharray: oAdhocLine.getStrokeDasharray(),
-				strokeOpacity: oAdhocLine.getStrokeOpacity(),
-				tooltip: oAdhocLine.getDescription()
-			}).setProperty("childElement", true);
-		}).forEach(function(oLine){
-			oLine.renderElement(oRm, oLine);
-		});
 		oRm.close("g");
 	};
 

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

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

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

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

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

@@ -19,7 +19,7 @@ sap.ui.define(["sap/gantt/simple/BaseGroup"], function (BaseGroup) {
      * @extends sap.gantt.simple.BaseGroup
      *
      * @author SAP SE
-     * @version 1.119.0
+     * @version 1.120.1
      * @since 1.85
      *
      * @constructor

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

@@ -21,7 +21,7 @@
 	 * @extends sap.gantt.simple.GanttRowSettings
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 * @since 1.85
      *
 	 * @constructor
@@ -36,13 +36,7 @@
                 /**
 				 * The control which holds the shape groups.
 				 */
-				tasks : {type : "sap.gantt.simple.BaseShape", multiple : true, singularName : "task"},
-				/**
-				 * Pseudo shape template
-				 * @private since 1.110
-				 */
-				pseudoShapeTemplate : {type : "sap.gantt.simple.MultiActivityGroup", multiple : false, visibility: "hidden"}
-
+				tasks : {type : "sap.gantt.simple.BaseShape", multiple : true, singularName : "task"}
             }
         }
     });
@@ -55,12 +49,6 @@
 		return oClone;
 	};
 
-	/**
-	 * @private
-	 */
-	MultiActivityRowSettings.prototype.getPseudoShapeTemplate = function() {
-		return this.getAggregation("pseudoShapeTemplate");
-	};
 
     return MultiActivityRowSettings;
 });

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BasePath
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -165,9 +165,9 @@ sap.ui.define([
 					relationshipIdList = [];
 				for (var i = 0; i < aElements.length; i++) {
 					var relationshipNode = aElements[i].parentNode;
-					if (aElements[i].tagName === "path" && sap.ui.getCore().byId(relationshipNode.id).isA("sap.gantt.simple.Relationship") && relationshipIdList.indexOf(relationshipNode.id) === -1 ) {
+					if (aElements[i].tagName === "path" && Core.byId(relationshipNode.id).isA("sap.gantt.simple.Relationship") && relationshipIdList.indexOf(relationshipNode.id) === -1 ) {
 						relationshipIdList.push(relationshipNode.id);
-						var relInst = sap.ui.getCore().byId(relationshipNode.id);
+						var relInst = Core.byId(relationshipNode.id);
 						aConnectorList.push(relInst);
 					}
 				}
@@ -187,9 +187,9 @@ sap.ui.define([
 	};
 
 	Relationship.prototype.renderElement = function (oRm, oElement, sGanttId) {
-		this.oGantt = sap.ui.getCore().byId(sGanttId);
+		this.oGantt = Core.byId(sGanttId);
 		var vType = oElement.getProcessedType();
-        if (!oElement.mRelatedShapes && !oElement.mAnchors && !GanttUtils.relationexist(this.oGantt,oElement)){
+        if ((!oElement.mRelatedShapes && !oElement.mAnchors && !GanttUtils.relationexist(this.oGantt,oElement)) || (this.oGantt.getEnablePseudoShapes() && this.mRelatedShapes.predecessor === this.mRelatedShapes.successor)){
 			return;
 		}
 		this.mRelatedShapes = oElement.mRelatedShapes;
@@ -585,7 +585,7 @@ sap.ui.define([
 	 * @returns {String} returns the operlapping Connector type for any overlap.
 	 */
 	Relationship.prototype._checkConnectorOverlap = function (sGanttId, vType, position, upDown) {
-		var oGantt = sap.ui.getCore().byId(sGanttId);
+		var oGantt = Core.byId(sGanttId);
 		var aVisibleRls = GanttUtils._getVisibleRelationships(oGantt);
 		var mRelatedShapes = this.getRelatedInRowShapes(sGanttId);
 		var isRTL = Core.getConfiguration().getRTL();

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

@@ -838,6 +838,9 @@
 				aExpandScheme = aShapeSchemes && oGantt.getShapeSchemes().filter(function(oScheme){
 					return aShapeSchemes.indexOf(oScheme.getKey()) > -1;
 				});
+				var pseudoShapeExpanded = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iRowIndex] && oGantt.oOverlapShapeIds[iRowIndex].length;
+				//loop through overlay aggregation and fetch corresponding overlay shapes and concat it to ashapeinRow array.
+				aShapesInRow = aShapesInRow.concat(AggregationUtils._fetchOverlayAggregation(oRowSetting,!bHasExpandShape || pseudoShapeExpanded,true));
 				aShapesInRow.forEach(function(aShapes, iIndex){
 				Array.isArray(aShapes) && aShapes.forEach(function(oShape){
 					if (oGantt.isShapeVisible(oShape) && !oShape.isPartOfExpandedPseudoShape) {
@@ -871,14 +874,15 @@
 
 		renderMainRowShape : function(oRm, oShape, mOption, bShowParentRow) {
 			// passing the mOption to save unnecessary calculation because of it's always the same for the row
-			this.setSpecialProperties(oShape, mOption);
+			var oGanttRowOverlayorRow  = oShape.getParent().getParent();
+			var iShapeRowIndex = oGanttRowOverlayorRow && oGanttRowOverlayorRow.isA("sap.gantt.overlays.GanttRowOverlay") ? oShape.getParentRowSettings().getParent().getIndex() : oShape.getParent().getParent().getIndex();
+			this.setSpecialProperties(oShape, mOption,iShapeRowIndex);
 			var oTable = oShape.getParentRowSettings().getParent().getParent(),
 			oGantt = oTable.getParent();
 			// render main row shap in RenderManager
 			// oShape.renderElement(oRm, oShape, null);
-			var oShapeRow = oShape.getParent().getParent(),
-			iShapeRowIndex = oShapeRow.getIndex(),
-			bIncludePseudoShape = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iShapeRowIndex] && oGantt.oOverlapShapeIds[iShapeRowIndex].length > 0;
+
+			var bIncludePseudoShape = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iShapeRowIndex] && oGantt.oOverlapShapeIds[iShapeRowIndex].length > 0;
 			if ((Object.keys(mOption.expandModel.mExpanded).indexOf(mOption.rowUid) == -1  && !mOption.rowExpanded) || bShowParentRow && (oShape.getScheme() == "" || oGantt.getPrimaryShapeScheme().getKey() == oShape.getScheme()) || (oGantt._aExpandedIndices.indexOf(iShapeRowIndex) > -1 && (bIncludePseudoShape))){
 					oShape.renderElement(oRm, oShape, null);
 
@@ -889,13 +893,12 @@
 			}
 		},
 
-		setSpecialProperties: function(oShape, mOption) {
+		setSpecialProperties: function(oShape, mOption,iShapeRowIndex) {
 			var oExpandModel = mOption.expandModel,
 				sRowUid = mOption.rowUid,
 				sShapeUid = mOption.rowSetting.getShapeUid(oShape),
 				oTable = oShape.getParentRowSettings().getParent().getParent(),
-				oGantt = oTable.getParent(),
-				iShapeRowIndex = oShape.getParent().getParent().getIndex();
+				oGantt = oTable.getParent();
 
 			if (!oShape._iBaseRowHeight) {
 				oShape._iBaseRowHeight = oExpandModel.getBaseRowHeight();
@@ -968,9 +971,18 @@
 			mOption.aExpandScheme.forEach(function(scheme){
 				aExpandSchemeKeys.push(scheme.getKey());
 			});
-			var rowIndex = oMainShape.getParent().getParent().getIndex();
+			var oGanttRowOverlayorRow  = oMainShape.getParent().getParent();
+			var rowIndex = oGanttRowOverlayorRow && oGanttRowOverlayorRow.isA("sap.gantt.overlays.GanttRowOverlay") ? oMainShape.getParentRowSettings().getParent().getIndex() : oGanttRowOverlayorRow.getIndex();
+			var aExpandableShapes, parentRowSettings = oMainShape.getParentRowSettings();
 			oGantt.oExpandedShapesMap[rowIndex] = oGantt.oExpandedShapesMap[rowIndex] ? oGantt.oExpandedShapesMap[rowIndex] : [];
-			var aExpandableShapes = oMainShape.getParent().getAllExpandableShapes(oGantt);
+			//fetch all overlay aggregation shapes and concat to expandable shapes list
+			if (oGanttRowOverlayorRow && oGanttRowOverlayorRow.isA("sap.gantt.overlays.GanttRowOverlay")){
+				var pseudoShapeExpanded = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex] && oGantt.oOverlapShapeIds[rowIndex].length;
+				var allOverlayAggr  = AggregationUtils._fetchOverlayAggregation(parentRowSettings,pseudoShapeExpanded);
+				aExpandableShapes = parentRowSettings.getAllExpandableShapes(oGantt).concat(allOverlayAggr);
+			} else {
+				aExpandableShapes = parentRowSettings.getAllExpandableShapes(oGantt);
+			}
 			aExpandableShapes.forEach(function(shape, index) {
 				if (oGantt.isShapeVisible(shape)) {
 					lastVisibleShapeIndex = index;
@@ -985,7 +997,7 @@
 					// render subshapes only after all visible shapes are rendered
 					if (bRowExpand  || !oGantt.oOverlapShapeIds[iIndex] || bPseudoExpand) {
 						var oExpShapesWithUseParentShape = function (oMainShape){
-							var aNonMultiActivityShapes = (aExpandSchemeKeys.indexOf(oMainShape.getScheme())) > -1 ? [oMainShape] : [];
+							var aNonMultiActivityShapes = ((aExpandSchemeKeys.indexOf(oMainShape.getScheme())) > -1 || aExpandSchemeKeys.length == 0) ? [oMainShape] : [];
 							var aChild = oMainShape instanceof sap.gantt.simple.MultiActivityGroup ? AggregationUtils.getNonLazyElementsByScheme(oMainShape, aExpandSchemeKeys) : aNonMultiActivityShapes;
 							oGantt.oExpandedShapesMap[rowIndex] = GanttUtils._getExpandedChildArray(aChild, oGantt, aExpandSchemeKeys, oGantt.oExpandedShapesMap[rowIndex]);
 						};
@@ -1008,7 +1020,7 @@
 					// render subshapes only after all visible shapes are rendered
 					if (bRowExpand || bPseudoExpand) {
 						var oExpShapesWithSubTasks = function (oMainShape){
-							var aNonMultiActivityShapes = (aExpandSchemeKeys.indexOf(oMainShape.getScheme())) > -1  ? [oMainShape] : [];
+							var aNonMultiActivityShapes = ((aExpandSchemeKeys.indexOf(oMainShape.getScheme())) > -1) ? [oMainShape] : [];
 								var aChild = oMainShape instanceof sap.gantt.simple.MultiActivityGroup ? AggregationUtils.getLazyElementsByScheme(oMainShape, aExpandSchemeKeys) : aNonMultiActivityShapes;
 								oGantt.oExpandedShapesMap[rowIndex] = GanttUtils._getExpandedChildArray(aChild, oGantt, aExpandSchemeKeys, oGantt.oExpandedShapesMap[rowIndex]);
 						};

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

@@ -10,8 +10,9 @@ sap.ui.define([
 	"sap/gantt/library",
 	"sap/ui/base/EventProvider",
 	"./GanttUtils",
-	"sap/gantt/misc/Utility"
-], function (library, EventProvider, GanttUtils, Utility) {
+	"sap/gantt/misc/Utility",
+	"sap/ui/core/Core"
+], function (library, EventProvider, GanttUtils, Utility, Core) {
 	"use strict";
 
 	var SelectionMode = library.SelectionMode;
@@ -283,7 +284,7 @@ sap.ui.define([
 			var aUpdatedUid = [];
 			Object.keys(this.mSelected.deSelectShapeId).forEach(function(shapeId){
 				var shapeDomRef = jQuery("[data-sap-gantt-shape-id='" + shapeId + "']").get(0),
-					shapeObj = sap.ui.getCore().byId(shapeDomRef && shapeDomRef.id);
+					shapeObj = Core.byId(shapeDomRef && shapeDomRef.id);
 				aUpdatedUid.push(shapeObj && shapeObj.getShapeUid());
 			});
 			aUid = aUpdatedUid ? aUpdatedUid : aUid;

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element'], function (Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.UtilizationChart
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 * @since 1.95
 	 *
 	 * @constructor

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

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

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

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

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

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

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/shapes/Shape.js

@@ -8,8 +8,9 @@ sap.ui.define([
 	"sap/gantt/simple/BaseShape",
 	"sap/ui/thirdparty/jquery",
 	"sap/gantt/misc/Format",
-	"sap/ui/core/theming/Parameters"
-], function (BaseShape, jQuery, Format, Parameters) {
+	"sap/ui/core/theming/Parameters",
+	"sap/ui/core/Core"
+], function (BaseShape, jQuery, Format, Parameters, Core) {
 	"use strict";
 
 	var DEFAULT_ROW_PADDING = 12;
@@ -29,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @abstract
 	 * @constructor
@@ -158,7 +159,7 @@ sap.ui.define([
 	 */
 	Shape.prototype.getHoverBackgroundColor = function () {
 		//Added for support for sap_horizon -> can think of refactoring
-		if (sap.ui.getCore().getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
+		if (Core.getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
 			return Parameters.get("sapPrimary1");
 		} else {
 			return Parameters.get("sapUiButtonHoverBackground");
@@ -174,7 +175,7 @@ sap.ui.define([
 	 */
 	Shape.prototype.getHoverColor = function () {
 		//Added for support for sap_horizon -> can think of refactoring
-		if (sap.ui.getCore().getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
+		if (Core.getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
 			return Parameters.get("sapPrimary6");
 		} else {
 			return Parameters.get("sapUiButtonHoverBorderColor");
@@ -189,7 +190,7 @@ sap.ui.define([
 	 */
 	Shape.prototype.getSelectedColor = function () {
 		//Added for support for sap_horizon -> can think of refactoring
-		if (sap.ui.getCore().getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
+		if (Core.getConfiguration().getTheme().indexOf("sap_horizon") > -1) {
 			return Parameters.get("sapPrimary2");
 		} else {
 			return Parameters.get("sapUiButtonActiveBackground");
@@ -238,7 +239,7 @@ sap.ui.define([
 		if (!oAxisTime) {
 			return 0;
 		}
-		var bRTL = sap.ui.getCore().getConfiguration().getRTL();
+		var bRTL = Core.getConfiguration().getRTL();
 		return Number(oAxisTime.timeToView(Format.abapTimestampToDate(bRTL ? (this.getEndTime() || this.getTime()) : this.getTime())));
 	};
 
@@ -256,7 +257,7 @@ sap.ui.define([
 		if (!oAxisTime) {
 			return 0;
 		}
-		var bRTL = sap.ui.getCore().getConfiguration().getRTL();
+		var bRTL = Core.getConfiguration().getRTL();
 		return Number(oAxisTime.timeToView(Format.abapTimestampToDate(bRTL ? (this.getTime() || this.getEndTime()) : this.getEndTime())));
 	};
 
@@ -316,13 +317,11 @@ sap.ui.define([
 	};
 
 	Shape.prototype.onmouseover = function (oEvent) {
-		if (!this.getHoverable()) { return; }
 		BaseShape.prototype.onmouseover.call(this, oEvent);
 		this.hoverStateChange(true);
 	};
 
 	Shape.prototype.onmouseout = function (oEvent) {
-		if (!this.getHoverable()) { return; }
 		BaseShape.prototype.onmouseout.call(this, oEvent);
 		this._bIgnoreHover = false;
 		this.hoverStateChange(false);
@@ -331,7 +330,7 @@ sap.ui.define([
 	Shape.prototype.rerenderShape = function () {
 		var oDom = this.getDomRef();
 		if (oDom) {
-			var oRm = sap.ui.getCore().createRenderManager();
+			var oRm = Core.createRenderManager();
 			this.renderContent(oRm);
 			oRm.flush(oDom);
 			oRm.destroy();

package/src/sap/gantt/simple/shapes/Task.js

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

package/src/sap/gantt/utils/GanttCustomisationUtils.js

@@ -14,7 +14,8 @@ sap.ui.define([
     "sap/m/Text",
     "sap/m/DateRangeSelection",
     "sap/gantt/misc/Format",
-    "sap/gantt/library"
+    "sap/gantt/library",
+    "sap/ui/core/Core"
 ], function (
     JSONModel,
     Button,
@@ -31,10 +32,11 @@ sap.ui.define([
     Text,
     DateRangeSelection,
     Format,
-    library) {
+    library,
+    Core) {
     'use strict';
 
-    var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.gantt");
+    var oResourceBundle = Core.getLibraryResourceBundle("sap.gantt");
     var oPalette = library.palette;
     var aColors = oPalette.SemanticColors
         .concat(oPalette.LegendColors)