marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-11-04 12:54:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Feature request 552. Gnatt chart task with multiple dependencies

Browse Source
This commit is contained in:
Itprdev
2019-11-28 16:12:45 +02:00
parent 02d5143ff2
commit 78e4fead49
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/diagrams/gantt/ganttDb.js
View File

@@ -134,18 +134,32 @@ const getStartDate = function(prevTime, dateFormat, str) {
str = str.trim(); str = str.trim();
// Test for after // Test for after
const re = /^after\s+([\d\w-]+)/; const re = /^after\s+([\d\w- ]+)/;
const afterStatement = re.exec(str.trim()); const afterStatement = re.exec(str.trim());
if (afterStatement !== null) { if (afterStatement !== null) {
const task = findTaskById(afterStatement[1]); // check all after ids and take the latest
let latestEndingTask = null;
afterStatement[1].split(' ').forEach(function(id) {
let task = findTaskById(id);
if (typeof task !== 'undefined') {
if (!latestEndingTask) {
latestEndingTask = task;
} else {
if (task.endTime > latestEndingTask.endTime) {
latestEndingTask = task;
}
}
}
});
if (typeof task === 'undefined') { if (!latestEndingTask) {
const dt = new Date(); const dt = new Date();
dt.setHours(0, 0, 0, 0); dt.setHours(0, 0, 0, 0);
return dt; return dt;
} else {
return latestEndingTask.endTime;
} }
return task.endTime;
} }
// Check for actual date set // Check for actual date set