@sapui5/sap.gantt 1.125.0 → 1.127.0

package/src/sap/gantt/misc/AxisTime.js

@@ -42,25 +42,61 @@ sap.ui.define([
 	 */
 
 	var AxisTime = BaseObject.extend("sap.gantt.misc.AxisTime", {
-        constructor : function (timeRange, viewRange, zoomRate, zoomOrigin, viewOffset, locale, oZoomStrategy) {
-            BaseObject.call(this);
-            this.scale = d3.time.scale().domain(timeRange).range(viewRange).clamp(false);
+		constructor : function (timeRange, viewRange, zoomRate, zoomOrigin, viewOffset, locale, oZoomStrategy) {
+			BaseObject.call(this);
 
-            this.timeRange = timeRange;
-            this.viewRange = viewRange;
+			this.timeRange = timeRange;
+			this.viewRange = viewRange;
 
-            this.zoomRate = Utility.assign(zoomRate, 1);
-            this.zoomOrigin = Utility.assign(zoomOrigin, 0);
+			this.zoomRate = Utility.assign(zoomRate, 1);
+			this.zoomOrigin = Utility.assign(zoomOrigin, 0);
 
-            this.viewOffset = Utility.assign(viewOffset, 0);
+			this.viewOffset = Utility.assign(viewOffset, 0);
 
-            this.locale = locale;
-            this._shapeWidthValue = Memoizer.createCache();
-            this.timeZoneOffset = 0;
+			this.locale = locale;
+			this._shapeWidthValue = Memoizer.createCache();
+			this.timeZoneOffset = 0;
 
-            this._oZoomStrategy = oZoomStrategy;
-        }
-    });
+			this._oZoomStrategy = oZoomStrategy;
+
+			if (oZoomStrategy) {
+				this._discontinuityProviderInstance = oZoomStrategy.getProperty("_discontinuousProvider");
+				this.timelineOption = oZoomStrategy.getTimeLineOption();
+			}
+
+			this.continuousScale = d3.time.scale().domain(timeRange).range(viewRange).clamp(false);
+			this.discontinuousScale = null;
+
+			if (this._discontinuityProviderInstance) {
+				this.discontinuousScale = window.fc.scaleDiscontinuous(
+					d3.time.scale()
+						.domain(timeRange)
+						.range(viewRange)
+						.clamp(false)
+				).discontinuityProvider(this._discontinuityProviderInstance)
+					.domain(timeRange)
+					.range(viewRange)
+					.clamp(false);
+			}
+
+			Object.defineProperty(this, 'scale', {
+				get: function () {
+					if (this._discontinuityProviderInstance && this._discontinuityProviderInstance.useDiscontinuousScale(this.timelineOption.smallInterval.unit)) {
+						return this.discontinuousScale;
+					}
+					return this.continuousScale;
+				}
+			});
+			Object.defineProperty(this, 'discontinuityProvider', {
+				get: function () {
+					if (this._discontinuityProviderInstance && this._discontinuityProviderInstance.useDiscontinuousScale(this.timelineOption.smallInterval.unit)) {
+						return this._discontinuityProviderInstance;
+					}
+					return null;
+				}
+			});
+		}
+	});
 
 	/*
 	 * Constants
@@ -125,7 +161,12 @@ sap.ui.define([
 			this._shapeWidthValue.clearCache();
 		}
 		this.timeRange = timeRange;
-		this.scale.domain(timeRange);
+		this.continuousScale.domain(timeRange);
+
+		if (this.discontinuousScale) {
+			this.discontinuousScale.domain(timeRange);
+		}
+
 		return this;
 	};
 
@@ -138,7 +179,7 @@ sap.ui.define([
 	 */
 
 	AxisTime.prototype.getTimeRange = function(){
-		return this.scale.domain();
+		return this.continuousScale.domain();
 	};
 
 	/**
@@ -169,9 +210,14 @@ sap.ui.define([
 	 * @public
 	 */
 
