Skip to content
This repository has been archived by the owner on Sep 7, 2020. It is now read-only.

fix(dependencies): remove dependencies on remove event #585 #673

Closed
wants to merge 3 commits into from
Closed

fix(dependencies): remove dependencies on remove event #585 #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a08e5
fix(dependencies): remove dependencies fromTask model on remove event.
Oct 6, 2016
f3dfb2f
Add jsDoc comments
Oct 6, 2016
c296948
Remove unnecesary attribute
11joselu Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 17 additions & 2 deletions src/plugins/dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
});

api.tasks.on.add(scope, function(task) {
manager.addDependenciesFromTask(task);
// isDraw = true - Do not remove dependencies from Task model when toTask is not defined
manager.addDependenciesFromTask(task, true);
});

api.tasks.on.remove(scope, function(task) {
Expand Down Expand Up @@ -190,7 +191,21 @@

api.dependencies.on.remove(scope, function(dependency) {
if (scope.conflictChecker && scope.enabled) {
checker.refresh([dependency.getFromTask(), dependency.getToTask()]);
var fromTask = dependency.getFromTask();
var toTask = dependency.getToTask();

if (fromTask && toTask) {
checker.refresh([fromTask, toTask]);
} else {

if (fromTask) {
checker.removeConflictClass(fromTask);
} else {
checker.removeConflictClass(toTask);
}

}

}
});

Expand Down
4 changes: 4 additions & 0 deletions src/plugins/dependencies/dependenciesChecker.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@
handleTaskNonConflict(conflictsList, allTasks);
};

this.removeConflictClass = function(task) {
task.$element.removeClass('gantt-task-conflict');
};

/**
* Remove the conflict status of given tasks.
*
Expand Down
36 changes: 26 additions & 10 deletions src/plugins/dependencies/dependenciesManager.factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@
* Add all dependencies defined from a task. Dependencies will be added only if plugin is enabled.
*
* @param task
* @param isDraw [boolean] - true: Do not remove dependency from Task model
*/
this.addDependenciesFromTask = function(task) {
this.addDependenciesFromTask = function(task, isDraw) {
if (this.pluginScope.enabled) {
var taskDependencies = task.model.dependencies;

Expand All @@ -61,8 +62,11 @@
}

for (var i = 0, l = taskDependencies.length; i < l; i++) {
var dependency = self.addDependency(task, taskDependencies[i]);
dependency.connect();
var dependency = self.addDependency(task, taskDependencies[i], isDraw);

if (dependency !== null) {
dependency.connect();
}
}
}
}
Expand Down Expand Up @@ -92,12 +96,14 @@
*
* @param task Task defining the dependency.
* @param model Model object for the dependency.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add isDraw @param jsDoc

* @param isDraw [boolean] - true: Do not remove dependency from Task model
*/
this.addDependency = function(task, model) {
this.addDependency = function(task, model, isDraw) {
var dependency = new Dependency(this, task, model);

var fromTaskId = dependency.getFromTaskId();
var toTaskId = dependency.getToTaskId();
var toTask = dependency.getToTask();
var manager = dependency.manager;

if (!(fromTaskId in this.dependenciesFrom)) {
this.dependenciesFrom[fromTaskId] = [];
Expand All @@ -106,14 +112,24 @@
this.dependenciesTo[toTaskId] = [];
}

if (fromTaskId) {
this.dependenciesFrom[fromTaskId].push(dependency);
}
if (!isDraw && !toTask) {
// Remove dependency
this.removeDependency(dependency, true);

if (toTaskId) {
this.dependenciesTo[toTaskId].push(dependency);
manager.api.dependencies.raise.remove(dependency);

return null;
} else {
if (fromTaskId) {
this.dependenciesFrom[fromTaskId].push(dependency);
}

if (toTaskId) {
this.dependenciesTo[toTaskId].push(dependency);
}
}


return dependency;
};

Expand Down