Skip to content

Commit 071209a

Browse files
committed
v2.6.4 #325
1 parent 2fcc508 commit 071209a

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

dist/jsgantt.js

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,7 @@ exports.GanttChart = function (pDiv, pFormat) {
457457
this.setChartTable(vTmpTab);
458458
draw_utils_1.newNode(vTmpDiv, 'div', null, 'rhscrpad', null, null, vTaskLeftPx + 1);
459459
var vTmpTBody = draw_utils_1.newNode(vTmpTab, 'tbody');
460+
var vTmpTFoot = draw_utils_1.newNode(vTmpTab, 'tfoot');
460461
events_1.syncScroll([vTmpContentTabWrapper, vTmpDiv], 'scrollTop');
461462
events_1.syncScroll([gChartLbl, vTmpDiv], 'scrollLeft');
462463
events_1.syncScroll([vTmpContentTabWrapper, gListLbl], 'scrollLeft');
@@ -514,7 +515,7 @@ exports.GanttChart = function (pDiv, pFormat) {
514515
}
515516
else {
516517
var vTaskWidth = vTaskRightPx;
517-
// Draw Group Bar which has outer div with inner group div
518+
// Draw Group Bar which has outer div with inner group div
518519
// and several small divs to left and right to create angled-end indicators
519520
if (this.vTaskList[i].getGroup()) {
520521
vTaskWidth = (vTaskWidth > this.vMinGpLen && vTaskWidth < this.vMinGpLen * 2) ? this.vMinGpLen * 2 : vTaskWidth; // Expand to show two end points
@@ -626,7 +627,16 @@ exports.GanttChart = function (pDiv, pFormat) {
626627
}
627628
}
628629
// Include the footer with the days/week/month...
629-
vTmpTBody.appendChild(vDateRow.cloneNode(true));
630+
if (vSingleCell) {
631+
var vTmpTFootTRow = draw_utils_1.newNode(vTmpTFoot, 'tr');
632+
var vTmpTFootTCell = draw_utils_1.newNode(vTmpTFootTRow, 'td', null, null, null, '100%');
633+
var vTmpTFootTCellTable = draw_utils_1.newNode(vTmpTFootTCell, 'table', null, 'gcharttableh', null, '100%');
634+
var vTmpTFootTCellTableTBody = draw_utils_1.newNode(vTmpTFootTCellTable, 'tbody');
635+
vTmpTFootTCellTableTBody.appendChild(vDateRow.cloneNode(true));
636+
}
637+
else {
638+
vTmpTFoot.appendChild(vDateRow.cloneNode(true));
639+
}
630640
return { vRightTable: vRightTable };
631641
};
632642
this.drawColsChart = function (vNumCols, vTmpRow, taskCellWidth) {
@@ -3739,8 +3749,12 @@ exports.processRows = function (pList, pID, pRow, pLevel, pOpen, pUseSort, vDebu
37393749
if (pList[pRow].getGroupMinPlanEnd() != null && pList[pRow].getGroupMinPlanEnd() > vMaxPlanDate) {
37403750
vMaxPlanDate = pList[pRow].getGroupMinPlanEnd();
37413751
}
3742-
pList[pRow].setPlanStart(vMinPlanDate);
3743-
pList[pRow].setPlanEnd(vMaxPlanDate);
3752+
if (vMinPlanDate) {
3753+
pList[pRow].setPlanStart(vMinPlanDate);
3754+
}
3755+
if (vMaxPlanDate) {
3756+
pList[pRow].setPlanEnd(vMaxPlanDate);
3757+
}
37443758
pList[pRow].setNumKid(vNumKid);
37453759
pList[pRow].setWeight(vWeight);
37463760
pList[pRow].setCompVal(Math.ceil(vCompSum / vWeight));

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.3",
3+
"version": "2.6.4",
44
"description": "jsgantt-improved",
55
"main": "dist/index.js",
66
"scripts": {

src/draw_columns.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { AddTaskItemObject } from "./task";
33
import { addListenerInputCell, addListenerClickCell } from "./events";
44
import { newNode, makeInput } from "./utils/draw_utils";
55

6-
76
export const COLUMN_ORDER = [
87
'vShowRes',
98
'vShowDur',
@@ -17,7 +16,6 @@ export const COLUMN_ORDER = [
1716
'vShowAddEntries'
1817
];
1918

20-
2119
export const draw_header = function (column, i, vTmpRow, vTaskList, vEditable, vEventsChange, vEvents,
2220
vDateTaskTableDisplayFormat, vAdditionalHeaders, vFormat, vLangs, vLang, vResources, Draw) {
2321
let vTmpCell, vTmpDiv;
@@ -141,7 +139,6 @@ export const draw_bottom = function (column, vTmpRow, vAdditionalHeaders) {
141139
}
142140

143141
export const draw_list_headings = function (column, vTmpRow, vAdditionalHeaders) {
144-
145142
if ('vShowRes' === column) newNode(vTmpRow, 'td', null, 'gspanning gresource', '\u00A0');
146143
if ('vShowDur' === column) newNode(vTmpRow, 'td', null, 'gspanning gduration', '\u00A0');
147144
if ('vShowComp' === column) newNode(vTmpRow, 'td', null, 'gspanning gpccomplete', '\u00A0');
@@ -161,7 +158,6 @@ export const draw_list_headings = function (column, vTmpRow, vAdditionalHeaders)
161158
}
162159

163160
export const draw_task_headings = function (column, vTmpRow, vLangs, vLang, vAdditionalHeaders) {
164-
165161
if ('vShowRes' === column) newNode(vTmpRow, 'td', null, 'gtaskheading gresource', vLangs[vLang]['resource']);
166162
if ('vShowDur' === column) newNode(vTmpRow, 'td', null, 'gtaskheading gduration', vLangs[vLang]['duration']);
167163
if ('vShowComp' === column) newNode(vTmpRow, 'td', null, 'gtaskheading gpccomplete', vLangs[vLang]['comp']);

0 commit comments

Comments
 (0)