Skip to content

Commit e514458

Browse files
mariohmolmariohmol
committed
v2.6.3
1 parent 6c6259a commit e514458

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

‎dist/jsgantt.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,10 @@ exports.GanttChart = function (pDiv, pFormat) {
436436
vTaskLeftPx += 2;
437437
}
438438
vTmpTab.style.width = vTaskLeftPx + 'px'; // Ensure that the headings has exactly the same width as the chart grid
439-
var vTaskPlanLeftPx = (vNumCols * (vColWidth + 3)) + 1;
439+
// const vTaskPlanLeftPx = (vNumCols * (vColWidth + 3)) + 1;
440440
var vSingleCell = false;
441-
console.log((vNumCols * vNumRows), this.vUseSingleCell, vNumCols, vNumRows);
442-
// if (this.vUseSingleCell !== 0 && this.vUseSingleCell < (vNumCols * vNumRows)) vSingleCell = true;
441+
if (this.vUseSingleCell !== 0 && this.vUseSingleCell < (vNumCols * vNumRows))
442+
vSingleCell = true;
443443
draw_utils_1.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx + 1);
444444
vTmpDiv = draw_utils_1.newNode(vRightHeader, 'div', null, 'glabelfooter');
445445
return { gChartLbl: gChartLbl, vTaskLeftPx: vTaskLeftPx, vSingleCell: vSingleCell, vDateRow: vDateRow, vRightHeader: vRightHeader, vNumCols: vNumCols };
@@ -494,7 +494,6 @@ exports.GanttChart = function (pDiv, pFormat) {
494494
var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, 'gmileitem gmile' + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
495495
this.vTaskList[i].setChildRow(vTmpRow);
496496
events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
497-
// console.log('T ----->', vNumCols)
498497
var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellmile', null, vColWidth, null, null, null);
499498
vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
500499
vTmpDiv_1 = draw_utils_1.newNode(vTmpDiv_1, 'div', this.vDivId + 'bardiv_' + vID, 'gtaskbarcontainer', null, 12, vTaskLeftPx_1 + vTaskRightPx - 6);
@@ -509,7 +508,6 @@ exports.GanttChart = function (pDiv, pFormat) {
509508
draw_utils_1.newNode(vTmpDiv2, 'div', null, 'gmdbottom');
510509
}
511510
vCaptClass = 'gmilecaption';
512-
console.log(vSingleCell, vComb);
513511
if (!vSingleCell && !vComb) {
514512
this.drawColsChart(vNumCols, vTmpRow, taskCellWidth);
515513
}
@@ -524,7 +522,6 @@ exports.GanttChart = function (pDiv, pFormat) {
524522
var vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, ((this.vTaskList[i].getGroup() == 2) ? 'glineitem gitem' : 'ggroupitem ggroup') + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
525523
this.vTaskList[i].setChildRow(vTmpRow);
526524
events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
527-
// console.log('F ----->', vNumCols)
528525
var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellbar', null, vColWidth, null, null);
529526
vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
530527
this.vTaskList[i].setCellDiv(vTmpDiv_1);
@@ -557,7 +554,6 @@ exports.GanttChart = function (pDiv, pFormat) {
557554
vTmpRow = draw_utils_1.newNode(vTmpTBody, 'tr', this.vDivId + 'childrow_' + vID, 'glineitem gitem' + this.vFormat, null, null, null, ((this.vTaskList[i].getVisible() == 0) ? 'none' : null));
558555
this.vTaskList[i].setChildRow(vTmpRow);
559556
events_1.addThisRowListeners(this, this.vTaskList[i].getListChildRow(), vTmpRow);
560-
// console.log('F ----->', vNumCols)
561557
var vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, 'gtaskcell gtaskcellcolorbar', null, taskCellWidth, null, null);
562558
vTmpDivCell = vTmpDiv_1 = draw_utils_1.newNode(vTmpCell, 'div', null, 'gtaskcelldiv', '\u00A0\u00A0');
563559
}
@@ -3799,7 +3795,7 @@ exports.getMinDate = function (pList, pFormat, pMinDate) {
37993795
for (var i = 0; i < pList.length; i++) {
38003796
if (pList[i].getStart().getTime() < vDate.getTime())
38013797
vDate.setTime(pList[i].getStart().getTime());
3802-
else if (pList[i].getPlanStart() && pList[i].getPlanStart().getTime() < vDate.getTime())
3798+
if (pList[i].getPlanStart() && pList[i].getPlanStart().getTime() < vDate.getTime())
38033799
vDate.setTime(pList[i].getPlanStart().getTime());
38043800
}
38053801
// Adjust min date to specific format boundaries (first of week or first of month)
@@ -3849,7 +3845,7 @@ exports.getMaxDate = function (pList, pFormat, pMaxDate) {
38493845
for (var i = 0; i < pList.length; i++) {
38503846
if (pList[i].getEnd().getTime() > vDate.getTime())
38513847
vDate.setTime(pList[i].getEnd().getTime());
3852-
else if (pList[i].getPlanEnd() && pList[i].getPlanEnd().getTime() > vDate.getTime())
3848+
if (pList[i].getPlanEnd() && pList[i].getPlanEnd().getTime() > vDate.getTime())
38533849
vDate.setTime(pList[i].getPlanEnd().getTime());
38543850
}
38553851
// Adjust max date to specific format boundaries (end of week or end of month)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsgantt-improved",
3-
"version": "2.6.2",
3+
"version": "2.6.3",
44
"description": "jsgantt-improved",
55
"main": "dist/index.js",
66
"scripts": {

‎src/utils/date_utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const getMinDate = function (pList, pFormat, pMinDate) {
1111
// Parse all Task Start dates to find min
1212
for (let i = 0; i < pList.length; i++) {
1313
if (pList[i].getStart().getTime() < vDate.getTime()) vDate.setTime(pList[i].getStart().getTime());
14-
else if (pList[i].getPlanStart() && pList[i].getPlanStart().getTime() < vDate.getTime()) vDate.setTime(pList[i].getPlanStart().getTime());
14+
if (pList[i].getPlanStart() && pList[i].getPlanStart().getTime() < vDate.getTime()) vDate.setTime(pList[i].getPlanStart().getTime());
1515
}
1616

1717
// Adjust min date to specific format boundaries (first of week or first of month)
@@ -58,7 +58,7 @@ export const getMaxDate = function (pList, pFormat, pMaxDate) {
5858
// Parse all Task End dates to find max
5959
for (let i = 0; i < pList.length; i++) {
6060
if (pList[i].getEnd().getTime() > vDate.getTime()) vDate.setTime(pList[i].getEnd().getTime());
61-
else if (pList[i].getPlanEnd() && pList[i].getPlanEnd().getTime() > vDate.getTime()) vDate.setTime(pList[i].getPlanEnd().getTime());
61+
if (pList[i].getPlanEnd() && pList[i].getPlanEnd().getTime() > vDate.getTime()) vDate.setTime(pList[i].getPlanEnd().getTime());
6262
}
6363

6464
// Adjust max date to specific format boundaries (end of week or end of month)

0 commit comments

Comments
 (0)