jsgantt-improved
Advanced tools
Comparing version 2.5.9 to 2.5.10
@@ -85,2 +85,4 @@ "use strict"; | ||
var vGroupMinEnd = null; | ||
var vGroupMinPlanStart = null; | ||
var vGroupMinPlanEnd = null; | ||
var vClass = document.createTextNode(pClass).data; | ||
@@ -138,7 +140,7 @@ var vLink = document.createTextNode(pLink).data; | ||
vPlanStart = (pPlanStart instanceof Date) ? pPlanStart : date_utils_1.parseDateStr(document.createTextNode(pPlanStart).data, vGantt.getDateInputFormat()); | ||
vGroupMinStart = vPlanStart; | ||
vGroupMinPlanStart = vPlanStart; | ||
} | ||
if (pPlanEnd != null && pPlanEnd != '') { | ||
vPlanEnd = (pPlanEnd instanceof Date) ? pPlanEnd : date_utils_1.parseDateStr(document.createTextNode(pPlanEnd).data, vGantt.getDateInputFormat()); | ||
vGroupMinEnd = vPlanEnd; | ||
vGroupMinPlanEnd = vPlanEnd; | ||
} | ||
@@ -229,2 +231,4 @@ if (pDepend != null) { | ||
this.getGroupMinEnd = function () { return vGroupMinEnd; }; | ||
this.getGroupMinPlanStart = function () { return vGroupMinPlanStart; }; | ||
this.getGroupMinPlanEnd = function () { return vGroupMinPlanEnd; }; | ||
this.getClass = function () { return vClass; }; | ||
@@ -602,4 +606,6 @@ this.getLink = function () { return vLink; }; | ||
if (vDebug === void 0) { vDebug = false; } | ||
var vMinDate = new Date(); | ||
var vMaxDate = new Date(); | ||
var vMinDate = null; | ||
var vMaxDate = null; | ||
var vMinPlanDate = null; | ||
var vMaxPlanDate = null; | ||
var vVisible = pOpen; | ||
@@ -610,2 +616,4 @@ var vCurItem = null; | ||
var vMaxSet = 0; | ||
var vMinPlanSet = 0; | ||
var vMaxPlanSet = 0; | ||
var vNumKid = 0; | ||
@@ -643,10 +651,18 @@ var vWeight = 0; | ||
} | ||
if (vMinSet == 0 || pList[i].getStart() < vMinDate) { | ||
vMinDate = pList[i].getStart(); | ||
if (pList[i].getStartVar() && (vMinSet == 0 || pList[i].getStartVar() < vMinDate)) { | ||
vMinDate = pList[i].getStartVar(); | ||
vMinSet = 1; | ||
} | ||
if (vMaxSet == 0 || pList[i].getEnd() > vMaxDate) { | ||
vMaxDate = pList[i].getEnd(); | ||
if (pList[i].getEndVar() && (vMaxSet == 0 || pList[i].getEndVar() > vMaxDate)) { | ||
vMaxDate = pList[i].getEndVar(); | ||
vMaxSet = 1; | ||
} | ||
if (vMinPlanSet == 0 || pList[i].getPlanStart() < vMinPlanDate) { | ||
vMinPlanDate = pList[i].getPlanStart(); | ||
vMinPlanSet = 1; | ||
} | ||
if (vMaxPlanSet == 0 || pList[i].getPlanEnd() > vMaxPlanDate) { | ||
vMaxPlanDate = pList[i].getPlanEnd(); | ||
vMaxPlanSet = 1; | ||
} | ||
vNumKid++; | ||
@@ -665,4 +681,16 @@ vWeight += pList[i].getEnd() - pList[i].getStart() + 1; | ||
} | ||
pList[pRow].setStart(vMinDate); | ||
pList[pRow].setEnd(vMaxDate); | ||
if (vMinDate) { | ||
pList[pRow].setStart(vMinDate); | ||
} | ||
if (vMaxDate) { | ||
pList[pRow].setEnd(vMaxDate); | ||
} | ||
if (pList[pRow].getGroupMinPlanStart() != null && pList[pRow].getGroupMinPlanStart() < vMinPlanDate) { | ||
vMinPlanDate = pList[pRow].getGroupMinPlanStart(); | ||
} | ||
if (pList[pRow].getGroupMinPlanEnd() != null && pList[pRow].getGroupMinPlanEnd() > vMaxPlanDate) { | ||
vMaxPlanDate = pList[pRow].getGroupMinPlanEnd(); | ||
} | ||
pList[pRow].setPlanStart(vMinPlanDate); | ||
pList[pRow].setPlanEnd(vMaxPlanDate); | ||
pList[pRow].setNumKid(vNumKid); | ||
@@ -669,0 +697,0 @@ pList[pRow].setWeight(vWeight); |
@@ -129,2 +129,5 @@ "use strict"; | ||
break; | ||
case 'yyyy-mm-dd HH:MI:SS': | ||
vDate = new Date(vDateParts[0], vDateParts[1] - 1, vDateParts[2], vDateParts[3], vDateParts[4], vDateParts[5]); | ||
break; | ||
} | ||
@@ -201,2 +204,8 @@ } | ||
break; | ||
case 'SS': | ||
if (pDate.getSeconds() < 10) | ||
vDateStr += '0'; // now fall through | ||
case 'ss': | ||
vDateStr += pDate.getSeconds(); | ||
break; | ||
case 'pm': | ||
@@ -203,0 +212,0 @@ vDateStr += ((pDate.getHours()) < 12) ? 'am' : 'pm'; |
@@ -286,3 +286,3 @@ "use strict"; | ||
var vTask = ''; | ||
var vOutFrmt = date_utils_1.parseDateFormatStr(this.getDateInputFormat() + ' HH:MI'); | ||
var vOutFrmt = date_utils_1.parseDateFormatStr(this.getDateInputFormat() + ' HH:MI:SS'); | ||
if (pIdx === true) | ||
@@ -289,0 +289,0 @@ vIdx = pID; |
{ | ||
"name": "jsgantt-improved", | ||
"version": "2.5.9", | ||
"version": "2.5.10", | ||
"description": "jsgantt-improved", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
4822530
112989