@sapui5/sap.gantt 1.120.6 → 1.120.7

package/src/sap/gantt/shape/ext/ubc/UbcTooltipRectangle.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Rectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ubc/UbcUnderCapacityZonePolygon.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ubc.UbcPolygon
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ubc/UbcUsedPolygon.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ubc.UbcPolygon
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ubc/UtilizationBarChart.js

@@ -104,7 +104,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Group
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcBorderPath.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Path
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcClipPath.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ClipPath
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcClipingPath.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Path
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcDimension.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Group
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcMiddleLine.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Line
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcOverCapacityZoneRectangle.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ulc.UlcRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcOverClipRectangle.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ulc.UlcRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcRectangle.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcTooltipRectangle.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ulc.UlcRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UlcUnderClipRectangle.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.ext.ulc.UlcRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ext/ulc/UtilizationLineChart.js

@@ -182,7 +182,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ function (BaseDiamond) {
 		 * @extends sap.gantt.simple.BaseDiamond
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.120.7
          * @since 1.84
 		 *
 		 * @constructor

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

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

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

@@ -232,11 +232,11 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 							if (oChild.getVisible() && oChild.renderElement){
 								if (this._isLabelText(oChild)){
 									labelGroup.push(oChild);
-								}else {
+								} else {
 									nonLabelGroup.push(oChild);
 								}
 							}
-						}else {
+						} else {
 							fnCallback(oChild);
 						}
 					}.bind(this));
@@ -245,11 +245,11 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 						if (aChild.getVisible() && aChild.renderElement ){
 							if (this._isLabelText(aChild)){
 								labelGroup.push(aChild);
-							}else {
+							} else {
 								nonLabelGroup.push(aChild);
 							}
 						}
-					}else {
+					} else {
 						fnCallback(aChild);
 					}
 				}
@@ -260,74 +260,28 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 			}
 		},
 
-
 		/**
-		 * creates overlay shape id map so that in the ongoing flow the values can be replaced by corresponding shape level.
+		 * fetch overlay aggregation shapes
 		 */
