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

Display project analytics in modal box

Browse Source
This commit is contained in:
Frederic Guillot
2017-01-08 14:00:51 -05:00
parent ea2cbb76d5
commit b3a450bace
23 changed files with 124 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -11,6 +11,7 @@ Improvements:
* Open task import in modal box * Open task import in modal box
* Open form to create customer filters in modal box * Open form to create customer filters in modal box
* Open project activities in modal box * Open project activities in modal box
* Display project analytics in modal box
Version 1.0.36 (Dec 30, 2016) Version 1.0.36 (Dec 30, 2016)
----------------------------- -----------------------------

3
app/Controller/ActivityController.php
View File

@@ -19,9 +19,10 @@ class ActivityController extends BaseController
{ {
$project = $this->getProject(); $project = $this->getProject();
$this->response->html($this->template->render('activity/project', array( $this->response->html($this->helper->layout->app('activity/project', array(
'events' => $this->helper->projectActivity->getProjectEvents($project['id']), 'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
'project' => $project, 'project' => $project,
'title' => t('%s\'s activity', $project['name'])
))); )));
} }

12
app/Core/Paginator.php
View File

@@ -374,7 +374,9 @@ class Paginator
'← '.t('Previous'), '← '.t('Previous'),
$this->controller, $this->controller,
$this->action, $this->action,
$this->getUrlParams($this->page - 1, $this->order, $this->direction) $this->getUrlParams($this->page - 1, $this->order, $this->direction),
false,
'js-modal-replace'
); );
} else { } else {
$html .= '← '.t('Previous'); $html .= '← '.t('Previous');
@@ -400,7 +402,9 @@ class Paginator
t('Next').' →', t('Next').' →',
$this->controller, $this->controller,
$this->action, $this->action,
$this->getUrlParams($this->page + 1, $this->order, $this->direction) $this->getUrlParams($this->page + 1, $this->order, $this->direction),
false,
'js-modal-replace'
); );
} else { } else {
$html .= t('Next').' →'; $html .= t('Next').' →';
@@ -486,7 +490,9 @@ class Paginator
$label, $label,
$this->controller, $this->controller,
$this->action, $this->action,
$this->getUrlParams($this->page, $column, $direction) $this->getUrlParams($this->page, $column, $direction),
false,
'js-modal-replace'
); );
} }
} }

14
app/Helper/LayoutHelper.php
View File

@@ -22,7 +22,10 @@ class LayoutHelper extends Base
*/ */
public function app($template, array $params = array()) public function app($template, array $params = array())
{ {
if ($this->request->isAjax()) { $isAjax = $this->request->isAjax();
$params['is_ajax'] = $isAjax;
if ($isAjax) {
return $this->template->render($template, $params); return $this->template->render($template, $params);
} }
@@ -160,7 +163,7 @@ class LayoutHelper extends Base
$params['title'] = $params['project']['name'].' > '.$params['title']; $params['title'] = $params['project']['name'].' > '.$params['title'];
} }
return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params); return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params, true);
} }
/** /**
@@ -188,13 +191,16 @@ class LayoutHelper extends Base
* @param string $sidebar * @param string $sidebar
* @param string $template * @param string $template
* @param array $params * @param array $params
* @param bool $ignoreAjax
* @return string * @return string
*/ */
public function subLayout($sublayout, $sidebar, $template, array $params = array()) public function subLayout($sublayout, $sidebar, $template, array $params = array(), $ignoreAjax = false)
{ {
$isAjax = $this->request->isAjax();
$params['is_ajax'] = $isAjax;
$content = $this->template->render($template, $params); $content = $this->template->render($template, $params);
if ($this->request->isAjax()) { if (!$ignoreAjax && $isAjax) {
return $content; return $content;
} }

5
app/Helper/ModalHelper.php
View File

@@ -75,4 +75,9 @@ class ModalHelper extends Base
{ {
return $this->helper->url->link($label, $controller, $action, $params, false, 'js-modal-confirm'); return $this->helper->url->link($label, $controller, $action, $params, false, 'js-modal-confirm');
} }
public function replaceLink($label, $controller, $action, array $params = array())
{
return $this->helper->url->link($label, $controller, $action, $params, false, 'js-modal-replace');
}
} }

