From b2955f170460414d183aa4d3859781ed555c0a92 Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Thu, 29 Aug 2019 12:08:42 +0200
Subject: [PATCH] tasksgraphs: fix parent task row

* Consider all the tasks from the current level + 1 when fetching the parents
tasks

* Exclude the child level when computing the parent row needed to create an edge
that don't overlaps with the tasks of greater level.
---
 src/components/tasksgraph.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/tasksgraph.vue b/src/components/tasksgraph.vue
index 06c9082..1bef4c9 100644
--- a/src/components/tasksgraph.vue
+++ b/src/components/tasksgraph.vue
@@ -205,12 +205,29 @@ export default {
         return levelTasks;
       };
 
+      let levelsTasks = function(tasks, startLevel) {
+        let levelTasks = [];
+        for (let task of tasks) {
+          if (task.level < startLevel) {
+            continue;
+          }
+          levelTasks.push(task);
+        }
+        return levelTasks;
+      };
+
       let levelTasksByRow = function(tasks, level) {
         return levelTasks(tasks, level).sort((a, b) =>
           a.row > b.row ? 1 : b.row > a.row ? -1 : 0
         );
       };
 
+      let levelsTasksByRow = function(tasks, startLevel) {
+        return levelsTasks(tasks, startLevel).sort((a, b) =>
+          a.row > b.row ? 1 : b.row > a.row ? -1 : 0
+        );
+      };
+
       let levelFreeRow = function(tasks, level) {
         let rows = [];
         for (let task of tasks) {
@@ -254,7 +271,7 @@ export default {
         let row = 0;
         // if not at the last level fetch parents by their childs
         if (l < maxlevel) {
-          for (let curTask of levelTasksByRow(graphTasks, l + 1)) {
+          for (let curTask of levelsTasksByRow(graphTasks, l + 1)) {
             for (let depTaskID in curTask.depends) {
               for (let parent of levelTasks(graphTasks, l)) {
                 if (seenTasks.has(parent.id)) {
@@ -266,7 +283,7 @@ export default {
                   let maxChildLevel = taskMaxChildLevel(graphTasks, parent);
                   if (maxChildLevel > parent.level + 1) {
                     // put parent in a row greater than the max row the next levels until the child level
-                    let mrow = levelsMaxRow(graphTasks, maxChildLevel) + 1;
+                    let mrow = levelsMaxRow(graphTasks, maxChildLevel - 1) + 1;
                     parent.row = mrow;
                     row = mrow + 1;
                   } else {