Skip to content
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.

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

Add new links dependency property in task #123

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions example/src/helper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ export function initTasks() {
id: "Task 1",
progress: 25,
dependencies: ["Task 0"],
links: [{
target: "Task 0",
type: "EndToStart"
}],
type: "task",
project: "ProjectSample",
displayOrder: 3,
Expand All @@ -47,6 +51,10 @@ export function initTasks() {
id: "Task 2",
progress: 10,
dependencies: ["Task 1"],
links: [{
target: "Task 1",
type: "StartToEnd"
}],
type: "task",
project: "ProjectSample",
displayOrder: 4,
Expand All @@ -58,6 +66,10 @@ export function initTasks() {
id: "Task 3",
progress: 2,
dependencies: ["Task 2"],
links: [{
target: "Task 2",
type: "EndToEnd"
}],
type: "task",
project: "ProjectSample",
displayOrder: 5,
Expand All @@ -70,6 +82,10 @@ export function initTasks() {
type: "task",
progress: 70,
dependencies: ["Task 2"],
links: [{
target: "Task 2",
type: "StartToStart"
}],
project: "ProjectSample",
displayOrder: 6,
},
Expand Down
93 changes: 84 additions & 9 deletions src/components/other/arrow.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import { BarTask } from "../../types/bar-task";
import { Link } from "../../types/public-types";

type ArrowProps = {
taskFrom: BarTask;
Expand Down Expand Up @@ -45,6 +46,24 @@ export const Arrow: React.FC<ArrowProps> = ({
);
};

const arrowToStart = (
taskTo: BarTask,
taskToEndPosition: number,
) => {
return `${taskTo.x1},${taskToEndPosition}
${taskTo.x1 - 5},${taskToEndPosition - 5}
${taskTo.x1 - 5},${taskToEndPosition + 5}`;
}

const arrowToEnd = (
task: BarTask,
taskToEndPosition: number,
) => {
return `${task.x2},${taskToEndPosition}
${task.x2 + 5},${taskToEndPosition + 5}
${task.x2 + 5},${taskToEndPosition - 5}`;
}

const drownPathAndTriangle = (
taskFrom: BarTask,
taskTo: BarTask,
Expand All @@ -62,16 +81,72 @@ const drownPathAndTriangle = (
? arrowIndent
: taskTo.x1 - taskFrom.x2 - arrowIndent;

const path = `M ${taskFrom.x2} ${taskFrom.y + taskHeight / 2}
h ${arrowIndent}
v ${(indexCompare * rowHeight) / 2}
${taskFromHorizontalOffsetValue}
V ${taskToEndPosition}
h ${taskToHorizontalOffsetValue}`;
const endToStartPath = () => {
return `M ${taskFrom.x2} ${taskFrom.y + taskHeight / 2}
h ${arrowIndent}
v ${(indexCompare * rowHeight) / 2}
${taskFromHorizontalOffsetValue}
V ${taskToEndPosition}
h ${taskToHorizontalOffsetValue}`;
}

const startToEndPath = () => {
return `M ${taskFrom.x1} ${taskFrom.y + taskHeight / 2}
h ${-arrowIndent}
v ${(indexCompare * rowHeight) / 2}
H ${taskTo.x2 + arrowIndent}
V ${taskToEndPosition}
h ${-arrowIndent}`;
}

const endToEndPath = () => {
return `M ${taskFrom.x2} ${taskFrom.y + taskHeight / 2}
h ${arrowIndent}
v ${(indexCompare * rowHeight) / 2}
${taskFromEndPosition > taskTo.x2 + arrowIndent + 10 ? "" : `H ${taskTo.x2 + arrowIndent}`}
V ${taskToEndPosition}
h ${taskFromEndPosition < taskTo.x2
? -arrowIndent
: taskTo.x1 - taskFrom.x2 - arrowIndent}`;
}

const startToStartPath = () => {
return `M ${taskFrom.x1} ${taskFrom.y + taskHeight / 2}
h ${-arrowIndent}
v ${(indexCompare * rowHeight) / 2}
${taskFromHorizontalOffsetValue}
V ${taskToEndPosition}
h ${taskFromEndPosition > taskTo.x1
? arrowIndent
: taskTo.x2 - taskFrom.x1 - arrowIndent}`;
}

// default endToStart
let trianglePoints = arrowToStart(taskTo, taskToEndPosition);
let path = endToStartPath();

if (taskTo?.links) {
const startToEnd = taskTo?.links.find((link: Link) => link.type === "StartToEnd");
const endToEnd = taskTo?.links.find((link: Link) => link.type === "EndToEnd");
const startToStart = taskTo?.links.find((link: Link) => link.type === "StartToStart");

if (startToEnd) {
trianglePoints = arrowToEnd(taskTo, taskToEndPosition);
path = startToEndPath();
}

if (endToEnd) {
trianglePoints = arrowToEnd(taskTo, taskToEndPosition);
path = endToEndPath();
}

if (startToStart) {
trianglePoints = arrowToStart(taskTo, taskToEndPosition);
path = startToStartPath();
}

}

const trianglePoints = `${taskTo.x1},${taskToEndPosition}
${taskTo.x1 - 5},${taskToEndPosition - 5}
${taskTo.x1 - 5},${taskToEndPosition + 5}`;
return [path, trianglePoints];
};

Expand Down
8 changes: 2 additions & 6 deletions src/helpers/other-helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ export function removeHiddenTasks(tasks: Task[]) {

function getChildren(taskList: Task[], task: Task) {
let tasks: Task[] = [];
if (task.type !== "project") {
tasks = taskList.filter(
t => t.dependencies && t.dependencies.indexOf(task.id) !== -1
);
} else {
tasks = taskList.filter(t => t.project && t.project === task.id);
if (task.type === "project") {
tasks = taskList.filter(t => t.project && t.project === task.id);
}
var taskChildren: Task[] = [];
tasks.forEach(t => {
Expand Down
8 changes: 8 additions & 0 deletions src/types/public-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ export enum ViewMode {
Year = "Year",
}
export type TaskType = "task" | "milestone" | "project";

export type LinkType = "EndToStart" | "EndToEnd" | "StartToStart" | "StartToEnd";

export interface Link {
target: string;
type: LinkType;
}
export interface Task {
id: string;
type: TaskType;
Expand All @@ -28,6 +35,7 @@ export interface Task {
isDisabled?: boolean;
project?: string;
dependencies?: string[];
links?: Array<Link>;
hideChildren?: boolean;
displayOrder?: number;
}
Expand Down