diff options
Diffstat (limited to 'app/Template')
-rw-r--r-- | app/Template/analytic/avg_time_columns.php | 2 | ||||
-rw-r--r-- | app/Template/analytic/burndown.php | 2 | ||||
-rw-r--r-- | app/Template/analytic/cfd.php | 2 | ||||
-rw-r--r-- | app/Template/analytic/lead_cycle_time.php | 4 | ||||
-rw-r--r-- | app/Template/task/analytics.php | 9 |
5 files changed, 12 insertions, 7 deletions
diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php index a1690c2a..929331a9 100644 --- a/app/Template/analytic/avg_time_columns.php +++ b/app/Template/analytic/avg_time_columns.php @@ -5,7 +5,7 @@ <?php if (empty($metrics)): ?> <p class="alert"><?= t('Not enough data to show the graph.') ?></p> <?php else: ?> - <?= $this->app->component('chart-avg-time-column', array( + <?= $this->app->component('chart-project-avg-time-column', array( 'metrics' => $metrics, 'label' => t('Average time spent'), )) ?> diff --git a/app/Template/analytic/burndown.php b/app/Template/analytic/burndown.php index 1a3dd2cc..674c76dd 100644 --- a/app/Template/analytic/burndown.php +++ b/app/Template/analytic/burndown.php @@ -5,7 +5,7 @@ <?php if (! $display_graph): ?> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <?php else: ?> - <?= $this->app->component('chart-burndown', array( + <?= $this->app->component('chart-project-burndown', array( 'metrics' => $metrics, 'labelTotal' => t('Total for all columns'), 'dateFormat' => e('%%Y-%%m-%%d'), diff --git a/app/Template/analytic/cfd.php b/app/Template/analytic/cfd.php index d562a64d..5eb42e82 100644 --- a/app/Template/analytic/cfd.php +++ b/app/Template/analytic/cfd.php @@ -5,7 +5,7 @@ <?php if (! $display_graph): ?> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <?php else: ?> - <?= $this->app->component('chart-cumulative-flow', array( + <?= $this->app->component('chart-project-cumulative-flow', array( 'metrics' => $metrics, 'dateFormat' => e('%%Y-%%m-%%d'), )) ?> diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php index eeb2c219..d5908096 100644 --- a/app/Template/analytic/lead_cycle_time.php +++ b/app/Template/analytic/lead_cycle_time.php @@ -12,10 +12,10 @@ <?php if (empty($metrics)): ?> <p class="alert"><?= t('Not enough data to show the graph.') ?></p> <?php else: ?> - <?= $this->app->component('chart-lead-cycle-time', array( + <?= $this->app->component('chart-project-lead-cycle-time', array( 'metrics' => $metrics, 'labelCycle' => t('Cycle Time'), - 'labelTime' => t('Lead Time'), + 'labelLead' => t('Lead Time'), )) ?> <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off"> diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php index 071f24a7..28c0189c 100644 --- a/app/Template/task/analytics.php +++ b/app/Template/task/analytics.php @@ -16,8 +16,13 @@ </ul> </div> -<h3 id="analytic-task-time-column"><?= t('Time spent into each column') ?></h3> -<div id="chart" data-metrics='<?= json_encode($time_spent_columns, JSON_HEX_APOS) ?>' data-label="<?= t('Time spent') ?>"></div> +<h3><?= t('Time spent into each column') ?></h3> + +<?= $this->app->component('chart-task-time-column', array( + 'metrics' => $time_spent_columns, + 'label' => t('Time spent'), +)) ?> + <table class="table-striped"> <tr> <th><?= t('Column') ?></th> |