28
app/Template/analytic/avg_time_columns.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Average time spent into each column') ?></h2> <div class="page-header">
</div> <h2><?= t('Average time spent into each column') ?></h2>
</div>
<?php endif ?>
<?php if (empty($metrics)): ?> <?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data to show the graph.') ?></p> <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
@@ -11,16 +13,16 @@
)) ?> )) ?>
<table class="table-striped"> <table class="table-striped">
<tr> <tr>
<th><?= t('Column') ?></th> <th><?= t('Column') ?></th>
<th><?= t('Average time spent') ?></th> <th><?= t('Average time spent') ?></th>
</tr> </tr>
<?php foreach ($metrics as $column): ?> <?php foreach ($metrics as $column): ?>
<tr> <tr>
<td><?= $this->text->e($column['title']) ?></td> <td><?= $this->text->e($column['title']) ?></td>
<td><?= $this->dt->duration($column['average']) ?></td> <td><?= $this->dt->duration($column['average']) ?></td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>
</table> </table>
<p class="alert alert-info"> <p class="alert alert-info">

24
app/Template/analytic/burndown.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Burndown chart') ?></h2> <div class="page-header">
</div> <h2><?= t('Burndown chart') ?></h2>
</div>
<?php endif ?>
<?php if (! $display_graph): ?> <?php if (! $display_graph): ?>
<p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
@@ -15,20 +17,10 @@
<hr/> <hr/>
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off"> <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?> <?= $this->form->csrf() ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?>
<div class="form-inline-group"> <?= $this->form->date(t('End date'), 'to', $values) ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?> <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
</div>
<div class="form-inline-group">
<?= $this->form->date(t('End date'), 'to', $values) ?>
</div>
<div class="form-inline-group">
<button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
</div>
</form> </form>
<p class="alert alert-info"><?= t('This chart show the task complexity over the time (Work Remaining).') ?></p> <p class="alert alert-info"><?= t('This chart show the task complexity over the time (Work Remaining).') ?></p>

24
app/Template/analytic/cfd.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Cumulative flow diagram') ?></h2> <div class="page-header">
</div> <h2><?= t('Cumulative flow diagram') ?></h2>
</div>
<?php endif ?>
<?php if (! $display_graph): ?> <?php if (! $display_graph): ?>
<p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p> <p class="alert"><?= t('You need at least 2 days of data to show the chart.') ?></p>
@@ -14,18 +16,8 @@
<hr/> <hr/>
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off"> <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?> <?= $this->form->csrf() ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?>
<div class="form-inline-group"> <?= $this->form->date(t('End date'), 'to', $values) ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?> <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
</div>
<div class="form-inline-group">
<?= $this->form->date(t('End date'), 'to', $values) ?>
</div>
<div class="form-inline-group">
<button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
</div>
</form> </form>

18
app/Template/analytic/layout.php
View File

@@ -1,10 +1,14 @@
<section id="main"> <?php if ($is_ajax): ?>
<div class="page-header">
<h2><?= $title ?></h2>
</div>
<?php else: ?>
<?= $this->projectHeader->render($project, 'TaskListController', 'show') ?> <?= $this->projectHeader->render($project, 'TaskListController', 'show') ?>
<section class="sidebar-container"> <?php endif ?>
<?= $this->render($sidebar_template, array('project' => $project)) ?> <section class="sidebar-container">
<?= $this->render($sidebar_template, array('project' => $project)) ?>
<div class="sidebar-content"> <div class="sidebar-content">
<?= $content_for_sublayout ?> <?= $content_for_sublayout ?>
</div> </div>
</section>
</section> </section>

