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

Convert time comparison chart to Vue.js component

Browse Source
This commit is contained in:
Frederic Guillot
2016-09-03 21:20:54 -04:00
parent ef8ddb59c9
commit daa076eea7
7 changed files with 53 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Template/analytic/sidebar.php
View File

@@ -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)) ?>

17
app/Template/analytic/compare_hours.php → app/Template/analytic/time_comparison.php
View File

@@ -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 ?>