* Adjust program kanban style.

2021-08-31 15:29:57 +08:00
parent 14a048caca
commit 16344b108d
3 changed files with 67 additions and 51 deletions
@@ -258,6 +258,8 @@ class programModel extends model
                    $project->hours     = zget($hours, $project->id, array());
                    $product->projects[$status][] = $project;
                }
+
+                $product->rowspan = isset($product->projects['doing']) ? count($product->projects['doing']) > 0 ? count($product->projects['doing']) : 1 : 1;
            }
        }

@@ -265,6 +267,11 @@ class programModel extends model
        foreach($programs as $programID => $program)
        {
            $program->products = zget($productGroup, $programID, array());
+            $program->rowspan  = count($program->products) > 0 ? count($program->products) : 1;
+            foreach($program->products as $product)
+            {
+                if(isset($product->projects['doing']) and count($product->projects['doing']) > 0) $program->rowspan += count($product->projects['doing']) - 1;
+            }

            if(in_array($programID, $involvedPrograms))
            {