diff --git a/module/program/css/kanban.css b/module/program/css/kanban.css index 79fcfb66d9..0532b5c7fb 100644 --- a/module/program/css/kanban.css +++ b/module/program/css/kanban.css @@ -1,11 +1,13 @@ .main-table .table {cursor: default;} .main-table .table td {background: #f5f5f5;} +.main-table tbody>tr>td:first-child {padding: 0px 8px} .lane-name {overflow: hidden; text-overflow: ellipsis; writing-mode: vertical-lr;} .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;} .board-item:hover {border-color: #ccc;} -.board-item + .board-item {margin-top: 10px;} +.board-item {margin-top: 10px;} +.board-item:last-child {margin-bottom: 10px;} #kanban {overflow-y: auto;} #kanban tbody > tr > td {line-height: 24px;} @@ -15,12 +17,11 @@ .doing-td, .wait-project, .normal-plan, .normal-release {vertical-align: top !important;} -.doing-td > .board-doing > .table-row+.table-row {margin-top: 10px;} +.doing-td .board:first-child{padding-top: 0; border-top: unset;} -.board-doing-project {padding-right: 6px} -.board-doing-execution{padding-left: 6px} -.board-doing-project .table-row .table-col:last-child, .c-progress {width: 30px;} -.board-doing-execution .table-row .table-col:last-child, .c-progress {width: 30px;} -.table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.project-line {width: 100%; height: 2px; background: #fff} + +.doing-td .table-row .table-col:last-child, .c-progress {width: 30px;} +.doing-td .table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} .table-grouped tbody > tr > td:first-child, .table-grouped thead > tr > th:first-child {padding-left: 3px;} diff --git a/module/program/model.php b/module/program/model.php index 92762ba305..aa2520e0c8 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -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)) { diff --git a/module/program/view/kanban.html.php b/module/program/view/kanban.html.php index 549cccf45f..acc8775ae2 100644 --- a/module/program/view/kanban.html.php +++ b/module/program/view/kanban.html.php @@ -36,13 +36,13 @@ $program):?> - name;?>>name;?> + name;?>>name;?> products)):?> products as $productID => $product):?> ';?> - name;?>>name;?> - + name;?> rowspan='rowspan;?>'>name;?> + plans as $planID => $plan):?>
@@ -53,7 +53,7 @@
- + projects['wait'])):?> projects['wait'] as $projectID => $project):?>
@@ -66,53 +66,52 @@ - -
- projects['doing'])):?> - projects['doing'] as $projectID => $project):?> -
-
-
> -
-
- createLink('project', 'index', "projectID=$project->id"), $project->name);?> -
-
-
- hours->progress) ? $project->hours->progress : 0;?> -
-
-
-
+ projects['doing'])):?> + + projects['doing'] as $projectID => $project):?> + ";?> + +
+
> +
+
+ createLink('project', 'index', "projectID=$project->id"), $project->name);?> +
+
+
+ hours->progress) ? $project->hours->progress : 0;?> +
+
-
- execution)):?> -
> -
-
- createLink('execution', 'task', "executionID={$project->execution->id}"), $project->execution->name);?> -
-
-
- execution->hours->progress) ? $project->execution->hours->progress : 0;?> -
-
-
-
-
-
-
- -
- -
- + + execution)):?> +
+
> +
+
+ createLink('execution', 'task', "executionID={$project->execution->id}"), $project->execution->name);?> +
+
+
+ execution->hours->progress) ? $project->execution->hours->progress : 0;?> +
+
+
+
+
+
+
+
+ + + + rowspan;?>> releases as $releaseID => $release):?>
@@ -124,6 +123,15 @@
+ + ";?> + + + + + + + ';?>