Move chart task time column to components

This commit is contained in:
Frederic Guillot
2016-11-21 23:16:18 -05:00
parent 25272afa9b
commit b9ab163344
12 changed files with 58 additions and 59 deletions

View File

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

View File

@@ -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'),

View File

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

View File

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

View File

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