summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/analytic/sidebar.php4
-rw-r--r--app/Template/analytic/time_comparison.php (renamed from app/Template/analytic/compare_hours.php)17
2 files changed, 10 insertions, 11 deletions
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index ceb57fac..f768a11d 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -18,8 +18,8 @@
<li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
<?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
</li>
- <li <?= $this->app->checkMenuSelection('AnalyticController', 'compareHours') ?>>
- <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
+ <li <?= $this->app->checkMenuSelection('AnalyticController', 'timeComparison') ?>>
+ <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?>
</li>
<?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/time_comparison.php
index c0b9cfc3..ee0ee4b6 100644
--- a/app/Template/analytic/compare_hours.php
+++ b/app/Template/analytic/time_comparison.php
@@ -12,17 +12,17 @@
<?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data to show the graph.') ?></p>
<?php else: ?>
-<section id="analytic-compare-hours">
- <div id="chart"
- data-metrics='<?= json_encode($metrics, JSON_HEX_APOS)?>'
- data-label-spent="<?= t('Hours Spent') ?>"
- data-label-estimated="<?= t('Hours Estimated') ?>"
- data-label-closed="<?= t('Closed') ?>"
- data-label-open="<?= t('Open') ?>"></div>
-
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('No tasks found.') ?></p>
<?php elseif (! $paginator->isEmpty()): ?>
+ <chart-project-time-comparison
+ :metrics='<?= json_encode($metrics, JSON_HEX_APOS)?>'
+ label-spent="<?= t('Hours Spent') ?>"
+ label-estimated="<?= t('Hours Estimated') ?>"
+ label-closed="<?= t('Closed') ?>"
+ label-open="<?= t('Open') ?>">
+ </chart-project-time-comparison>
+
<table class="table-fixed table-small table-scrolling">
<tr>
<th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
@@ -58,5 +58,4 @@
<?= $paginator ?>
<?php endif ?>
-</section>
<?php endif ?>