jsgantt-improved
Advanced tools
Comparing version 2.5.1 to 2.5.2
@@ -94,5 +94,3 @@ "use strict"; | ||
var data = vTaskList[i].getDataObject(); | ||
if (data) { | ||
vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, "gadditional " + css); | ||
} | ||
vTmpCell = draw_utils_1.newNode(vTmpRow, 'td', null, "gadditional " + css); | ||
// const callback = (task, e) => task.setCost(e.target.value); | ||
@@ -99,0 +97,0 @@ // addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList[i], 'costdate'); |
@@ -125,2 +125,5 @@ "use strict"; | ||
var pEnd = exports.getXMLNodeValue(Task[i], 'Finish', 2, ''); | ||
var pPlanStart = exports.getXMLNodeValue(Task[i], 'PlanStart', 2, ''); | ||
var pPlanEnd = exports.getXMLNodeValue(Task[i], 'PlanFinish', 2, ''); | ||
var pDuration = exports.getXMLNodeValue(Task[i], 'Duration', 2, ''); | ||
var pLink = exports.getXMLNodeValue(Task[i], 'HyperlinkAddress', 2, ''); | ||
@@ -215,3 +218,3 @@ var pMile = exports.getXMLNodeValue(Task[i], 'Milestone', 1, 0); | ||
vSplitEnd = exports.getXMLNodeValue(splits[k], (k + 1 == j) ? 'Finish' : 'Start', 2, ''); | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration)); | ||
vSubCreated = true; | ||
@@ -228,3 +231,3 @@ vDepend = ''; | ||
// Finally add the task | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration)); | ||
} | ||
@@ -244,2 +247,5 @@ } | ||
var pEnd = exports.getXMLNodeValue(Task[i], 'pEnd', 2, ''); | ||
var pPlanStart = exports.getXMLNodeValue(Task[i], 'pPlanStart', 2, ''); | ||
var pPlanEnd = exports.getXMLNodeValue(Task[i], 'pPlanEnd', 2, ''); | ||
var pDuration = exports.getXMLNodeValue(Task[i], 'pDuration', 2, ''); | ||
var pLink = exports.getXMLNodeValue(Task[i], 'pLink', 2, ''); | ||
@@ -266,3 +272,3 @@ var pMile = exports.getXMLNodeValue(Task[i], 'pMile', 1, 0); | ||
// Finally add the task | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new task_1.TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration)); | ||
} | ||
@@ -302,2 +308,5 @@ } | ||
vTask += '<pEnd>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pEnd>'; | ||
vTask += '<pPlanStart>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getPlanStart(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanStart>'; | ||
vTask += '<pPlanEnd>' + date_utils_1.formatDateStr(this.vTaskList[vIdx].getPlanEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanEnd>'; | ||
vTask += '<pDuration>' + this.vTaskList[vIdx].getDuration() + '</pDuration>'; | ||
vTask += '<pClass>' + this.vTaskList[vIdx].getClass() + '</pClass>'; | ||
@@ -304,0 +313,0 @@ vTask += '<pLink>' + this.vTaskList[vIdx].getLink() + '</pLink>'; |
@@ -150,10 +150,17 @@ let dataurl; | ||
// Parameters (pID, pName, pStart, pEnd, pStyle, pLink (unused) pLink: pMilpMile: e, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGantt) | ||
if (dataurl !== newDataurl) { | ||
dataurl = newDataurl; | ||
JSGantt.parseJSON(dataurl, g, vDebug) | ||
.then(j => jsonObj = j); | ||
} else { | ||
JSGantt.addJSONTask(g, jsonObj) | ||
} | ||
// if (dataurl !== newDataurl) { | ||
// dataurl = newDataurl; | ||
// JSGantt.parseJSON(dataurl, g, vDebug) | ||
// .then(j => jsonObj = j); | ||
// } else { | ||
// JSGantt.addJSONTask(g, jsonObj) | ||
// } | ||
g.AddTaskItem(new JSGantt.TaskItem(1, 'Task Objects', '', '', 'ggroupblack', '', 0, 'Shlomy', 40, 1, 0, '', '', '', '', g)); | ||
g.AddTaskItem(new JSGantt.TaskItem(121, 'Constructor Proc', '2019-08-20','2020-03-06', 'gtaskblue', '', 0, 'Brian T.', 60, 0, 1, 1, '', '', '', g)); | ||
g.AddTaskItem(new JSGantt.TaskItem(122, 'Task Variables', '2019-08-20','2020-03-06', 'gtaskred', '', 0, 'Brian', 60, 0, 1, 1, 121, '', '', g)); | ||
g.AddTaskItem(new JSGantt.TaskItem(123, 'Task by Minute/Hour', '2019-08-20','2020-03-06 12:00', 'gtaskyellow', '', 0, 'Ilan', 60, 0, 1, 1, '', '', '', g)); | ||
g.AddTaskItem(new JSGantt.TaskItem(124, 'Task Functions', '2019-08-20','2020-03-06', 'gtaskred', '', 0, 'Anyone', 60, 0, 1, 1, '123', 'This is a caption', null, g)); | ||
if (vDebug) { | ||
@@ -204,4 +211,5 @@ bd = new Date(); | ||
for (const item of g.getList()) { | ||
if (item.getDataObject().deadline) { | ||
const x = g.chartRowDateToX(new Date(item.getDataObject().deadline)); | ||
const dataObj = item.getDataObject(); | ||
if (dataObj && dataObj.deadline) { | ||
const x = g.chartRowDateToX(new Date(dataObj.deadline)); | ||
const td = item.getChildRow().querySelector('td'); | ||
@@ -208,0 +216,0 @@ td.style.position = 'relative'; |
{ | ||
"name": "jsgantt-improved", | ||
"version": "2.5.1", | ||
"version": "2.5.2", | ||
"description": "jsgantt-improved", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -100,5 +100,3 @@ import { formatDateStr } from "./utils/date_utils"; | ||
const data = vTaskList[i].getDataObject(); | ||
if (data) { | ||
vTmpCell = newNode(vTmpRow, 'td', null, `gadditional ${css}`); | ||
} | ||
vTmpCell = newNode(vTmpRow, 'td', null, `gadditional ${css}`); | ||
// const callback = (task, e) => task.setCost(e.target.value); | ||
@@ -117,3 +115,3 @@ // addListenerInputCell(vTmpCell, vEventsChange, callback, vTaskList[i], 'costdate'); | ||
AddTaskItemObject({ | ||
vParent: task.getParent() | ||
vParent: task.getParent() | ||
}); | ||
@@ -128,3 +126,3 @@ } | ||
if ('vShowRes' == column) newNode(vTmpRow, 'td', null, 'gspanning gresource', '\u00A0'); | ||
if ('vShowDur' == column) newNode(vTmpRow, 'td', null, 'gspanning gduration', '\u00A0'); | ||
if ('vShowDur' == column) newNode(vTmpRow, 'td', null, 'gspanning gduration', '\u00A0'); | ||
if ('vShowComp' == column) newNode(vTmpRow, 'td', null, 'gspanning gpccomplete', '\u00A0'); | ||
@@ -131,0 +129,0 @@ if ('vShowStartDate' == column) newNode(vTmpRow, 'td', null, 'gspanning gstartdate', '\u00A0'); |
@@ -15,3 +15,2 @@ import { isIE, stripUnwanted, internalPropertiesLang, hashKey, internalProperties } from "./utils/general_utils"; | ||
export const sortTasks = function (pList, pID, pIdx) { | ||
@@ -18,0 +17,0 @@ if (pList.length < 2) { |
@@ -123,2 +123,5 @@ import { TaskItem } from "./task"; | ||
let pEnd = getXMLNodeValue(Task[i], 'Finish', 2, ''); | ||
let pPlanStart = getXMLNodeValue(Task[i], 'PlanStart', 2, ''); | ||
let pPlanEnd = getXMLNodeValue(Task[i], 'PlanFinish', 2, ''); | ||
let pDuration = getXMLNodeValue(Task[i], 'Duration', 2, ''); | ||
let pLink = getXMLNodeValue(Task[i], 'HyperlinkAddress', 2, ''); | ||
@@ -202,3 +205,5 @@ let pMile = getXMLNodeValue(Task[i], 'Milestone', 1, 0); | ||
vSplitEnd = getXMLNodeValue(splits[k], (k + 1 == j) ? 'Finish' : 'Start', 2, ''); | ||
pGanttVar.AddTaskItem(new TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new TaskItem(maxPID, pName, vSplitStart, vSplitEnd, 'gtaskblue', | ||
pLink, pMile, pRes, pComp, 0, pID, pOpen, vDepend, pCaption, pNotes, pGanttVar, pCost, | ||
pPlanStart, pPlanEnd, pDuration)); | ||
vSubCreated = true; | ||
@@ -215,3 +220,4 @@ vDepend = ''; | ||
// Finally add the task | ||
pGanttVar.AddTaskItem(new TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, | ||
pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration)); | ||
} | ||
@@ -233,2 +239,5 @@ } | ||
let pEnd = getXMLNodeValue(Task[i], 'pEnd', 2, ''); | ||
let pPlanStart = getXMLNodeValue(Task[i], 'pPlanStart', 2, ''); | ||
let pPlanEnd = getXMLNodeValue(Task[i], 'pPlanEnd', 2, ''); | ||
let pDuration = getXMLNodeValue(Task[i], 'pDuration', 2, ''); | ||
let pLink = getXMLNodeValue(Task[i], 'pLink', 2, ''); | ||
@@ -253,3 +262,4 @@ let pMile = getXMLNodeValue(Task[i], 'pMile', 1, 0); | ||
// Finally add the task | ||
pGanttVar.AddTaskItem(new TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost)); | ||
pGanttVar.AddTaskItem(new TaskItem(pID, pName, pStart, pEnd, pClass, pLink, pMile, pRes, pComp, | ||
pGroup, pParent, pOpen, pDepend, pCaption, pNotes, pGanttVar, pCost, pPlanStart, pPlanEnd, pDuration)); | ||
} | ||
@@ -290,2 +300,5 @@ } | ||
vTask += '<pEnd>' + formatDateStr(this.vTaskList[vIdx].getEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pEnd>'; | ||
vTask += '<pPlanStart>' + formatDateStr(this.vTaskList[vIdx].getPlanStart(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanStart>'; | ||
vTask += '<pPlanEnd>' + formatDateStr(this.vTaskList[vIdx].getPlanEnd(), vOutFrmt, this.vLangs[this.vLang]) + '</pPlanEnd>'; | ||
vTask += '<pDuration>' + this.vTaskList[vIdx].getDuration() + '</pDuration>'; | ||
vTask += '<pClass>' + this.vTaskList[vIdx].getClass() + '</pClass>'; | ||
@@ -292,0 +305,0 @@ vTask += '<pLink>' + this.vTaskList[vIdx].getLink() + '</pLink>'; |
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 too big to display
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
5358528
101
124308