-		_createOverlayShapeIdMap : function(newAggr,oRowSettings){
-			if (newAggr && newAggr.length > 0){
-				if (!oRowSettings._overlayShapeIdList){
-					oRowSettings._overlayShapeIdList = {};
-				}
-				newAggr.forEach(function(oTask){
-					if (oTask.getOverlayShapeId()){
-						oRowSettings._overlayShapeIdList[oTask.getOverlayShapeId()] = oTask.getOverlayShapeId();
-					}
-				});
+		_fetchOverlayAggregation : function (oRowSettings, pseudoShapeExpanded, concatShapeRowArray){
+			if (!oRowSettings._overlayShapeIdList){
+				oRowSettings._overlayShapeIdList = {};
 			}
-		},
 
-		/**
-		 * @param { sap.gantt.simple.GanttRowSettings} oRowSettings gantt row settings
-		 * @param { boolean} bExpanded defines row is expanded or not
-		 * @param {sap.gantt.simple.GanttChartWithTable } oGantt ganttchart instance
-		 * destroys current aggregation and adds a new aggregation.
-		 */
-		_addExpandStaticOverlay : function(oRowSettings,bExpanded,oGantt){
-			var rowIndex  = oRowSettings.getParent().getIndex();
-			var pseudoShapeExpandArray  = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex];
-			//if pseudoshape is expanded then the dont add expand aggregation shapes.
-			if (pseudoShapeExpandArray && pseudoShapeExpandArray.length){
-				return;
-			}
-			var  aggrName, expandedOrStatic, currAggrName, newAggr, newAggrName, newAggrBinding, oLocaleBindingInfo;
-			var mBindingInfos = oGantt.getTable().getRowSettingsTemplate().mBindingInfos;
-				Object.keys(oRowSettings.getMetadata().getAllAggregations()).forEach(function(sName){
-					if (sName.indexOf("overlay") !== -1){
-						aggrName = oRowSettings.getAggregation(sName);
-						if (aggrName && aggrName[0]){
-							expandedOrStatic  = bExpanded ? aggrName[0].getExpandedOverlay() : aggrName[0].getStaticOverlay();
-							if ( expandedOrStatic.length == 0) {
-								oLocaleBindingInfo = mBindingInfos[aggrName[0].sParentAggregationName].template._oLocaleBindingInfo;
-								currAggrName = bExpanded ? "staticOverlay" : "expandedOverlay";
-								newAggrName = bExpanded ? "expandedOverlay" : "staticOverlay";
-								newAggrBinding = bExpanded ? oLocaleBindingInfo.expandedOverlay : oLocaleBindingInfo.staticOverlay;
-								//unbind current aggregation
-								aggrName[0].unbindAggregation(currAggrName);
-								if (newAggrBinding){
-									//binds new Aggregation
-									oRowSettings.getAggregation(sName)[0]._bindAddon(newAggrName,newAggrBinding);
-									newAggr = newAggrName  == "staticOverlay" ? aggrName[0].getStaticOverlay() : aggrName[0].getExpandedOverlay();
-								}
-								//creates shape id map.
-								this._createOverlayShapeIdMap(newAggr,oRowSettings);
-							}
-						}
-					}
-				}.bind(this));
-		},
-
-		/**
-		 * fetch overlay aggregation shapes
-		 */
-		_fetchOverlayAggregation : function (oRowSettings,pseudoShapeExpanded,concatShapeRowArray){
 			var allOverlayAggr = [], aShapesInRow = [], allAggregations = oRowSettings.getMetadata().getAllAggregations();
 			Object.keys(allAggregations).forEach(function(sName){
-				var sNameAgg  = oRowSettings.getAggregation(sName);allOverlayAggr = concatShapeRowArray ?  [] : allOverlayAggr;
+				var sNameAgg  = oRowSettings.getAggregation(sName); allOverlayAggr = concatShapeRowArray ?  [] : allOverlayAggr;
 				if (sName.indexOf("overlay") !== -1 && sNameAgg && sNameAgg[0]){
-					var expandedOrStatic  =  pseudoShapeExpanded ? sNameAgg[0].getStaticOverlay() : sNameAgg[0].getExpandedOverlay();
+					var expandedOrStatic = sNameAgg[0].getActiveOverlays() || [];
 					expandedOrStatic.forEach(function(obj){
-						allOverlayAggr.push(obj.getShape());
+						var oShape = obj.getShape();
+						var sShapeId = obj.getOverlayShapeId();
+
+						if (sShapeId){
+							oRowSettings._overlayShapeIdList[sShapeId] = sShapeId;
+						}
+
+						allOverlayAggr.push(oShape);
 					});
 					aShapesInRow.push(allOverlayAggr);
 				}
@@ -349,7 +303,6 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
 			return iMaxLength;
 		}
 	};
-
 	return AggregationUtils;
 
-}, /* bExport= */ true);
+}, /* bExport= */ true);

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.64
 	 *
 	 * @constructor

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

