From 6f649b7d21e6f04518e51642aed14d1c4f0ddca8 Mon Sep 17 00:00:00 2001
From: Konstantin Vorobyev <vorobyev@coacha.com>
Date: Wed, 22 Feb 2017 21:52:34 +0900
Subject: Show total score across all swimlanes #2975

---
 app/Template/board/table_column.php | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'app')

diff --git a/app/Template/board/table_column.php b/app/Template/board/table_column.php
index df16715f..c2d6b9fc 100644
--- a/app/Template/board/table_column.php
+++ b/app/Template/board/table_column.php
@@ -53,17 +53,26 @@
                 <?php endif ?>
             </span>
 
-            <?php if (! $not_editable && ! empty($column['description'])): ?>
-                <span class="tooltip pull-right" title="<?= $this->text->markdownAttribute($column['description']) ?>">
-                    &nbsp;<i class="fa fa-info-circle"></i>
-                </span>
-            <?php endif ?>
+            <span class="pull-right">
+                <?php if ($swimlane['nb_swimlanes'] > 1 && ! empty($column['column_score'])): ?>
+                    <span title="<?= t('Total score in this column across all swimlanes') ?>">
+                        (<span><?= $column['column_score'] ?></span>)
+                    </span>
+                <?php endif ?>
 
-            <?php if (! empty($column['score'])): ?>
-                <span class="pull-right" title="<?= t('Score') ?>">
-                    <?= $column['score'] ?>
-                </span>
-            <?php endif ?>
+                <?php if (! empty($column['score'])): ?>
+                    <span title="<?= t('Score') ?>">
+                        <?= $column['score'] ?>
+                    </span>
+                <?php endif ?>
+
+                <?php if (! $not_editable && ! empty($column['description'])): ?>
+                    <span class="tooltip" title="<?= $this->text->markdownAttribute($column['description']) ?>">
+                        &nbsp;<i class="fa fa-info-circle"></i>
+                    </span>
+                <?php endif ?>
+
+            </span>
 
             <?php if ($column['task_limit']): ?>
                 <span title="<?= t('Task limit') ?>">
-- 
cgit v1.2.3