-	AxisTime.prototype.setViewRange = function(viewRange){
+	AxisTime.prototype.setViewRange = function (viewRange, timelineOption){
 		this.viewRange = viewRange;
-		this.scale.range(viewRange);
+		this.timelineOption = timelineOption;
+		this.continuousScale.range(viewRange);
+
+		if (this.discontinuousScale) {
+			this.discontinuousScale.range(viewRange);
+		}
 		return this;
 	};
 
@@ -184,7 +230,7 @@ sap.ui.define([
 	 */
 
 	AxisTime.prototype.getViewRange = function(){
-		var range = this.scale.range();
+		var range = this.continuousScale.range();
 		return [Math.round((range[0] - this.zoomOrigin) * this.zoomRate - this.viewOffset),
 		        Math.round((range[1] - this.zoomOrigin) * this.zoomRate - this.viewOffset)];
 	};
@@ -731,7 +777,7 @@ sap.ui.define([
 			return visibleScale.ticks(ObjectPath.get(oTimeInterval.unit).range, oTimeInterval.span);
 		}
 		//when time interval is week
-		var aWeekFirstDays = [
+		var aWeekDays = [
 			"d3.time.sunday",
 			"d3.time.monday",
 			"d3.time.tuesday",
@@ -740,7 +786,12 @@ sap.ui.define([
 			"d3.time.friday",
 			"d3.time.saturday"
 		];
-		return visibleScale.ticks(ObjectPath.get(aWeekFirstDays[this.getZoomStrategy().getFirstDayOfWeek()]).range, oTimeInterval.span);
+
+		var firstDayOfWeek = this.getZoomStrategy().getFirstDayOfWeek();
+		var discontinuityProviderInstance = (this.discontinuityProvider || {});
+		var aWeekFirstDay = "firstTradingDayOfWeek" in discontinuityProviderInstance ? discontinuityProviderInstance.firstTradingDayOfWeek(firstDayOfWeek) : firstDayOfWeek;
+
+		return visibleScale.ticks(ObjectPath.get(aWeekDays[aWeekFirstDay]).range, oTimeInterval.span);
 	};
 
 	AxisTime.prototype._calculateScale = function(timeRangeSet, viewRangeSet, timeRange, viewRange, localTimeRange){
@@ -763,7 +814,7 @@ sap.ui.define([
 				}
 			}
 		} else if (localTimeRange) {
-			visibleScale = new AxisTime(localTimeRange, this.viewRange, this.zoomRate, this.zoomOrigin, this.viewOffset, null).scale;
+			visibleScale = new AxisTime(localTimeRange, this.viewRange, this.zoomRate, this.zoomOrigin, this.viewOffset, null, this._oZoomStrategy).scale;
 		} else {
 			timeRange = [
 				this.convertToTimezone(timeRange[0]),
@@ -772,6 +823,13 @@ sap.ui.define([
 
 			visibleScale = new AxisTime(timeRange, viewRange, this.zoomRate, this.zoomOrigin, this.viewOffset, null, this._oZoomStrategy).scale;
 		}
+		if (this.discontinuityProvider) {	// increase visibleScale domain so that first tick renders properly
+			var oTotalHorizonStartTime = Format.abapTimestampToDate(this._oZoomStrategy.getTotalHorizon().getStartTime());
+			if (visibleScale.domain()[0].getTime() == this._discontinuityProviderInstance.clampUp(oTotalHorizonStartTime).getTime()) {
+				var oEndTime = visibleScale.domain()[1];
+				visibleScale.domain([this._discontinuityProviderInstance.clampDown(oTotalHorizonStartTime), oEndTime]);
+			}
+		}
 		var retVal = {"viewRangeSet": viewRangeSet, "visibleScale" : visibleScale, "dstScale" : dstScale, "normalScale" : normalScale};
 		return retVal;
 	};

package/src/sap/gantt/misc/Format.js

@@ -71,7 +71,7 @@ sap.ui.define([
 					sTimestamp.substr(10, 2),
 					sTimestamp.substr(12, 2));
 			//In case ts is in format of "Fri Jun 12 2015 08:00:00 GMT+0800 (China Standard Time)"
-			if (!jQuery.isNumeric(date.getTime())){
+			if (isNaN(date.getTime())){
 				date = new Date(sTimestamp);
 				//In case ts is in ISO format of "2021-04-19T17:13:10.000Z"
 				if (!isNaN(date.getTime()) && (date.toISOString() === sTimestamp)) {
@@ -85,7 +85,7 @@ sap.ui.define([
 				}
 			}
 			return date;
-		} else if (jQuery.type(sTimestamp) === "date"){
+		} else if (sTimestamp instanceof Date){
 			return sTimestamp;
 		}
 		return null;

package/src/sap/gantt/misc/Memoizer.js

@@ -13,7 +13,7 @@ sap.ui.define([
 	 * Caching the values of control and returning them when the same inputs are used again.
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @private
      * @alias sap.gantt.misc.Memoizer

package/src/sap/gantt/misc/RelativeTimeFormatter.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @param {string} sPrefix the prefix of the time label
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/gantt/misc/ShapeManager.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @param {int} oGantt <code>sap.gantt.GanttChartBase</code>
 	 *

package/src/sap/gantt/misc/Utility.js

@@ -560,5 +560,16 @@ sap.ui.define([
 		return oFormatter.format(oDate, sLocalTimezone);
 	};
 
+	/**
+	* @param {object} value value to be checked
+	* @returns {boolean} returns whether the given value is coercible to number
+	*/
+	Utility.isNumeric = function (value) {
+		var type = typeof value;
+
+		return (type === "number" || type === "string") &&
+			(value - parseFloat(value) + 1) >= 0;
+	};
+
 	return Utility;
 }, /* bExport= */ true);

package/src/sap/gantt/overlays/GanttRowOverlay.js

@@ -21,7 +21,7 @@ sap.ui.define(
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.127.0
 		 * @since 1.120
 		 * @experimental since 1.120
 		 *
@@ -59,26 +59,90 @@ sap.ui.define(
 		);
 
 		GanttRowOverlay.prototype.init = function () {
-			this._oLocaleBindingInfo = {};
+			if (!this._oLocalBindingInfo) {
+				this._oLocalBindingInfo = {};
+			}
+
+			Element.prototype.init.apply(this, arguments);
 		};
 
-		/**
-		 * bindAggregation method of element is stored to add expanded shapes when actual expand is called.
-		 */
-		GanttRowOverlay.prototype._bindAddon = Element.prototype.bindAggregation;
+		GanttRowOverlay.prototype.setParent = function (oParent) {
+			if (oParent) {
+				oParent.addEventDelegate({
+					onRowExpanded: () => this.setExpanded(true),
+					onRowCollapsed: () => this.setExpanded(false)
+				}, this);
 
-		/**
-		 * @param {string} sName Name of a public aggregation to bind
-		 * @param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo Binding info
-		 * BindAggregation is overriden so that only staticOverlay aggregation's shapes are added by default.
-		 */
-		GanttRowOverlay.prototype.bindAggregation = function(sName, oBindingInfo){
-			if (oBindingInfo){
-				this._oLocaleBindingInfo[sName] = oBindingInfo;
-				if (sName == "staticOverlay"){
-					this._bindAddon(sName,oBindingInfo);
+				this.setExpanded(oParent._isExpanded());
+			}
+
+			Element.prototype.setParent.apply(this, arguments);
+		};
+
+		GanttRowOverlay.prototype.setExpanded = function (bExpanded) {
+			this._bExpanded = bExpanded;
+
+			if (this._bExpanded) {
+				this.unbindAggregation("staticOverlay");
+				this.bindAggregation("expandedOverlay");
+			} else {
+				this.unbindAggregation("expandedOverlay");
+				this.bindAggregation("staticOverlay");
+			}
+		};
+
+		GanttRowOverlay.prototype.getActiveOverlays = function () {
+			if (this._bExpanded) {
+				return this.getAggregation("expandedOverlay");
+			} else {
+				return this.getAggregation("staticOverlay");
+			}
+		};
+
+		GanttRowOverlay.prototype.unbindAggregation = function (sName) {
+			var oBindingInfo = this.getBindingInfo(sName);
+
+			if (oBindingInfo && this._oLocalBindingInfo) {
+				this._oLocalBindingInfo[sName] = oBindingInfo;
+			}
+
+			Element.prototype.unbindAggregation.apply(this, [sName]);
+		};
+
+		GanttRowOverlay.prototype.bindAggregation = function (sName, oBindingInfo) {
+			if (!oBindingInfo && this._oLocalBindingInfo) {
+				oBindingInfo = this._oLocalBindingInfo[sName];
+			}
+
+			if (oBindingInfo) {
+				Element.prototype.bindAggregation.apply(this, [sName, oBindingInfo]);
+			}
+		};
+
+		GanttRowOverlay.prototype.clone = function () {
+			var oClone = Element.prototype.clone.call(this);
+
+			oClone._oLocalBindingInfo = {};
+
+			if (this._oLocalBindingInfo !== undefined) {
+				const staticInfo = this._oLocalBindingInfo["staticOverlay"];
+				const expandedInfo = this._oLocalBindingInfo["expandedOverlay"];
+
+				if (staticInfo) {
+					oClone._oLocalBindingInfo["staticOverlay"] = Object.assign({}, staticInfo);
+				}
+
+				if (expandedInfo) {
+					oClone._oLocalBindingInfo["expandedOverlay"] = Object.assign({}, expandedInfo);
 				}
 			}
+
+			oClone._bExpanded = this._bExpanded;
+
+			oClone.unbindAggregation("staticOverlay");
+			oClone.unbindAggregation("expandedOverlay");
+
+			return oClone;
 		};
 
 

package/src/sap/gantt/overlays/Overlay.js

@@ -23,7 +23,7 @@ sap.ui.define(
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.125.0
+		 * @version 1.127.0
 		 * @since 1.120
 		 * @experimental since 1.120
 		 *

package/src/sap/gantt/polyfills/lib.js

@@ -1,6 +1,12 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
 	"sap/gantt/library",
-	"./time"
+	"sap/gantt/polyfills/time"
 ], function (library, time) {
 	"use strict";
 

package/src/sap/gantt/polyfills/time.js

@@ -1,11 +1,17 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([
-	"./time-utils/day",
-	"./time-utils/days",
-	"./time-utils/millisecond",
-	"./time-utils/monday",
-	"./time-utils/saturday",
-	"./time-utils/weeks",
-	"./time-utils/dayCount"
+	"./timeUtils/day",
+	"./timeUtils/days",
+	"./timeUtils/millisecond",
+	"./timeUtils/monday",
+	"./timeUtils/saturday",
+	"./timeUtils/weeks",
+	"./timeUtils/dayCount"
 ], function (day, days, millisecond, monday, saturday, weeks, dayCount) {
 	"use strict";
 

package/src/sap/gantt/polyfills/timeUtils/day.js

@@ -0,0 +1,13 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
+sap.ui.define([
+	"sap/ui/thirdparty/d3"
+], function () {
+	"use strict";
+
+	return d3.time.day;
+});

package/src/sap/gantt/polyfills/{time-utils → timeUtils}/dayCount.js

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([], function () {
 	"use strict";
 
@@ -15,7 +21,7 @@ sap.ui.define([], function () {
 		t0.setHours(0, 0, 0, 0);
 		t1.setHours(0, 0, 0, 0);
 
-		return Math.floor((end - start - (end.getTimezoneOffset() - start.getTimezoneOffset()) * durationMinute) / durationDay);
+		return Math.floor((t1 - t0 - (t1.getTimezoneOffset() - t0.getTimezoneOffset()) * durationMinute) / durationDay);
 	}
 
 	return count;

package/src/sap/gantt/polyfills/timeUtils/days.js

@@ -0,0 +1,13 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
+sap.ui.define([
+	"sap/ui/thirdparty/d3"
+], function () {
+	"use strict";
+
+	return d3.time.days;
+});

package/src/sap/gantt/polyfills/{time-utils → timeUtils}/interval.js

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define([], function () {
 	"use strict";
 

package/src/sap/gantt/polyfills/{time-utils → timeUtils}/millisecond.js

@@ -1,3 +1,9 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
 sap.ui.define(["./interval"], function (interval) {
 	"use strict";
 

package/src/sap/gantt/polyfills/timeUtils/monday.js

@@ -0,0 +1,13 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
+sap.ui.define([
+	"sap/ui/thirdparty/d3"
+], function () {
+	"use strict";
+
+	return d3.time.monday;
+});

package/src/sap/gantt/polyfills/timeUtils/saturday.js

@@ -0,0 +1,13 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
+sap.ui.define([
+	"sap/ui/thirdparty/d3"
+], function () {
+	"use strict";
+
+	return d3.time.saturday;
+});

package/src/sap/gantt/polyfills/timeUtils/weeks.js

@@ -0,0 +1,13 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+
+		(c) Copyright 2009-2015 SAP SE. All rights reserved
+	
+ */
+sap.ui.define([
+	"sap/ui/thirdparty/d3"
+], function () {
+	"use strict";
+
+	return d3.time.weeks;
+});

package/src/sap/gantt/shape/Circle.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ClipPath.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Definitions.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Group.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Image.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Line.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Path.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Polygon.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Polyline.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Rectangle.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/ResizeShadowShape.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @extends sap.gantt.shape.Path
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/SelectedShape.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @extends sap.gantt.shape.Path
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Shape.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/Text.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extend sap.gantt.shape.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/shape/cal/Calendar.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.gantt.shape.Rectangle
 	 *
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.127.0
 	 *
 	 * @constructor
 	 * @public