@@ -5,8 +5,8 @@
 	
  */
 sap.ui.define([
-	"sap/base/Log", "./BaseRectangle", "./BasePath", "./RenderUtils", "sap/gantt/library"
-], function(Log, BaseRectangle, BasePath, RenderUtils, library) {
+	"sap/base/Log", "./BaseRectangle", "./BasePath", "./RenderUtils", "sap/gantt/library", "sap/gantt/misc/Utility"
+], function(Log, BaseRectangle, BasePath, RenderUtils, library, Utility) {
 	"use strict";
 	var ShapeAlignment = library.simple.shapes.ShapeAlignment;
 	/**
@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public
@@ -106,10 +106,10 @@ sap.ui.define([
 	};
 
 	BaseCursor.prototype._isPropertiesValid = function (nPointHeight, nWidth, nLength,nHalflength) {
-		return jQuery.isNumeric(nPointHeight) &&
-				jQuery.isNumeric(nWidth) &&
-				jQuery.isNumeric(nLength) &&
-				jQuery.isNumeric(nHalflength);
+		return Utility.isNumeric(nPointHeight) &&
+				Utility.isNumeric(nWidth) &&
+				Utility.isNumeric(nLength) &&
+				Utility.isNumeric(nHalflength);
 	};
 
 	BaseCursor.prototype.renderElement = function () {

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

@@ -5,8 +5,8 @@
 	
  */
 sap.ui.define(
-	["./BaseShape", "./RenderUtils", "./GanttUtils", "../misc/Format", "./BaseText"],
-	function (BaseShape, RenderUtils, GanttUtils, Format, BaseText) {
+	["./BaseShape", "./RenderUtils", "./GanttUtils", "../misc/Format", "./BaseText", "sap/gantt/misc/Utility"],
+	function (BaseShape, RenderUtils, GanttUtils, Format, BaseText, Utility) {
 		"use strict";
 
 		/**
@@ -22,7 +22,7 @@ sap.ui.define(
 		 * @extends sap.gantt.simple.BaseShape
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.120.7
      	 * @since 1.84
 		 *
 		 * @constructor
@@ -190,7 +190,7 @@ sap.ui.define(
 				);
 
 			//if nRetVal is not numeric, return itself
-			if (!jQuery.isNumeric(startTime) || !jQuery.isNumeric(endTime)) {
+			if (!Utility.isNumeric(startTime) || !Utility.isNumeric(endTime)) {
 				return 0;
 			}
 

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

@@ -19,7 +19,7 @@ sap.ui.define(["./BaseRectangle", "./BasePath", "sap/gantt/misc/Utility", "sap/g
 	 * @extends sap.gantt.simple.BaseRectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseText
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.MultiActivityGroup
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @since 1.109
 	 *
 	 * @constructor

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public
@@ -163,7 +163,7 @@ sap.ui.define([
             endTime = oAxisTime.timeToView(Format.abapTimestampToDate(this.getEndTime()));
 
         //if nRetVal is not numeric, return itself
-        if (!jQuery.isNumeric(startTime) || !jQuery.isNumeric(endTime)) {
+        if (!Utility.isNumeric(startTime) || !Utility.isNumeric(endTime)) {
             return 0;
         }
 

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

@@ -16,7 +16,10 @@ sap.ui.define([
 	"./CoordinateUtils",
 	"./AggregationUtils",
 	"../misc/Format",
-	"sap/ui/core/date/UI5Date"
+	"sap/ui/core/date/UI5Date",
+	"sap/gantt/utils/GanttChartConfigurationUtils",
+	"sap/ui/core/Theming",
+	"sap/gantt/misc/Utility"
 ], function (
 	Log,
 	Device,
@@ -29,7 +32,10 @@ sap.ui.define([
 	CoordinateUtils,
 	AggregationUtils,
 	Format,
-	UI5Date
+	UI5Date,
+	GanttChartConfigurationUtils,
+	Theming,
+	Utility
 ) {
 	"use strict";
 
@@ -53,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @abstract
 	 * @constructor
@@ -484,7 +490,7 @@ sap.ui.define([
 		var oAxisTime = this.getAxisTime();
 
 		var nTimeX = oAxisTime && oAxisTime.timeToView(Format.abapTimestampToDate(vTime));
-		if (!jQuery.isNumeric(nTimeX)) {
+		if (!Utility.isNumeric(nTimeX)) {
 			Log.warning("Cannot convert time:" + vTime + " to an valid coordinate. Invalid coordinate might not get rendered at all, check the property value!");
 			return 0;
 		}

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @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.120.6
+		 * @version 1.120.7
      	 * @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.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 * @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.120.6
+	 * @version 1.120.7
 	 *
 	 * @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.120.6
+	 * @version 1.120.7
 	 *
 	 * @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.120.6
+		 * @version 1.120.7
 		 * @since 1.84
 		 *
 		 * @constructor

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.ExpandModel
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @private
@@ -68,8 +68,6 @@ sap.ui.define([
 
 			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);
 			}

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

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

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.120.7
 	 *
 	 * @constructor
 	 * @public