@sapui5/sap.gantt 1.118.0 → 1.120.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.gantt",
-  "version": "1.118.0",
+  "version": "1.120.0",
   "description": "SAPUI5 Library sap.gantt",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/gantt/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.118.0</version>
+	<version>1.120.0</version>
 
 	<documentation>UI5 library: sap.gantt</documentation>
 

package/src/sap/gantt/AdhocLine.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/GanttChart.js

@@ -87,7 +87,7 @@ function (
 	 * @extends sap.gantt.GanttChartBase
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/GanttChartBase.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -262,7 +262,7 @@ sap.ui.define([
 				 *
 				 * Restriction: It is defined as a property, and hence cannot be used in an XML view.
 				 */
-				locale: {type: "object", defaultValue: library.config.DEFAULT_LOCALE_CET},
+				locale: {type: "object", defaultValue: library.config.DEFAULT_LOCALE},
 
 				/**
 				 * Configuration of shape data names and the attribute in raw data that serves as 'id'.

package/src/sap/gantt/GanttChartContainer.js

@@ -62,7 +62,7 @@ function (
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/GanttChartWithTable.js

@@ -5,6 +5,7 @@
 	
  */
 sap.ui.define([
+	"sap/m/Label",
 	"sap/ui/performance/Measurement",
 	"sap/ui/Device",
 	"./GanttChartBase",
@@ -22,6 +23,7 @@ sap.ui.define([
 	"./eventHandler/MouseWheelHandler",
 	"sap/ui/thirdparty/d3"
 ], function (
+	Label,
 	Measurement,
 	Device,
 	GanttChartBase,
@@ -57,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.gantt.GanttChartBase
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -544,7 +546,9 @@ sap.ui.define([
 		if (aColumnConfig) {
 			for (var i = 0; i < aColumnConfig.length; i++) {
 				var oCol = new Column({
-					label: aColumnConfig[i].getTitle(),
+					label: new Label({
+						text: aColumnConfig[i].getTitle()
+					}),
 					sortProperty: aColumnConfig[i].getSortAttribute(),
 					filterProperty: aColumnConfig[i].getFilterAttribute(),
 					width: aColumnConfig[i].getWidth(),

package/src/sap/gantt/axistime/AxisTimeStrategyBase.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @abstract
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -200,7 +200,7 @@ sap.ui.define([
 				 * We recommend that you set the type of this argument to <code>sap.gantt.config.TimeHorizon</code>.
 				 * Otherwise some properties you set may not function properly.
 				 *
-				 * Default totalHorizon value is: <code>sap.gantt.config.DEFAULT_PLAN_HORIZON </code>
+				 * Default totalHorizon value is: <code>sap.gantt.config.DEFAULT_TOTAL_HORIZON </code>
 				 */
 				totalHorizon: {type: "sap.gantt.config.TimeHorizon", multiple: false},
 
@@ -221,7 +221,7 @@ sap.ui.define([
 				 * We recommend that you set the type of this argument to <code>sap.gantt.config.TimeHorizon</code>.
 				 * Otherwise some properties you set may not function properly.
 				 *
-				 * Default visible horizon value is <code>sap.gantt.config.DEFAULT_INIT_HORIZON</code>
+				 * Default visible horizon value is <code>sap.gantt.config.DEFAULT_VISIBLE_HORIZON</code>
 				 */
 				visibleHorizon: {type: "sap.gantt.config.TimeHorizon", multiple: false},
 
@@ -233,10 +233,10 @@ sap.ui.define([
 	AxisTimeStrategyBase.prototype.applySettings = function (mSettings) {
 		mSettings = mSettings || {};
 		if (!mSettings.visibleHorizon) {
-			mSettings.visibleHorizon = library.config.DEFAULT_INIT_HORIZON.clone();
+			mSettings.visibleHorizon = library.config.DEFAULT_VISIBLE_HORIZON.clone();
 		}
 		if (!mSettings.totalHorizon) {
-			mSettings.totalHorizon = library.config.DEFAULT_PLAN_HORIZON.clone();
+			mSettings.totalHorizon = library.config.DEFAULT_TOTAL_HORIZON.clone();
 		}
 		this.checkFirstDayOfWeek(mSettings);
 
@@ -400,15 +400,6 @@ sap.ui.define([
 			1, null, null,
 			oLocale, this);
 
-		var oGantt = this.getParent();
-
-		if (oGantt && oGantt.getEnableDateTimezoneFormatter) {
-			// set enable date formatter value from gantt;
-			oAxisTime._setEnableDateTimezoneFormatter(
-				oGantt.getEnableDateTimezoneFormatter()
-			);
-		}
-
 		this.setAggregation("_axisTime", oAxisTime, true);
 	};
 
@@ -788,7 +779,7 @@ sap.ui.define([
 	AxisTimeStrategyBase.prototype._onLocalizationChanged = function () {
 		this.setFirstDayOfWeek(LocaleData.getInstance(Core.getConfiguration().getLocale()).getFirstDayOfWeek());
 		var oGantt = this.getParent();
-		if (oGantt){
+		if (oGantt && oGantt.getEnablePseudoShapes && oGantt.getEnablePseudoShapes()){
 			if (!oGantt.pseudoShapeSpecificData){
 				oGantt.pseudoShapeSpecificData = {};
 			}

package/src/sap/gantt/axistime/FullScreenStrategy.js

@@ -11,7 +11,8 @@ sap.ui.define([
 	"sap/base/util/ObjectPath",
 	"./AxisTimeStrategyBase",
 	"../misc/Utility",
-	"../misc/Format"
+	"../misc/Format",
+	"sap/gantt/axistime/FullScreenTimeLineOptions"
 ], function (
 	Log,
 	library,
@@ -19,11 +20,11 @@ sap.ui.define([
 	ObjectPath,
 	AxisTimeStrategyBase,
 	Utility,
-	Format
+	Format,
+	FullScreenTimeLineOptions
 ) {
 	"use strict";
 
-	sap.gantt.axistime.FullScreenTimeLineOptions = library.config.DEFAULT_TIME_ZOOM_STRATEGY;
 
 	/**
 	 * Creates and initializes a FullScreenStrategy.
@@ -45,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.gantt.axistime.AxisTimeStrategyBase
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -58,10 +59,10 @@ sap.ui.define([
 	});
 
 	FullScreenStrategy.prototype.init = function () {
-		this.setProperty("coarsestTimeLineOption", sap.gantt.axistime.FullScreenTimeLineOptions["1month"], true);
-		this.setProperty("finestTimeLineOption", sap.gantt.axistime.FullScreenTimeLineOptions["5min"], true);
-		this.setProperty("timeLineOptions", sap.gantt.axistime.FullScreenTimeLineOptions, true);
-		this.setProperty("timeLineOption", sap.gantt.axistime.FullScreenTimeLineOptions["4day"], true);
+		this.setProperty("coarsestTimeLineOption", FullScreenTimeLineOptions["1month"], true);
+		this.setProperty("finestTimeLineOption", FullScreenTimeLineOptions["5min"], true);
+		this.setProperty("timeLineOptions", FullScreenTimeLineOptions, true);
+		this.setProperty("timeLineOption", FullScreenTimeLineOptions["4day"], true);
 		this.setProperty("zoomLevel", 0, true);
 		this.setProperty("zoomLevels", 0, true);
 		this.setProperty("mouseWheelZoomType", sap.gantt.MouseWheelZoomType.None, true);

package/src/sap/gantt/axistime/FullScreenTimeLineOptions.js

@@ -0,0 +1,6 @@
+sap.ui.define([
+	"sap/gantt/library"
+], function(library) {
+	'use strict';
+	return  library.config.DEFAULT_TIME_ZOOM_STRATEGY;
+}, true);

package/src/sap/gantt/axistime/ProportionTimeLineOptions.js

@@ -0,0 +1,6 @@
+sap.ui.define([
+	"sap/gantt/library"
+], function(library) {
+	'use strict';
+	return  library.config.DEFAULT_TIME_ZOOM_STRATEGY;
+}, true);

package/src/sap/gantt/axistime/ProportionZoomStrategy.js

@@ -13,11 +13,11 @@ sap.ui.define([
 	"sap/gantt/axistime/AxisTimeStrategyBase",
 	"sap/gantt/misc/Utility",
 	"sap/gantt/misc/Format",
-	"sap/gantt/config/TimeHorizon"
-], function (Log, library, ObjectPath, AxisTimeStrategyBase, Utility, Format, TimeHorizon) {
+	"sap/gantt/config/TimeHorizon",
+	"sap/gantt/axistime/ProportionTimeLineOptions"
+], function (Log, library, ObjectPath, AxisTimeStrategyBase, Utility, Format, TimeHorizon,ProportionTimeLineOptions) {
 	"use strict";
 
-	sap.gantt.axistime.ProportionTimeLineOptions = library.config.DEFAULT_TIME_ZOOM_STRATEGY;
 
 	/**
 	 * Creates and initializes a ProportionZoomStrategy.
@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.gantt.axistime.AxisTimeStrategyBase
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -51,10 +51,10 @@ sap.ui.define([
 
 	ProportionZoomStrategy.prototype.init = function () {
 		this._aZoomRate = new Array(10);
-		this.setProperty("coarsestTimeLineOption", sap.gantt.axistime.ProportionTimeLineOptions["1month"], true);
-		this.setProperty("finestTimeLineOption", sap.gantt.axistime.ProportionTimeLineOptions["5min"], true);
-		this.setProperty("timeLineOptions", sap.gantt.axistime.ProportionTimeLineOptions, true);
-		this.setProperty("timeLineOption", sap.gantt.axistime.ProportionTimeLineOptions["4day"], true);
+		this.setProperty("coarsestTimeLineOption", ProportionTimeLineOptions["1month"], true);
+		this.setProperty("finestTimeLineOption", ProportionTimeLineOptions["5min"], true);
+		this.setProperty("timeLineOptions", ProportionTimeLineOptions, true);
+		this.setProperty("timeLineOption", ProportionTimeLineOptions["4day"], true);
 		this.setProperty("zoomLevel", 0, true);
 		this.setProperty("zoomLevels", 10, true);
 	};

package/src/sap/gantt/axistime/StepwiseTimeLineOptions.js

@@ -0,0 +1,220 @@
+sap.ui.define([
+	"sap/gantt/library",
+	"sap/ui/core/Core"
+],function(library, Core) {
+	"use strict";
+	var oRb = Core.getLibraryResourceBundle("sap.gantt");
+
+	var TimeUnit = library.config.TimeUnit;
+
+	return {
+	"FiveMinutes": {
+		text: oRb.getText("SWZS_FIVE_MINUTES"),
+		innerInterval: {
+			unit: TimeUnit.minute,
+			span: 5,
+			range: 32 //2rem
+		},
+		largeInterval: {
+			unit: TimeUnit.hour,
+			span: 1,
+			//first label e.g.: 9AM / July 12, 2016; others e.g.: "10AM"
+			pattern: "ha / MMMM dd, yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.minute,
+			span: 5,
+			//e.g. 00, 05, ...55
+			pattern: "mm "
+		}
+	},
+	"FifteenMinutes": {
+		text: oRb.getText("SWZS_FIFTEEN_MINUTES"),
+		innerInterval: {
+			unit: TimeUnit.minute,
+			span: 15,
+			range: 48
+		},
+		largeInterval: {
+			unit: TimeUnit.hour,
+			span: 1,
+			//first label e.g.: 9AM / July 12, 2016; others e.g.: "10AM"
+			pattern: "ha / MMMM dd, yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.minute,
+			span: 15,
+			pattern: "mm "
+		}
+	},
+	"Hour": {
+		text: oRb.getText("SWZS_HOUR"),
+		innerInterval: {
+			unit: TimeUnit.hour,
+			span: 1,
+			range: 48
+		},
+		largeInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			pattern: library.config.DEFAULT_DATE_PATTERN
+		},
+		smallInterval: {
+			unit: TimeUnit.hour,
+			span: 1,
+			pattern: library.config.DEFAULT_TIME_PATTERN
+		}
+	},
+	"SixHours": {
+		text: oRb.getText("SWZS_SIX_HOURS"),
+		innerInterval: {
+			unit: TimeUnit.hour,
+			span: 6,
+			range: 64
+		},
+		largeInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			pattern: library.config.DEFAULT_DATE_PATTERN
+		},
+		smallInterval: {
+			unit: TimeUnit.hour,
+			span: 6,
+			pattern: library.config.DEFAULT_TIME_PATTERN
+		}
+	},
+	"DayDate": {
+		text: oRb.getText("SWZS_DATE_1"),
+		innerInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			range: 64
+		},
+		largeInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			//first label e.g.: Jan 2015, Week 04; others e.g. Feb, Mar...
+			pattern: oRb.getText("SWZS_DATE_PATTERN", ["LLL yyyy, '", "' ww  "])
+		},
+		smallInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			//e.g. Mon 22, Tue 23
+			pattern: Core.getConfiguration().getRTL() ? "dd EEE " : "EEE dd "
+		}
+	},
+	"Date": {
+		text: oRb.getText("SWZS_DATE_2"),
+		innerInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			range: 32
+		},
+		largeInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			//first label e.g.: Jan 2015, Week 04; others e.g. Feb, Mar...
+			pattern: oRb.getText("SWZS_DATE_PATTERN", ["LLL yyyy, '", "' ww  "])
+		},
+		smallInterval: {
+			unit: TimeUnit.day,
+			span: 1,
+			pattern: "dd "
+		}
+	},
+	"CWWeek": {
+		text: oRb.getText("SWZS_WEEK_1"),
+		innerInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			range: 56
+		},
+		largeInterval: {
+			unit: TimeUnit.month,
+			span: 1,
+			//first label: Jan 2015, others: Feb, Mar...
+			pattern: "LLL yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			//e.g. CW 01, CW 02...
+			pattern: "'" + oRb.getText("SWZS_CW") + "' ww  "
+		}
+	},
+	"WeekOfYear": {
+		text: oRb.getText("SWZS_WEEK_2"),
+		innerInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			range: 32
+		},
+		largeInterval: {
+			unit: TimeUnit.month,
+			span: 1,
+			//first label: Jan 2015, others: Feb, Mar...
+			pattern: "LLL yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.week,
+			span: 1,
+			//e.g. 01, 02..., 53
+			pattern: "ww "
+		}
+	},
+	"Month": {
+		text: oRb.getText("SWZS_MONTH"),
+		innerInterval: {
+			unit: TimeUnit.day,
+			span: 30,
+			range: 48
+		},
+		largeInterval: {
+			unit: TimeUnit.month,
+			span: 3,
+			pattern: "yyyy QQQ "
+		},
+		smallInterval: {
+			unit: TimeUnit.month,
+			span: 1,
+			pattern: "LLL "
+		}
+	},
+	"Quarter": {
+		text: oRb.getText("SWZS_QUARTER"),
+		innerInterval: {
+			unit: TimeUnit.day,
+			span: 90,
+			range: 48
+		},
+		largeInterval: {
+			unit: TimeUnit.year,
+			span: 1,
+			//first label: 2015, Q1, others Q2, Q3, Q4, 2016 Q1, Q2...
+			pattern: "yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.month,
+			span: 3,
+			pattern: "QQQ "
+		}
+	},
+	"Year": {
+		text: oRb.getText("SWZS_YEAR"),
+		innerInterval: {
+			unit: TimeUnit.day,
+			span: 360,
+			range: 48
+		},
+		largeInterval: {
+			unit: TimeUnit.year,
+			span: 5,
+			pattern: "yyyy "
+		},
+		smallInterval: {
+			unit: TimeUnit.year,
+			span: 1,
+			pattern: "yyyy "
+		}
+	}
+};}, true);