@syncfusion/ej2-gantt 19.4.55 → 20.1.47-1460716

package/src/gantt/renderer/connector-line.js

@@ -115,7 +115,7 @@ var ConnectorLine = /** @class */ (function () {
         for (var i = 0; i < childNodes.length; i++) {
             var innerChild = childNodes[i].childNodes;
             for (var j = 0; j < innerChild.length; j++) {
-                var ariaString = this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
+                var ariaString = 'Connector Line ' + this.parent.connectorLineModule.generateAriaLabel(ariaConnector[i]);
                 innerChild[j].setAttribute('aria-label', ariaString);
             }
         }
@@ -372,7 +372,11 @@ var ConnectorLine = /** @class */ (function () {
         var connectorContainer = '';
         var isVirtual = this.parent.virtualScrollModule && this.parent.enableVirtualization;
         var connectorLine = this.getPosition(data, this.getParentPosition(data), height);
-        var heightValue = isVirtual ? connectorLine.height : height;
+        var isMilestoneValue = 0;
+        if (this.parent.renderBaseline) {
+            isMilestoneValue = (data.milestoneParent && data.milestoneChild) ? 0 : data.milestoneParent ? -5 : data.milestoneChild ? 5 : 0;
+        }
+        var heightValue = isVirtual ? connectorLine.height : (height + isMilestoneValue);
         if (this.getParentPosition(data)) {
             connectorContainer = '<div id="ConnectorLine' + data.connectorLineId + '" style="background-color:black">';
             var div = '<div class="' + cls.connectorLineContainer +
@@ -400,7 +404,7 @@ var ConnectorLine = /** @class */ (function () {
                 this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
             if (this.getParentPosition(data) === 'FSType1') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType1">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? -1 : 0) + 'px;width:' + (isMilestoneParent ?
@@ -421,7 +425,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType2') {
                 div = div + 'left:' + data.parentLeft + 'px;top:' + (isVirtual ? connectorLine.top : ((data.parentIndex * data.rowHeight) +
-                    this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType2">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? data.parentWidth - 1 : data.parentWidth) + 'px;width:' +
@@ -452,7 +456,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType3">';
                 div = div + rightArrow;
                 div = div + 'left:10px;' + this.getBorderStyles('left', 10) +
@@ -482,7 +486,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FSType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FSType4">';
                 div = div + rightArrow;
                 div = div + 'left:' + (data.childLeft - (data.parentLeft + data.parentWidth + 10)) + 'px;' +
@@ -508,7 +512,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType4">';
                 div = div + rightArrow;
                 div = div + 'left:' + (data.childLeft - data.parentLeft) + 'px;' + duplicateStingTwo;
@@ -521,7 +525,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType3') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType3">';
                 div = div + rightArrow;
                 div = div + 'left:10px;' + duplicateStingTwo;
@@ -534,7 +538,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SSType2') {
                 div = div + 'left:' + setInnerElementLeftSSType2 + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType2">';
                 div = div + eLine;
                 div = div + 'width:' + (setInnerChildWidthSSType2 + 1) + 'px;' +
@@ -555,7 +559,7 @@ var ConnectorLine = /** @class */ (function () {
             if (this.getParentPosition(data) === 'SSType1') {
                 div = div + 'left:' + (data.childLeft - 20) + 'px;top:' + (isVirtual ? connectorLine.top :
                     ((data.parentIndex * data.rowHeight) +
-                        this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                        this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SSType1">';
                 div = div + eLine;
                 div = div + 'width:' + (data.parentLeft - data.childLeft + 21) + 'px;' +
@@ -572,7 +576,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType1') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType1">';
                 div = div + eLine;
                 div = div + 'left:' + (isMilestoneParent ? (((data.parentLeft + data.parentWidth) -
@@ -596,7 +600,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType2') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType2">';
                 div = div + eLine;
                 div = div + (isMilestoneParent ? 'left:-1px;' : '') + 'width:' +
@@ -622,7 +626,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -645,7 +649,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'FFType4') {
                 div = div + 'left:' + (data.parentLeft + data.parentWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="FFType4">';
                 div = div + leftArrow;
                 div = div + ('left:' + ((data.childLeft + data.childWidth) -
@@ -674,7 +678,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType4') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;width:1px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;width:1px;' +
                     'height:' + heightValue + 'px;position:absolute" data-connectortype="SFType4">';
                 div = div + duplicateStingFour + 'top:' + (-5 - this.lineStroke + (this.lineStroke - 1)) + 'px;' +
                     'border-bottom-width:' + (5 + this.lineStroke) +
@@ -702,7 +706,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType3') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.childIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType3">';
                 div = div + duplicateStingOne;
                 div = div + eLine;
@@ -720,7 +724,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType1') {
                 div = div + 'left:' + (data.parentLeft - 10) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestone) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType1">';
                 div = div + eLine;
                 div = div + 'width:11px;' + this.getBorderStyles('top', this.lineStroke) + 'position:relative;"></div>';
@@ -745,7 +749,7 @@ var ConnectorLine = /** @class */ (function () {
             }
             if (this.getParentPosition(data) === 'SFType2') {
                 div = div + 'left:' + (data.childLeft + data.childWidth) + 'px;top:' + (isVirtual ? connectorLine.top :
-                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1))) + 'px;' +
+                    ((data.parentIndex * data.rowHeight) + this.getTaskbarMidpoint(isMilestoneParent) - (this.lineStroke - 1) - isMilestoneValue)) + 'px;' +
                     'width:1px;height:' + heightValue + 'px;position:absolute" data-connectortype="SFType2">';
                 div = div + eLine;
                 div = div + 'left:' + (((data.parentLeft) - (data.childLeft + data.childWidth)) - 10) +

package/src/gantt/renderer/event-marker.js

@@ -15,6 +15,7 @@ var EventMarker = /** @class */ (function () {
                 this.eventMarkersContainer = createElement('div', {
                     className: cls.eventMarkersContainer
                 });
+                this.eventMarkersContainer.setAttribute("role", "EventMarker");
                 this.parent.ganttChartModule.chartBodyContent.appendChild(this.eventMarkersContainer);
             }
             this.eventMarkersContainer.innerHTML = '';

package/src/gantt/renderer/nonworking-day.js

@@ -1,4 +1,4 @@
-import { createElement, formatUnit, remove } from '@syncfusion/ej2-base';
+import { createElement, formatUnit, remove, isNullOrUndefined } from '@syncfusion/ej2-base';
 import * as cls from '../base/css-constants';
 var NonWorkingDay = /** @class */ (function () {
     function NonWorkingDay(gantt) {
@@ -17,6 +17,7 @@ var NonWorkingDay = /** @class */ (function () {
             this.nonworkingContainer = createElement('div', {
                 className: cls.nonworkingContainer
             });
+            this.nonworkingContainer.setAttribute("role", "NonWorkingDays");
             this.parent.ganttChartModule.chartBodyContent.appendChild(this.nonworkingContainer);
         }
     };
@@ -54,8 +55,11 @@ var NonWorkingDay = /** @class */ (function () {
         var toDate;
         var container = createElement('div');
         var height = this.parent.contentHeight;
-        var scrollElement = this.parent.ganttChartModule.scrollElement;
-        var viewportHeight = parseInt(scrollElement.style.height, 10);
+        var toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        var viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         for (var i = 0; i < this.parent.holidays.length; i++) {
             if (this.parent.holidays[i].from && this.parent.holidays[i].to) {
                 fromDate = this.parent.dateValidationModule.getDateFromFormat(this.parent.holidays[i].from);
@@ -148,9 +152,12 @@ var NonWorkingDay = /** @class */ (function () {
         return container;
     };
     NonWorkingDay.prototype.updateHolidayLabelHeight = function () {
-        var height = this.parent.contentHeight;
-        var scrollElement = this.parent.ganttChartModule.scrollElement;
-        var viewportHeight = parseInt(scrollElement.style.height, 10);
+        var height = this.parent.getContentHeight();
+        var toolbarHeight = 0;
+        if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
+            toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
+        }
+        var viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         var top = (viewportHeight < height) ? viewportHeight / 2 : height / 2;
         var labels = this.holidayContainer.querySelectorAll('.' + cls.holidayLabel);
         for (var i = 0; i < labels.length; i++) {

package/src/gantt/renderer/timeline.d.ts

@@ -212,6 +212,7 @@ export declare class Timeline {
      * @private
      */
     private createTimelineTemplate;
+    updateTimelineAfterZooming(endDate: Date, resized: boolean): void;
     private getTimelineRoundOffEndDate;
     /**
      *

package/src/gantt/renderer/timeline.js

@@ -1,14 +1,14 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { createElement, isNullOrUndefined, getValue, addClass, removeClass, extend } from '@syncfusion/ej2-base';
 import * as cls from '../base/css-constants';
 import { DataUtil } from '@syncfusion/ej2-data';
@@ -123,6 +123,9 @@ var Timeline = /** @class */ (function () {
                 }
             }
         }
+        currentLevel = this.parent.zoomingLevels.findIndex(function (tempLevel) {
+            return tempLevel.level === currentLevel;
+        });
         var newTimeline = this.parent.zoomingLevels[currentLevel];
         var args = {
             requestType: isZoomIn ? 'beforeZoomIn' : 'beforeZoomOut',
@@ -840,6 +843,40 @@ var Timeline = /** @class */ (function () {
         } while ((startDate < endDate));
         return parentTh;
     };
+    Timeline.prototype.updateTimelineAfterZooming = function (endDate, resized) {
+        var timeDiff;
+        var perDayWidth;
+        var totWidth;
+        var contentElement = document.getElementsByClassName('e-chart-scroll-container e-content')[0];
+        if (!isNullOrUndefined(contentElement)) {
+            var contentWidth = contentElement['offsetWidth'];
+            var contentHeight = contentElement['offsetHeight'];
+            var scrollHeight = document.getElementsByClassName('e-chart-rows-container')[0]['offsetHeight'];
+            timeDiff = Math.abs(this.timelineStartDate.getTime() - endDate.getTime());
+            timeDiff = timeDiff / (1000 * 3600 * 24);
+            if (this.bottomTier === 'None') {
+                perDayWidth = this.getPerDayWidth(this.customTimelineSettings.timelineUnitSize, this.customTimelineSettings.topTier.count, this.topTier);
+            }
+            else {
+                perDayWidth = this.getPerDayWidth(this.customTimelineSettings.timelineUnitSize, this.customTimelineSettings.bottomTier.count, this.bottomTier);
+            }
+            if (contentHeight < scrollHeight) {
+                totWidth = (perDayWidth * timeDiff) + 17;
+            }
+            else {
+                totWidth = (perDayWidth * timeDiff);
+            }
+            if (contentWidth >= totWidth) {
+                var widthDiff = contentWidth - totWidth;
+                widthDiff = Math.round(widthDiff / perDayWidth);
+                endDate.setDate(endDate.getDate() + widthDiff);
+                this.parent.timelineModule.timelineEndDate = endDate;
+                if (resized) {
+                    this.parent.updateProjectDates(this.timelineStartDate, this.timelineEndDate, this.parent.isTimelineRoundOff);
+                }
+            }
+        }
+    };
     Timeline.prototype.getTimelineRoundOffEndDate = function (date) {
         var tierMode = this.topTier === 'None' ? this.bottomTier : this.topTier;
         var endDate = new Date(date.toString());
@@ -854,6 +891,9 @@ var Timeline = /** @class */ (function () {
                 endDate.setHours(24, 0, 0, 0);
             }
         }
+        if (this.isZooming || this.parent.isLoad) {
+            this.updateTimelineAfterZooming(endDate, false);
+        }
         return endDate;
     };
     /**
@@ -923,7 +963,6 @@ var Timeline = /** @class */ (function () {
         }
         return increment;
     };
-    ;
     /**
      * Method to find header cell was weekend or not
      *

package/src/gantt/renderer/tooltip.js

@@ -148,6 +148,7 @@ var Tooltip = /** @class */ (function () {
                     args.cancel = true;
                 }
             });
+            this.toolTipObj.content = argsData.content;
             if (!this.parent.isAdaptive && args.event.type === 'mouseover') {
                 this.currentTarget = args.target;
                 EventHandler.add(this.currentTarget, 'mousemove', this.mouseMoveHandler.bind(this));
@@ -174,6 +175,7 @@ var Tooltip = /** @class */ (function () {
      * @returns {void} .
      */
     Tooltip.prototype.updateTooltipPosition = function (args) {
+        args.element.style.visibility = 'visible';
         if (isNullOrUndefined(this.tooltipMouseEvent) || args.target.classList.contains('e-notes-info')) {
             return;
         }
@@ -203,7 +205,6 @@ var Tooltip = /** @class */ (function () {
             tooltipPositionY = tooltipPositionY + 10;
         }
         args.element.style.top = tooltipPositionY + 'px';
-        args.element.style.visibility = 'visible';
     };
     /**
      * Method to get mouse pointor position
@@ -245,9 +246,16 @@ var Tooltip = /** @class */ (function () {
         switch (elementType) {
             case 'milestone':
                 {
-                    var sDate = !isNullOrUndefined(data.startDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
+                    var milestoneStartDate = void 0;
+                    if (args.target.className.includes('e-baseline-gantt-milestone') && !isNullOrUndefined(data.baselineStartDate)) {
+                        milestoneStartDate = data.baselineStartDate;
+                    }
+                    else if (!isNullOrUndefined(data.startDate)) {
+                        milestoneStartDate = data.startDate;
+                    }
+                    var sDate = !isNullOrUndefined(milestoneStartDate) ? '<tr><td class = "e-gantt-tooltip-label"> Date</td><td>:</td>' +
                         '<td class = "e-gantt-tooltip-value">' +
-                        this.parent.getFormatedDate(data.startDate, this.parent.getDateFormat()) + '</td></tr>' : '';
+                        this.parent.getFormatedDate(milestoneStartDate, this.parent.getDateFormat()) + '</td></tr>' : '';
                     content = '<table class = "e-gantt-tooltiptable"><tbody>' +
                         taskName + sDate + '</tbody></table>';
                     break;