Skip to content

Fix arrow render order so critical arrows appear on top #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexrcore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix arrow render order so critical arrows appear on top #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions lib/utlis/Pert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Pert {
task.key,
(!task.dependsOn || task.dependsOn.length === 0
? { ...task, dependsOn: [this.startTaskKey], index }
: { ...task, index }) as Task
: { ...task, index }) as Task,
);
});
}
Expand All @@ -57,7 +57,7 @@ class Pert {
});

let lastTask = Array.from(this.tasksMap.values()).reduce((prev, current) =>
prev.earlyFinish > current.earlyFinish ? prev : current
prev.earlyFinish > current.earlyFinish ? prev : current,
);
lastTask.lateFinish = lastTask.earlyFinish;
lastTask.critical = true;
Expand Down Expand Up @@ -90,14 +90,14 @@ class Pert {
this.levels.forEach((indices, key) => {
this.levels.set(
key,
indices.sort((a, b) => this.tasksMap.get(a)!.index - this.tasksMap.get(b)!.index)
indices.sort((a, b) => this.tasksMap.get(a)!.index - this.tasksMap.get(b)!.index),
);
});
}

private getSuccessors(task: Task): Task[] {
return Array.from(this.tasksMap.values()).filter(
(t) => t.dependsOn && t.dependsOn.includes(task.key)
(t) => t.dependsOn && t.dependsOn.includes(task.key),
);
}

Expand All @@ -112,7 +112,7 @@ class Pert {

maxFinishTime = Math.max(
maxFinishTime,
dependencyTask.earlyStart + dependencyTask.duration
dependencyTask.earlyStart + dependencyTask.duration,
);
});
task.earlyStart = maxFinishTime;
Expand Down Expand Up @@ -226,7 +226,7 @@ class Pert {
}
});

this.links = linkData;
this.links = linkData.sort((a, b) => Number(a.critical) - Number(b.critical));
}

private calcCriticalPaths() {
Expand All @@ -235,22 +235,23 @@ class Pert {
const criticalPaths: CriticalPath[] = [];
const startNodes = this.links.filter(
(link) =>
link.critical && link.from === this.startTaskKey && link.to !== this.lastTaskKey
link.critical && link.from === this.startTaskKey && link.to !== this.lastTaskKey,
);

startNodes.forEach((startNode) => {
const path: LinkType[] = [startNode];

const findPath = (node: LinkType) => {
const nodeLinks = this.links.filter(
(link) => link.critical && link.from === node.to && link.to !== this.lastTaskKey
(link) =>
link.critical && link.from === node.to && link.to !== this.lastTaskKey,
);
if (nodeLinks.length === 0) {
criticalPaths.push(
path.map((p) => ({
text: this.tasksMap.get(p.to)!.text,
key: p.to,
}))
})),
);
} else {
nodeLinks.forEach((nodeLink) => {
Expand Down