24
app/Template/analytic/lead_cycle_time.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Average Lead and Cycle time') ?></h2> <div class="page-header">
</div> <h2><?= t('Average Lead and Cycle time') ?></h2>
</div>
<?php endif ?>
<div class="panel"> <div class="panel">
<ul> <ul>
@@ -19,20 +21,10 @@
)) ?> )) ?>
<form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off"> <form method="post" class="form-inline" action="<?= $this->url->href('AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
<?= $this->form->csrf() ?> <?= $this->form->csrf() ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?>
<div class="form-inline-group"> <?= $this->form->date(t('End date'), 'to', $values) ?>
<?= $this->form->date(t('Start date'), 'from', $values) ?> <?= $this->modal->submitButtons(array('submitLabel' => t('Execute'))) ?>
</div>
<div class="form-inline-group">
<?= $this->form->date(t('End date'), 'to', $values) ?>
</div>
<div class="form-inline-group">
<button type="submit" class="btn btn-blue"><?= t('Execute') ?></button>
</div>
</form> </form>
<p class="alert alert-info"> <p class="alert alert-info">

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

@@ -1,28 +1,27 @@
<div class="sidebar"> <div class="sidebar">
<ul> <ul>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'taskDistribution') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'taskDistribution') ?>>
<?= $this->url->link(t('Task distribution'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Task distribution'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'userDistribution') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'userDistribution') ?>>
<?= $this->url->link(t('User repartition'), 'AnalyticController', 'userDistribution', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('User repartition'), 'AnalyticController', 'userDistribution', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'cfd') ?>>
<?= $this->url->link(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Cumulative flow diagram'), 'AnalyticController', 'cfd', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'burndown') ?>>
<?= $this->url->link(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Burndown chart'), 'AnalyticController', 'burndown', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'averageTimeByColumn') ?>>
<?= $this->url->link(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Average time into each column'), 'AnalyticController', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
<?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
</li> </li>
<li <?= $this->app->checkMenuSelection('AnalyticController', 'timeComparison') ?>> <li <?= $this->app->checkMenuSelection('AnalyticController', 'timeComparison') ?>>
<?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?> <?= $this->modal->replaceLink(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?>
</li> </li>
<?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?> <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
</ul> </ul>
</div> </div>

8
app/Template/analytic/task_distribution.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Task distribution') ?></h2> <div class="page-header">
</div> <h2><?= t('Task distribution') ?></h2>
</div>
<?php endif ?>
<?php if (empty($metrics)): ?> <?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data to show the graph.') ?></p> <p class="alert"><?= t('Not enough data to show the graph.') ?></p>

14
app/Template/analytic/time_comparison.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('Estimated vs actual time') ?></h2> <div class="page-header">
</div> <h2><?= t('Estimated vs actual time') ?></h2>
</div>
<?php endif ?>
<div class="panel"> <div class="panel">
<ul> <ul>
@@ -27,9 +29,9 @@
<tr> <tr>
<th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th> <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
<th><?= $paginator->order(t('Title'), 'tasks.title') ?></th> <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
<th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th> <th class="column-10"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
<th class="column-10"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th> <th class="column-12"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
<th class="column-10"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th> <th class="column-12"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
</tr> </tr>
<?php foreach ($paginator->getCollection() as $task): ?> <?php foreach ($paginator->getCollection() as $task): ?>
<tr> <tr>

8
app/Template/analytic/user_distribution.php
View File

@@ -1,6 +1,8 @@
<div class="page-header"> <?php if (! $is_ajax): ?>
<h2><?= t('User repartition') ?></h2> <div class="page-header">
</div> <h2><?= t('User repartition') ?></h2>
</div>
<?php endif ?>
<?php if (empty($metrics)): ?> <?php if (empty($metrics)): ?>
<p class="alert"><?= t('Not enough data to show the graph.') ?></p> <p class="alert"><?= t('Not enough data to show the graph.') ?></p>

2
app/Template/project/dropdown.php
View File

@@ -22,7 +22,7 @@
<?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?> <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
<li> <li>
<?= $this->url->icon('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?> <?= $this->modal->large('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
</li> </li>
<?php endif ?> <?php endif ?>

2
app/Template/project_header/dropdown.php
View File

@@ -46,7 +46,7 @@
<?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?> <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
<li> <li>
<?= $this->url->icon('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?> <?= $this->modal->large('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
</li> </li>
<?php endif ?> <?php endif ?>

2
assets/css/app.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
assets/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
assets/js/components/modal.js
View File

@@ -26,4 +26,14 @@
KB.onClick('.js-modal-close', function () { KB.onClick('.js-modal-close', function () {
KB.modal.close(); KB.modal.close();
}); });
KB.onClick('.js-modal-replace', function (e) {
var link = getLink(e);
if (KB.modal.isOpen()) {
KB.modal.replace(link);
} else {
window.location.href = link;
}
});
}()); }());

2
assets/js/core/modal.js
View File

@@ -125,7 +125,7 @@
switch (size) { switch (size) {
case 'large': case 'large':
return viewport.width < 1300 ? '95%' : '1300px'; return viewport.width < 1350 ? '98%' : '1350px';
case 'medium': case 'medium':
return viewport.width < 1024 ? '70%' : '1024px'; return viewport.width < 1024 ? '70%' : '1024px';
} }

4
assets/sass/_dialog_box.sass
View File

@@ -1,4 +0,0 @@
@import variables
#main .confirm
max-width: 700px

5
assets/sass/_form.sass
View File

@@ -116,10 +116,15 @@ ul.form-errors li
border: none border: none
label label
display: inline display: inline
padding-right: 3px
input, select input, select
margin: 0 15px 0 0 margin: 0 15px 0 0
.form-required .form-required
display: none display: none
.form-actions
display: inline-block
.js-submit-buttons-rendered
display: inline-block
.form-inline-group .form-inline-group
display: inline display: inline

1
assets/sass/app.sass
View File

@@ -14,7 +14,6 @@
@import accordion @import accordion
@import select_dropdown @import select_dropdown
@import suggest_menu @import suggest_menu
@import dialog_box
@import modal @import modal
@import pagination @import pagination
@import header @import header