@sapui5/sap.gantt 1.125.0 → 1.127.0

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define(
 	["./BaseRectangle", "./BasePath" , "sap/gantt/library"],
 	function (BaseRectangle, BasePath, library) {
@@ -14,7 +20,7 @@ sap.ui.define(
 		 * @extends sap.gantt.simple.BaseRectangle
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.127.0
      	 * @since 1.84
 		 *
 		 * @constructor

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
 	"sap/ui/core/Core",
 	"sap/gantt/library",
@@ -26,7 +32,8 @@ sap.ui.define([
 	"./FindAndSelectUtils",
 	'sap/ui/core/InvisibleText',
 	"sap/ui/core/Element",
-	"sap/ui/core/Lib"
+	"sap/ui/core/Lib",
+	"./GanttUtils"
 ], function (
 	Core,
 	library,
@@ -55,7 +62,8 @@ sap.ui.define([
 	FindAndSelectUtils,
 	InvisibleText,
 	Element,
-	Lib
+	Lib,
+	GanttUtils
 ) {
 	"use strict";
 
@@ -81,7 +89,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbar
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public
@@ -695,6 +703,13 @@ sap.ui.define([
 		return aSelectItems;
 	};
 
+	ContainerToolbar.prototype._focusOnZoom = function(iCurrentZoomLevel, iZoomLevel) {
+		var oGanttContainer = this.getParent();
+		if (oGanttContainer && oGanttContainer.isA("sap.gantt.simple.GanttChartContainer") && oGanttContainer.getEnableAutoFocusOnZoom() && iCurrentZoomLevel < iZoomLevel) {
+			GanttUtils._calculateSelectedShapeMinTime(oGanttContainer);
+		}
+	};
+
 	ContainerToolbar.prototype._genTimeZoomGroupControls = function() {
 		var ZoomControlType = library.config.ZoomControlType;
 
@@ -703,7 +718,7 @@ sap.ui.define([
 		var fnUpdateZoomLevel = function(iZoomLevel) {
 			clearTimeout(this._iLiveChangeTimer);
 			this._iLiveChangeTimer = -1;
-
+			this._focusOnZoom(this.getZoomLevel(), iZoomLevel);
 			this.setZoomLevel(iZoomLevel, true);
 		};
 

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @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.125.0
+	 * @version 1.127.0
 	 *
 	 * @private
 	 * @static

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
     "sap/ui/core/Element"
 ], function (Element) {
@@ -15,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public
@@ -48,4 +54,4 @@ sap.ui.define([
     });
 
     return CustomVariantHandler;
-});
+});

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

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

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

@@ -23,10 +23,10 @@ sap.ui.define([
 	 * @class
 	 * ExpandModel manages the internal states on expand charts
 	 *
-	 * @extends sap.gantt.simple.ExpandModel
+	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @private
@@ -69,8 +69,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, "", aShapeSchemeKeys);
 			}

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
     "./GanttUtils",
     "sap/gantt/misc/Format",

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
 	"sap/m/Dialog", "sap/ui/core/HTML"
 ], function(Dialog, HTML) {
@@ -120,4 +126,4 @@ sap.ui.define([
 
 	return FullScreenUtil;
 
-}, /* bExport= */true);
+}, /* bExport= */true);

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

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
     "sap/ui/core/CustomData"
 ], function (CustomData) {
@@ -15,7 +21,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.CustomData
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @since 1.90
 	 *
 	 * @constructor
@@ -26,4 +32,4 @@ sap.ui.define([
     var GanttAdaptationData = CustomData.extend("sap.gantt.simple.GanttAdaptationData");
 
     return GanttAdaptationData;
-});
+});

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public
@@ -203,7 +203,13 @@ sap.ui.define([
 				* This property enables the auto selection of a shape upon search and find.
 				* @experimental since 1.111
 				*/
-				enableAutoSelectOnFind: { type: "boolean", defaultValue: true}
+				enableAutoSelectOnFind: { type: "boolean", defaultValue: true},
+
+				/**
+				* This property enables auto focus while zooming in on a selected shape.
+				* @since 1.126
+				*/
+				enableAutoFocusOnZoom: { type: "boolean", defaultValue: false}
 			},
 			defaultAggregation : "ganttCharts",
 			aggregations: {

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

@@ -170,7 +170,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @since 1.60
 	 *
 	 * @constructor
@@ -353,7 +353,7 @@ sap.ui.define([
 				ghostAlignment: {type: "string", defaultValue: library.dragdrop.GhostAlignment.None},
 
 				/**
-				 * Flag to show or hide the start time and end time of a shape when you drag it along the time line. The property takes effect if only one shape is selected.
+				 * Flag to show or hide the start time and end time of a shape when you drag it along the time line. The property takes effect if only one shape is selected or <code>enableMultipleGhosts</code> is set to false.
 				 */
 				showShapeTimeOnDrag: {type: "boolean", defaultValue: false},
 
@@ -507,7 +507,7 @@ sap.ui.define([
 				selectOnlyGraphicalShape: { type: "boolean", defaultValue: false },
 
 				/**
-				 * Option to show or hide shape labels on ghost while dragging.
+				 * Option to show or hide shape labels on ghost while dragging. The property takes effect only when <code>enableMultipleGhosts</code> is set to true.
 				 * @since 1.94
 				*/
 				showTextOnGhost: {type: "boolean", defaultValue: true},
@@ -584,7 +584,13 @@ sap.ui.define([
 				 * Example: "shapes3,shapes2,shapes1" means shapes3 will be rendered at the bottom, and shapes1 will be rendered at the top
 				 * @experimental since 1.113
 				 */
-				shapeRenderOrder: {type: "string[]", defaultValue: []}
+				shapeRenderOrder: {type: "string[]", defaultValue: []},
+
+				/**
+				 * Flag to enable displaying multiple ghosts when multiple shapes are selected and dragged.
+				 * @experimental since 1.127
+				 */
+				enableMultipleGhosts: {type: "boolean", defaultValue: true}
 			},
 			aggregations: {
 				/**
@@ -3184,7 +3190,7 @@ sap.ui.define([
 		var oPrevTimelineOptionInterval = oAxisTimeStrategy._oZoom.base.timeLineOption.innerInterval,
 			oCurrentTimelineOptionInterval = oAxisTimeStrategy.getTimeLineOption().innerInterval;
 		var bChangeInInterval = (oPrevTimelineOptionInterval.unit != oCurrentTimelineOptionInterval.unit ||
-			oPrevTimelineOptionInterval.range != oCurrentTimelineOptionInterval.range ||
+			oAxisTimeStrategy._getTimeLineRange(oAxisTimeStrategy._oZoom.base.timeLineOption) != oAxisTimeStrategy._getTimeLineRange(oAxisTimeStrategy.getTimeLineOption()) ||
 			oPrevTimelineOptionInterval.span != oCurrentTimelineOptionInterval.span) && sReasonCode != "horizontalScroll" &&  sReasonCode != "jumpToPosition" &&  sReasonCode != "syncVisibleHorizon";
 		if (sReasonCode === "initialRender" || bChangeInInterval ){
 			if (!oAxisTimeStrategy.isA("sap.gantt.axistime.StepwiseZoomStrategy")) {
@@ -3872,6 +3878,7 @@ sap.ui.define([
 
 		var oPrimaryScheme = this.getPrimaryShapeScheme();
 
+		this._syncRowExpandState(vRowIndex, bExpanded, bPseudoShapeExpand);
 		this._bExpandToggled = this._oExpandModel.isTableRowHeightNeedChange(bExpanded, this.getTable(), aIndices, oPrimaryScheme, aExpandScheme);
 		if (this._bExpandToggled) {
 			if (this.getEnablePseudoShapes()){
@@ -3879,6 +3886,8 @@ sap.ui.define([
 			}
 			this._createInnerGanttRenderPromise();
 			this.getTable().invalidate();
+		} else {
+			this._syncRowExpandState(vRowIndex, !bExpanded, bPseudoShapeExpand);
 		}
 	};
 
@@ -4593,6 +4602,55 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * sync the row expand state with the row settings
+	 * @param {number} vRowIndex  row indices
+	 * @param {boolean} bExpanded whether is to expand or not
+	 * @param {boolean} bPseudoShapeExpand whether pseudo shape is enabled or not
+	 * @private
+	 */
+	GanttChartWithTable.prototype._syncRowExpandState = function(vRowIndex, bExpanded, bPseudoShapeExpand) {
+		var aRows = this.getTable().getRows(), aRowIndices = [];
+
+		if (typeof vRowIndex === "number") {
+			aRowIndices = [vRowIndex];
+		} else if (Array.isArray(vRowIndex)) {
+			aRowIndices = vRowIndex;
+		}
+
+		const iStartIndex = aRows[0].getIndex();
+
+		for (const iIndex of aRowIndices) {
+			var oRow = aRows[iIndex - iStartIndex];
+			var oRowSettings = oRow && oRow.getAggregation("_settings");
+
+			if (oRowSettings) {
+				oRowSettings._onRowExpandToggle({
+					expanded: bExpanded,
+					pseudoShapeExpand: bPseudoShapeExpand
+				});
+			}
+		}
+	};
+
+	/**
+	 * Checks if lazy loading is enabled for time synced chart
+	 * @returns {boolean} true if lazy loading is enabled for any chart in the container with timeScrollSync enabled
+	 * @private
+	 */
+	GanttChartWithTable.prototype._isLazyLoadingEnabledForSyncedChart = function () {
+		var oGanttContainer = this.getParentGanttChartContainer();
+		var bLazyLoadingEnabled = false;
+		if (oGanttContainer && oGanttContainer.getGanttCharts().length > 1 && oGanttContainer.getEnableTimeScrollSync()) {
+			oGanttContainer.getGanttCharts().forEach(function(oGanttChart) {
+				if (oGanttChart.getHorizontalLazyLoadingEnabled()) {
+					bLazyLoadingEnabled = true;
+				}
+			});
+		}
+		return bLazyLoadingEnabled;
+	};
+
 	return GanttChartWithTable;
 
 }, true);

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

@@ -100,7 +100,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttExtension
@@ -353,6 +353,10 @@ sap.ui.define([
 				endTime: oDraggedShape.getEndTime()
 			};
 
+			if (this.oSourceRow) {
+				this.oSourceRow.destroy();
+			}
+
 			//Set SourceRow = Row instance from where the shape is dragged
 			this.oSourceRow = this.getRowByShape(oDraggedShape);
 
@@ -368,11 +372,14 @@ sap.ui.define([
 					this._aVisibleDraggableShapes.push(oShape);
 				}
 			}.bind(this));
-			this.bMultipleGhosts = this._aVisibleDraggableShapes.length > 1;
+			this.bMultipleGhosts = this.getGantt().getEnableMultipleGhosts() && this._aVisibleDraggableShapes.length > 1;
 			this.mGhostLabelStyle = {};
-			this._bEnableRowHighlight = oDraggedShape.getDragHighlightRows().length > 0 && !this.bMultipleGhosts;
+			this._bEnableRowHighlight = oDraggedShape.getDragHighlightRows().length > 0 && (this._aVisibleDraggableShapes.length == 1);
 
 			DragDropHelper.addDragDropEventListeners(this.getGantt());
+		} else if (this.oSourceRow) {
+			this.oSourceRow.destroy();
+			this.oSourceRow = undefined;
 		}
 	};
 
@@ -1479,14 +1486,19 @@ sap.ui.define([
 		var oShape = Element.getElementById(oLastNode.id);
 		var bLabelFlag = !oShape && oLastNode.parentNode && Element.getElementById(oLastNode.parentNode.id) instanceof sap.gantt.simple.BaseGroup;
 		var bParentLabelFlag = !oShape && oLastNode.parentNode && oLastNode.parentNode.parentNode && Element.getElementById(oLastNode.parentNode.parentNode.id) instanceof sap.gantt.simple.BaseGroup;
+		var bEnableMultipleGhosts = this.getGantt().getEnableMultipleGhosts();
 		if (bLabelFlag){
             oShape = Element.getElementById(oLastNode.parentNode.id);
 		} else if (bParentLabelFlag){
             oShape = Element.getElementById(oLastNode.parentNode.parentNode.id);
 		}
-		if (bTargetShape && this.getGantt().getShowTextOnGhost()) {
+		if (bEnableMultipleGhosts && bTargetShape && this.getGantt().getShowTextOnGhost()) {
 			sTextDom = this._getGhostLabel(oShape, oLastNode);
 		}
+		if (!bEnableMultipleGhosts) {
+			var sNumberOfObjects = this.getNumberOfDragObject(oLastNode);
+			sTextDom = "<div id='sapGanttDragText' class='sapGanttDragTextOverlay " + oStyle.css + "'>" + sNumberOfObjects + "</div>";
+		}
 
 		if (this.bMultipleGhosts){
 			var oNode;
@@ -1507,7 +1519,7 @@ sap.ui.define([
 			"<img class='sapGanttDragGhostImg' src='" + cropedImg + "'>" + sTextDom +
 		"</div>";
 		oGhostWrapperDom.insertAdjacentHTML('beforeend', sDragGhostDom);
-		if (bTargetShape && this.getGantt().getShowTextOnGhost() && sTextDom !== "") {
+		if (bEnableMultipleGhosts && bTargetShape && this.getGantt().getShowTextOnGhost() && sTextDom !== "") {
 			this._updateGhostLabelStyle();
 		}
 	};

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

@@ -18,7 +18,7 @@ sap.ui.define([ "sap/ui/base/Object" ],function(BaseObject) {
 		 * @abstract
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.127.0
 		 * @constructor
 		 * @private
 		 * @alias sap.gantt.simple.GanttExtension

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -240,7 +240,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPointerExtension

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

@@ -83,7 +83,7 @@ function(
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPopoverExtension
@@ -158,7 +158,7 @@ function(
 	GanttPopoverExtension.prototype.onMouseDown = function(oEvent) {
 		var oSelection = this.getGantt().getSelection();
 		var iSelectedDraggableShapes = oSelection.numberOfSelectedDraggableShapes();
-		this.bMultipleShapes = iSelectedDraggableShapes > 1;
+		this.bMultipleShapes = this.getGantt().getEnableMultipleGhosts() && iSelectedDraggableShapes > 1;
 		this.pageWidth = window.innerWidth;
 		this.pageHeight = window.innerHeight;
 		PopoverHelper.addPopoverEventListeners(this.getGantt());