AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't display analytics if not enough data

Browse Source
This commit is contained in:
Frédéric Guillot
2014-11-15 21:55:42 -05:00
parent aa6fffb05a
commit 557bc2c3cd
3 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Model/ProjectAnalytic.php
View File

@@ -34,6 +34,10 @@ class ProjectAnalytic extends Base
); );
} }
if ($total === 0) {
return array();
}
foreach ($metrics as &$metric) { foreach ($metrics as &$metric) {
$metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2); $metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2);
} }
@@ -71,6 +75,10 @@ class ProjectAnalytic extends Base
$metrics[$user]['nb_tasks']++; $metrics[$user]['nb_tasks']++;
} }
if ($total === 0) {
return array();
}
foreach ($metrics as &$metric) { foreach ($metrics as &$metric) {
$metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2); $metric['percentage'] = round(($metric['nb_tasks'] * 100) / $total, 2);
} }

15
app/Template/analytic/tasks.php
View File

@@ -1,11 +1,15 @@
<div class="page-header"> <div class="page-header">
<h2><?= t('Task distribution') ?></h2> <h2><?= t('Task distribution') ?></h2>
</div> </div>
<section id="analytic-task-repartition">
<div id="chart" data-url="<?= Helper\u('analytic', 'tasks', array('project_id' => $project['id'])) ?>"></div> <?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data.') ?></p>
<?php else: ?>
<section id="analytic-task-repartition">
<table> <div id="chart" data-url="<?= Helper\u('analytic', 'tasks', array('project_id' => $project['id'])) ?>"></div>
<table>
<tr> <tr>
<th><?= t('Column') ?></th> <th><?= t('Column') ?></th>
<th><?= t('Number of tasks') ?></th> <th><?= t('Number of tasks') ?></th>
@@ -24,6 +28,7 @@
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</table> </table>
</section> </section>
<?php endif ?>

15
app/Template/analytic/users.php
View File

@@ -1,11 +1,15 @@
<div class="page-header"> <div class="page-header">
<h2><?= t('User repartition') ?></h2> <h2><?= t('User repartition') ?></h2>
</div> </div>
<section id="analytic-user-repartition">
<div id="chart" data-url="<?= Helper\u('analytic', 'users', array('project_id' => $project['id'])) ?>"></div> <?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data.') ?></p>
<?php else: ?>
<section id="analytic-user-repartition">
<table> <div id="chart" data-url="<?= Helper\u('analytic', 'users', array('project_id' => $project['id'])) ?>"></div>
<table>
<tr> <tr>
<th><?= t('User') ?></th> <th><?= t('User') ?></th>
<th><?= t('Number of tasks') ?></th> <th><?= t('Number of tasks') ?></th>
@@ -24,6 +28,7 @@
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</table> </table>
</section> </section>
<?php endif ?>