@sapui5/sap.gantt 1.125.0 → 1.127.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/sap/gantt/.library +6 -1
- package/src/sap/gantt/AdhocLine.js +1 -1
- package/src/sap/gantt/GanttChart.js +1 -1
- package/src/sap/gantt/GanttChartBase.js +1 -1
- package/src/sap/gantt/GanttChartContainer.js +1 -1
- package/src/sap/gantt/GanttChartWithTable.js +1 -1
- package/src/sap/gantt/axistime/AxisTimeStrategyBase.js +58 -8
- package/src/sap/gantt/axistime/FullScreenStrategy.js +1 -1
- package/src/sap/gantt/axistime/FullScreenTimeLineOptions.js +7 -1
- package/src/sap/gantt/axistime/ProportionTimeLineOptions.js +7 -1
- package/src/sap/gantt/axistime/ProportionZoomStrategy.js +1 -1
- package/src/sap/gantt/axistime/StepwiseTimeLineOptions.js +7 -1
- package/src/sap/gantt/axistime/StepwiseZoomStrategy.js +10 -4
- package/src/sap/gantt/changeHandlers/simple/AdhocLine.js +1 -1
- package/src/sap/gantt/changeHandlers/simple/DeltaLine.js +1 -1
- package/src/sap/gantt/changeHandlers/simple/GanttChartContainer.js +1 -1
- package/src/sap/gantt/changeHandlers/simple/GanttChartWithTable.js +1 -1
- package/src/sap/gantt/config/BirdEyeGroup.js +1 -1
- package/src/sap/gantt/config/ChartScheme.js +1 -1
- package/src/sap/gantt/config/ColumnAttribute.js +1 -1
- package/src/sap/gantt/config/ContainerLayout.js +1 -1
- package/src/sap/gantt/config/ExpandChart.js +1 -1
- package/src/sap/gantt/config/ExpandChartGroup.js +1 -1
- package/src/sap/gantt/config/GanttChartLayout.js +1 -1
- package/src/sap/gantt/config/Hierarchy.js +1 -1
- package/src/sap/gantt/config/HierarchyColumn.js +1 -1
- package/src/sap/gantt/config/LayoutGroup.js +1 -1
- package/src/sap/gantt/config/Locale.js +1 -1
- package/src/sap/gantt/config/Mode.js +1 -1
- package/src/sap/gantt/config/ModeGroup.js +1 -1
- package/src/sap/gantt/config/ObjectType.js +1 -1
- package/src/sap/gantt/config/SettingGroup.js +1 -1
- package/src/sap/gantt/config/SettingItem.js +1 -1
- package/src/sap/gantt/config/Shape.js +1 -1
- package/src/sap/gantt/config/TimeAxis.js +1 -1
- package/src/sap/gantt/config/TimeHorizon.js +1 -1
- package/src/sap/gantt/config/TimeZoomGroup.js +1 -1
- package/src/sap/gantt/config/ToolbarGroup.js +1 -1
- package/src/sap/gantt/config/ToolbarScheme.js +1 -1
- package/src/sap/gantt/control/Cell.js +1 -1
- package/src/sap/gantt/def/DefBase.js +1 -1
- package/src/sap/gantt/def/SvgDefs.js +1 -1
- package/src/sap/gantt/def/cal/Calendar.js +1 -1
- package/src/sap/gantt/def/cal/CalendarDefs.js +1 -1
- package/src/sap/gantt/def/cal/TimeInterval.js +1 -1
- package/src/sap/gantt/def/filter/MorphologyFilter.js +1 -1
- package/src/sap/gantt/def/gradient/LinearGradient.js +1 -1
- package/src/sap/gantt/def/gradient/RadialGradient.js +1 -1
- package/src/sap/gantt/def/gradient/Stop.js +1 -1
- package/src/sap/gantt/def/pattern/BackSlashPattern.js +1 -1
- package/src/sap/gantt/def/pattern/PatternBase.js +1 -1
- package/src/sap/gantt/def/pattern/SlashPattern.js +1 -1
- package/src/sap/gantt/drawer/AdhocLine.js +1 -1
- package/src/sap/gantt/drawer/Drawer.js +1 -1
- package/src/sap/gantt/drawer/Legend.js +6 -0
- package/src/sap/gantt/drawer/VerticalLine.js +1 -1
- package/src/sap/gantt/eventHandler/AutoScrollHandler.js +1 -1
- package/src/sap/gantt/eventHandler/BirdEyeHandler.js +7 -1
- package/src/sap/gantt/eventHandler/MouseWheelHandler.js +1 -1
- package/src/sap/gantt/eventHandler/ShapeHoverHandler.js +1 -1
- package/src/sap/gantt/eventHandler/ShapeResizeHandler.js +1 -1
- package/src/sap/gantt/eventHandler/TimePeriodZoomHandler.js +1 -1
- package/src/sap/gantt/eventHandler/TimePopoverHandler.js +1 -1
- package/src/sap/gantt/flexibility/simple/AdhocLine.flexibility.js +7 -1
- package/src/sap/gantt/flexibility/simple/DeltaLine.flexibility.js +7 -1
- package/src/sap/gantt/flexibility/simple/GanttChartWithTable.flexibility.js +7 -1
- package/src/sap/gantt/flexibility/simple/GanttTableColumn.flexibility.js +6 -7
- package/src/sap/gantt/layouts/SidePanel.js +1 -1
- package/src/sap/gantt/legend/DimensionLegend.js +1 -1
- package/src/sap/gantt/legend/LegendBase.js +1 -1
- package/src/sap/gantt/legend/LegendContainer.js +1 -1
- package/src/sap/gantt/legend/ListLegend.js +1 -1
- package/src/sap/gantt/library.js +13 -3
- package/src/sap/gantt/messagebundle.properties +8 -2
- package/src/sap/gantt/messagebundle_sh.properties +30 -30
- package/src/sap/gantt/misc/AxisOrdinal.js +1 -1
- package/src/sap/gantt/misc/AxisTime.js +80 -22
- package/src/sap/gantt/misc/Format.js +2 -2
- package/src/sap/gantt/misc/Memoizer.js +1 -1
- package/src/sap/gantt/misc/RelativeTimeFormatter.js +1 -1
- package/src/sap/gantt/misc/ShapeManager.js +1 -1
- package/src/sap/gantt/misc/Utility.js +11 -0
- package/src/sap/gantt/overlays/GanttRowOverlay.js +80 -16
- package/src/sap/gantt/overlays/Overlay.js +1 -1
- package/src/sap/gantt/polyfills/lib.js +7 -1
- package/src/sap/gantt/polyfills/time.js +13 -7
- package/src/sap/gantt/polyfills/timeUtils/day.js +13 -0
- package/src/sap/gantt/polyfills/{time-utils → timeUtils}/dayCount.js +7 -1
- package/src/sap/gantt/polyfills/timeUtils/days.js +13 -0
- package/src/sap/gantt/polyfills/{time-utils → timeUtils}/interval.js +6 -0
- package/src/sap/gantt/polyfills/{time-utils → timeUtils}/millisecond.js +6 -0
- package/src/sap/gantt/polyfills/timeUtils/monday.js +13 -0
- package/src/sap/gantt/polyfills/timeUtils/saturday.js +13 -0
- package/src/sap/gantt/polyfills/timeUtils/weeks.js +13 -0
- package/src/sap/gantt/shape/Circle.js +1 -1
- package/src/sap/gantt/shape/ClipPath.js +1 -1
- package/src/sap/gantt/shape/Definitions.js +1 -1
- package/src/sap/gantt/shape/Group.js +1 -1
- package/src/sap/gantt/shape/Image.js +1 -1
- package/src/sap/gantt/shape/Line.js +1 -1
- package/src/sap/gantt/shape/Path.js +1 -1
- package/src/sap/gantt/shape/Polygon.js +1 -1
- package/src/sap/gantt/shape/Polyline.js +1 -1
- package/src/sap/gantt/shape/Rectangle.js +1 -1
- package/src/sap/gantt/shape/ResizeShadowShape.js +1 -1
- package/src/sap/gantt/shape/SelectedShape.js +1 -1
- package/src/sap/gantt/shape/Shape.js +1 -1
- package/src/sap/gantt/shape/Text.js +1 -1
- package/src/sap/gantt/shape/cal/Calendar.js +1 -1
- package/src/sap/gantt/shape/ext/Chevron.js +1 -1
- package/src/sap/gantt/shape/ext/Cursor.js +1 -1
- package/src/sap/gantt/shape/ext/Diamond.js +1 -1
- package/src/sap/gantt/shape/ext/Iconfont.js +1 -1
- package/src/sap/gantt/shape/ext/Pentangle.js +1 -1
- package/src/sap/gantt/shape/ext/TextRepeat.js +1 -1
- package/src/sap/gantt/shape/ext/Triangle.js +1 -1
- package/src/sap/gantt/shape/ext/rls/Relationship.js +1 -1
- package/src/sap/gantt/shape/ext/rls/SelectedRelationship.js +2 -2
- package/src/sap/gantt/shape/ext/ubc/UbcBorderPath.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcOverCapacityZonePolygon.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcPolygon.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcShortageCapacityPolygon.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcTooltipRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcUnderCapacityZonePolygon.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UbcUsedPolygon.js +1 -1
- package/src/sap/gantt/shape/ext/ubc/UtilizationBarChart.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcBorderPath.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcClipPath.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcClipingPath.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcDimension.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcMiddleLine.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcOverCapacityZoneRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcOverClipRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcTooltipRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UlcUnderClipRectangle.js +1 -1
- package/src/sap/gantt/shape/ext/ulc/UtilizationLineChart.js +1 -1
- package/src/sap/gantt/simple/AdhocDiamond.js +1 -1
- package/src/sap/gantt/simple/AdhocLine.js +1 -1
- package/src/sap/gantt/simple/AggregationUtils.js +11 -58
- package/src/sap/gantt/simple/BaseCalendar.js +1 -1
- package/src/sap/gantt/simple/BaseChevron.js +1 -1
- package/src/sap/gantt/simple/BaseConditionalShape.js +1 -1
- package/src/sap/gantt/simple/BaseCursor.js +7 -7
- package/src/sap/gantt/simple/BaseDeltaRectangle.js +7 -4
- package/src/sap/gantt/simple/BaseDiamond.js +1 -1
- package/src/sap/gantt/simple/BaseGroup.js +1 -1
- package/src/sap/gantt/simple/BaseImage.js +1 -1
- package/src/sap/gantt/simple/BaseLine.js +1 -1
- package/src/sap/gantt/simple/BasePath.js +1 -1
- package/src/sap/gantt/simple/BasePseudoShape.js +1 -1
- package/src/sap/gantt/simple/BaseRectangle.js +5 -2
- package/src/sap/gantt/simple/BaseShape.js +7 -5
- package/src/sap/gantt/simple/BaseText.js +1 -1
- package/src/sap/gantt/simple/BaseTriangle.js +7 -1
- package/src/sap/gantt/simple/ContainerToolbar.js +19 -4
- package/src/sap/gantt/simple/ContainerToolbarPlaceholder.js +1 -1
- package/src/sap/gantt/simple/CoordinateUtils.js +1 -1
- package/src/sap/gantt/simple/CustomVariantHandler.js +8 -2
- package/src/sap/gantt/simple/DeltaLine.js +1 -1
- package/src/sap/gantt/simple/ExpandModel.js +2 -4
- package/src/sap/gantt/simple/FindAndSelectUtils.js +6 -0
- package/src/sap/gantt/simple/FullScreenUtil.js +7 -1
- package/src/sap/gantt/simple/GanttAdaptationData.js +8 -2
- package/src/sap/gantt/simple/GanttChartContainer.js +8 -2
- package/src/sap/gantt/simple/GanttChartWithTable.js +63 -5
- package/src/sap/gantt/simple/GanttDragDropExtension.js +17 -5
- package/src/sap/gantt/simple/GanttExtension.js +1 -1
- package/src/sap/gantt/simple/GanttHeader.js +1 -1
- package/src/sap/gantt/simple/GanttPointerExtension.js +1 -1
- package/src/sap/gantt/simple/GanttPopoverExtension.js +2 -2
- package/src/sap/gantt/simple/GanttPrinting.js +313 -198
- package/src/sap/gantt/simple/GanttRowAction.js +1 -1
- package/src/sap/gantt/simple/GanttRowSettings.js +30 -1
- package/src/sap/gantt/simple/GanttScrollExtension.js +20 -5
- package/src/sap/gantt/simple/GanttSearchSidePanel.js +7 -1
- package/src/sap/gantt/simple/GanttUtils.js +86 -1
- package/src/sap/gantt/simple/GanttZoomExtension.js +4 -4
- package/src/sap/gantt/simple/InnerGanttChart.js +1 -1
- package/src/sap/gantt/simple/LegendContainer.js +1 -1
- package/src/sap/gantt/simple/LegendShapeGroup.js +1 -1
- package/src/sap/gantt/simple/MultiActivityGroup.js +1 -1
- package/src/sap/gantt/simple/MultiActivityRowSettings.js +1 -1
- package/src/sap/gantt/simple/PrintConfig.js +314 -0
- package/src/sap/gantt/simple/PrintDialogTemplate.js +38 -0
- package/src/sap/gantt/simple/PrintUtils.js +151 -0
- package/src/sap/gantt/simple/Relationship.js +1 -1
- package/src/sap/gantt/simple/ShapeScheme.js +1 -1
- package/src/sap/gantt/simple/StockChart.js +1 -1
- package/src/sap/gantt/simple/StockChartDimension.js +1 -1
- package/src/sap/gantt/simple/StockChartPeriod.js +1 -1
- package/src/sap/gantt/simple/UtilizationBarChart.js +1 -1
- package/src/sap/gantt/simple/UtilizationChart.js +4 -1
- package/src/sap/gantt/simple/UtilizationDimension.js +1 -1
- package/src/sap/gantt/simple/UtilizationLineChart.js +1 -1
- package/src/sap/gantt/simple/UtilizationPeriod.js +1 -1
- package/src/sap/gantt/simple/shapes/Shape.js +6 -6
- package/src/sap/gantt/simple/shapes/Task.js +1 -1
- package/src/sap/gantt/skipTime/DayInterval.js +63 -0
- package/src/sap/gantt/skipTime/DiscontinuousProvider.js +54 -0
- package/src/sap/gantt/skipTime/SkipInterval.js +76 -0
- package/src/sap/gantt/skipTime/SkipPattern.js +64 -0
- package/src/sap/gantt/skipTime/WeekPattern.js +118 -0
- package/src/sap/gantt/skipTime/WeeklyDiscontinuousProvider.js +84 -0
- package/src/sap/gantt/themes/sap_hcb/base_Gantt.less +899 -0
- package/src/sap/gantt/themes/sap_hcb/base_GanttPrinting.less +101 -0
- package/src/sap/gantt/themes/sap_hcb/base_GanttSyncedControl.less +96 -0
- package/src/sap/gantt/themes/sap_hcb/library.source.less +15 -1
- package/src/sap/gantt/thirdparty/d3fc-discontinuous-scale.js +1129 -0
- package/src/sap/gantt/thirdparty/d3fc-rebind.js +103 -0
- package/src/sap/gantt/thirdparty/licenses/d3fc-MIT-LICENSE.txt +21 -0
- package/src/sap/gantt/utils/GanttChartConfigurationUtils.js +6 -0
- package/src/sap/gantt/utils/GanttCustomisationUtils.js +7 -1
- package/src/sap/gantt/utils/GanttFlexibilityUtils.js +7 -1
- package/src/sap/gantt/polyfills/time-utils/day.js +0 -7
- package/src/sap/gantt/polyfills/time-utils/days.js +0 -7
- package/src/sap/gantt/polyfills/time-utils/monday.js +0 -7
- package/src/sap/gantt/polyfills/time-utils/saturday.js +0 -7
- package/src/sap/gantt/polyfills/time-utils/weeks.js +0 -7
|
@@ -24,11 +24,11 @@ sap.ui.define([
|
|
|
24
24
|
*
|
|
25
25
|
*
|
|
26
26
|
* @extends sap.gantt.shape.ext.rls.Relationship
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.127.0
|
|
28
28
|
*
|
|
29
29
|
* @constructor
|
|
30
30
|
* @public
|
|
31
|
-
* @deprecated Since version 1.64
|
|
31
|
+
* @deprecated Since version 1.64, the concept has been discarded.
|
|
32
32
|
* @alias sap.gantt.shape.ext.rls.SelectedRelationship
|
|
33
33
|
*/
|
|
34
34
|
var SelectedRelationship = Relationship.extend("sap.gantt.shape.ext.rls.SelectedRelationship", {
|
|
@@ -260,74 +260,27 @@ sap.ui.define(["sap/ui/thirdparty/jquery"],
|
|
|
260
260
|
}
|
|
261
261
|
},
|
|
262
262
|
|
|
263
|
-
|
|
264
|
-
/**
|
|
265
|
-
* creates overlay shape id map so that in the ongoing flow the values can be replaced by corresponding shape level.
|
|
266
|
-
*/
|
|
267
|
-
_createOverlayShapeIdMap : function(newAggr,oRowSettings){
|
|
268
|
-
if (newAggr && newAggr.length > 0){
|
|
269
|
-
if (!oRowSettings._overlayShapeIdList){
|
|
270
|
-
oRowSettings._overlayShapeIdList = {};
|
|
271
|
-
}
|
|
272
|
-
newAggr.forEach(function(oTask){
|
|
273
|
-
if (oTask.getOverlayShapeId()){
|
|
274
|
-
oRowSettings._overlayShapeIdList[oTask.getOverlayShapeId()] = oTask.getOverlayShapeId();
|
|
275
|
-
}
|
|
276
|
-
});
|
|
277
|
-
}
|
|
278
|
-
},
|
|
279
|
-
|
|
280
|
-
/**
|
|
281
|
-
* @param { sap.gantt.simple.GanttRowSettings} oRowSettings gantt row settings
|
|
282
|
-
* @param { boolean} bExpanded defines row is expanded or not
|
|
283
|
-
* @param {sap.gantt.simple.GanttChartWithTable } oGantt ganttchart instance
|
|
284
|
-
* destroys current aggregation and adds a new aggregation.
|
|
285
|
-
*/
|
|
286
|
-
_addExpandStaticOverlay : function(oRowSettings,bExpanded,oGantt){
|
|
287
|
-
var rowIndex = oRowSettings.getParent().getIndex();
|
|
288
|
-
var pseudoShapeExpandArray = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex];
|
|
289
|
-
//if pseudoshape is expanded then the dont add expand aggregation shapes.
|
|
290
|
-
if (pseudoShapeExpandArray && pseudoShapeExpandArray.length){
|
|
291
|
-
return;
|
|
292
|
-
}
|
|
293
|
-
var aggrName, expandedOrStatic, currAggrName, newAggr, newAggrName, newAggrBinding, oLocaleBindingInfo;
|
|
294
|
-
var mBindingInfos = oGantt.getTable().getRowSettingsTemplate().mBindingInfos;
|
|
295
|
-
Object.keys(oRowSettings.getMetadata().getAllAggregations()).forEach(function(sName){
|
|
296
|
-
if (sName.indexOf("overlay") !== -1){
|
|
297
|
-
aggrName = oRowSettings.getAggregation(sName);
|
|
298
|
-
if (aggrName && aggrName[0]){
|
|
299
|
-
expandedOrStatic = bExpanded ? aggrName[0].getExpandedOverlay() : aggrName[0].getStaticOverlay();
|
|
300
|
-
if ( expandedOrStatic.length == 0) {
|
|
301
|
-
oLocaleBindingInfo = mBindingInfos[aggrName[0].sParentAggregationName].template._oLocaleBindingInfo;
|
|
302
|
-
currAggrName = bExpanded ? "staticOverlay" : "expandedOverlay";
|
|
303
|
-
newAggrName = bExpanded ? "expandedOverlay" : "staticOverlay";
|
|
304
|
-
newAggrBinding = bExpanded ? oLocaleBindingInfo.expandedOverlay : oLocaleBindingInfo.staticOverlay;
|
|
305
|
-
//unbind current aggregation
|
|
306
|
-
aggrName[0].unbindAggregation(currAggrName);
|
|
307
|
-
if (newAggrBinding){
|
|
308
|
-
//binds new Aggregation
|
|
309
|
-
oRowSettings.getAggregation(sName)[0]._bindAddon(newAggrName,newAggrBinding);
|
|
310
|
-
newAggr = newAggrName == "staticOverlay" ? aggrName[0].getStaticOverlay() : aggrName[0].getExpandedOverlay();
|
|
311
|
-
}
|
|
312
|
-
//creates shape id map.
|
|
313
|
-
this._createOverlayShapeIdMap(newAggr,oRowSettings);
|
|
314
|
-
}
|
|
315
|
-
}
|
|
316
|
-
}
|
|
317
|
-
}.bind(this));
|
|
318
|
-
},
|
|
319
|
-
|
|
320
263
|
/**
|
|
321
264
|
* fetch overlay aggregation shapes
|
|
322
265
|
*/
|
|
323
266
|
_fetchOverlayAggregation : function (oRowSettings, pseudoShapeExpanded, concatShapeRowArray, aShapeSchemeKeys){
|
|
267
|
+
if (!oRowSettings._overlayShapeIdList){
|
|
268
|
+
oRowSettings._overlayShapeIdList = {};
|
|
269
|
+
}
|
|
270
|
+
|
|
324
271
|
var allOverlayAggr = [], aShapesInRow = [], allAggregations = oRowSettings.getMetadata().getAllAggregations();
|
|
325
272
|
Object.keys(allAggregations).forEach(function(sName){
|
|
326
273
|
var sNameAgg = oRowSettings.getAggregation(sName); allOverlayAggr = concatShapeRowArray ? [] : allOverlayAggr;
|
|
327
274
|
if (sName.indexOf("overlay") !== -1 && sNameAgg && sNameAgg[0]){
|
|
328
|
-
var expandedOrStatic
|
|
275
|
+
var expandedOrStatic = sNameAgg[0].getActiveOverlays() || [];
|
|
329
276
|
expandedOrStatic.forEach(function(obj){
|
|
330
277
|
var oShape = obj.getShape();
|
|
278
|
+
var sShapeId = obj.getOverlayShapeId();
|
|
279
|
+
|
|
280
|
+
if (sShapeId){
|
|
281
|
+
oRowSettings._overlayShapeIdList[sShapeId] = sShapeId;
|
|
282
|
+
}
|
|
283
|
+
|
|
331
284
|
if (!aShapeSchemeKeys.length || aShapeSchemeKeys.indexOf(oShape.getScheme()) > -1) {
|
|
332
285
|
allOverlayAggr.push(oShape);
|
|
333
286
|
}
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define([
|
|
8
|
-
"sap/base/Log", "./BaseRectangle", "./BasePath", "./RenderUtils", "sap/gantt/library"
|
|
9
|
-
], function(Log, BaseRectangle, BasePath, RenderUtils, library) {
|
|
8
|
+
"sap/base/Log", "./BaseRectangle", "./BasePath", "./RenderUtils", "sap/gantt/library", "sap/gantt/misc/Utility"
|
|
9
|
+
], function(Log, BaseRectangle, BasePath, RenderUtils, library, Utility) {
|
|
10
10
|
"use strict";
|
|
11
11
|
var ShapeAlignment = library.simple.shapes.ShapeAlignment;
|
|
12
12
|
/**
|
|
@@ -21,7 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
* @extends sap.gantt.simple.BaseRectangle
|
|
22
22
|
*
|
|
23
23
|
* @author SAP SE
|
|
24
|
-
* @version 1.
|
|
24
|
+
* @version 1.127.0
|
|
25
25
|
*
|
|
26
26
|
* @constructor
|
|
27
27
|
* @public
|
|
@@ -106,10 +106,10 @@ sap.ui.define([
|
|
|
106
106
|
};
|
|
107
107
|
|
|
108
108
|
BaseCursor.prototype._isPropertiesValid = function (nPointHeight, nWidth, nLength,nHalflength) {
|
|
109
|
-
return
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
109
|
+
return Utility.isNumeric(nPointHeight) &&
|
|
110
|
+
Utility.isNumeric(nWidth) &&
|
|
111
|
+
Utility.isNumeric(nLength) &&
|
|
112
|
+
Utility.isNumeric(nHalflength);
|
|
113
113
|
};
|
|
114
114
|
|
|
115
115
|
BaseCursor.prototype.renderElement = function () {
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
|
|
6
6
|
*/
|
|
7
7
|
sap.ui.define(
|
|
8
|
-
["./BaseShape", "./RenderUtils", "./GanttUtils", "../misc/Format", "./BaseText"],
|
|
9
|
-
function (BaseShape, RenderUtils, GanttUtils, Format, BaseText) {
|
|
8
|
+
["./BaseShape", "./RenderUtils", "./GanttUtils", "../misc/Format", "./BaseText", "sap/gantt/misc/Utility"],
|
|
9
|
+
function (BaseShape, RenderUtils, GanttUtils, Format, BaseText, Utility) {
|
|
10
10
|
"use strict";
|
|
11
11
|
|
|
12
12
|
/**
|
|
@@ -22,7 +22,7 @@ sap.ui.define(
|
|
|
22
22
|
* @extends sap.gantt.simple.BaseShape
|
|
23
23
|
*
|
|
24
24
|
* @author SAP SE
|
|
25
|
-
* @version 1.
|
|
25
|
+
* @version 1.127.0
|
|
26
26
|
* @since 1.84
|
|
27
27
|
*
|
|
28
28
|
* @constructor
|
|
@@ -168,6 +168,9 @@ sap.ui.define(
|
|
|
168
168
|
iStartTime = this.getTime().valueOf();
|
|
169
169
|
iEndTime = this.getEndTime().valueOf();
|
|
170
170
|
iTimeDiff = iEndTime - iStartTime;
|
|
171
|
+
if (oAxisTime.discontinuityProvider) { // when skip time pattern is applied, use distance method to calculate time difference
|
|
172
|
+
iTimeDiff = oAxisTime._discontinuityProviderInstance.distance(this.getTime(), this.getEndTime());
|
|
173
|
+
}
|
|
171
174
|
iZoomRate = oAxisTime.getZoomRate();
|
|
172
175
|
viewOffset = oAxisTime.getViewOffset();
|
|
173
176
|
viewRange = oAxisTime.getViewRange()[1];
|
|
@@ -190,7 +193,7 @@ sap.ui.define(
|
|
|
190
193
|
);
|
|
191
194
|
|
|
192
195
|
//if nRetVal is not numeric, return itself
|
|
193
|
-
if (!
|
|
196
|
+
if (!Utility.isNumeric(startTime) || !Utility.isNumeric(endTime)) {
|
|
194
197
|
return 0;
|
|
195
198
|
}
|
|
196
199
|
|
|
@@ -23,7 +23,7 @@ sap.ui.define([
|
|
|
23
23
|
* @extends sap.gantt.simple.BaseShape
|
|
24
24
|
*
|
|
25
25
|
* @author SAP SE
|
|
26
|
-
* @version 1.
|
|
26
|
+
* @version 1.127.0
|
|
27
27
|
*
|
|
28
28
|
* @constructor
|
|
29
29
|
* @public
|
|
@@ -144,6 +144,9 @@ sap.ui.define([
|
|
|
144
144
|
iStartTime = this.getTime().valueOf();
|
|
145
145
|
iEndTime = this.getEndTime().valueOf();
|
|
146
146
|
iTimeDiff = iEndTime - iStartTime;
|
|
147
|
+
if (oAxisTime.discontinuityProvider) { // when skip time pattern is applied, use distance method to calculate time difference
|
|
148
|
+
iTimeDiff = oAxisTime._discontinuityProviderInstance.distance(this.getTime(), this.getEndTime());
|
|
149
|
+
}
|
|
147
150
|
iZoomRate = oAxisTime.getZoomRate();
|
|
148
151
|
viewOffset = oAxisTime.getViewOffset();
|
|
149
152
|
viewRange = oAxisTime.getViewRange()[1];
|
|
@@ -163,7 +166,7 @@ sap.ui.define([
|
|
|
163
166
|
endTime = oAxisTime.timeToView(Format.abapTimestampToDate(this.getEndTime()));
|
|
164
167
|
|
|
165
168
|
//if nRetVal is not numeric, return itself
|
|
166
|
-
if (!
|
|
169
|
+
if (!Utility.isNumeric(startTime) || !Utility.isNumeric(endTime)) {
|
|
167
170
|
return 0;
|
|
168
171
|
}
|
|
169
172
|
|
|
@@ -17,7 +17,8 @@ sap.ui.define([
|
|
|
17
17
|
"../misc/Format",
|
|
18
18
|
"sap/ui/core/date/UI5Date",
|
|
19
19
|
"sap/gantt/utils/GanttChartConfigurationUtils",
|
|
20
|
-
"sap/ui/core/Theming"
|
|
20
|
+
"sap/ui/core/Theming",
|
|
21
|
+
"sap/gantt/misc/Utility"
|
|
21
22
|
], function (
|
|
22
23
|
Log,
|
|
23
24
|
Device,
|
|
@@ -31,7 +32,8 @@ sap.ui.define([
|
|
|
31
32
|
Format,
|
|
32
33
|
UI5Date,
|
|
33
34
|
GanttChartConfigurationUtils,
|
|
34
|
-
Theming
|
|
35
|
+
Theming,
|
|
36
|
+
Utility
|
|
35
37
|
) {
|
|
36
38
|
"use strict";
|
|
37
39
|
|
|
@@ -55,14 +57,14 @@ sap.ui.define([
|
|
|
55
57
|
* @extends sap.ui.core.Element
|
|
56
58
|
*
|
|
57
59
|
* @author SAP SE
|
|
58
|
-
* @version 1.
|
|
60
|
+
* @version 1.127.0
|
|
59
61
|
*
|
|
60
62
|
* @abstract
|
|
61
63
|
* @constructor
|
|
62
64
|
* @public
|
|
63
65
|
* @alias sap.gantt.simple.BaseShape
|
|
64
66
|
*/
|
|
65
|
-
var BaseShape = Element.extend("sap.gantt.simple.BaseShape", /** @lends sap.
|
|
67
|
+
var BaseShape = Element.extend("sap.gantt.simple.BaseShape", /** @lends sap.gantt.simple.BaseShape.prototype */ {
|
|
66
68
|
metadata: {
|
|
67
69
|
library: "sap.gantt",
|
|
68
70
|
"abstract": true,
|
|
@@ -486,7 +488,7 @@ sap.ui.define([
|
|
|
486
488
|
var oAxisTime = this.getAxisTime();
|
|
487
489
|
|
|
488
490
|
var nTimeX = oAxisTime && oAxisTime.timeToView(Format.abapTimestampToDate(vTime));
|
|
489
|
-
if (!
|
|
491
|
+
if (!Utility.isNumeric(nTimeX)) {
|
|
490
492
|
Log.warning("Cannot convert time:" + vTime + " to an valid coordinate. Invalid coordinate might not get rendered at all, check the property value!");
|
|
491
493
|
return 0;
|
|
492
494
|
}
|