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

Fix broken daily summary export

This commit is contained in:
Frédéric Guillot 2018-03-09 16:13:05 -08:00
parent d34a5c50c4
commit 67da76e7f1
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Controller/ExportController.php
View File

@ -26,15 +26,13 @@ class ExportController extends BaseController
$project = $this->getProject(); $project = $this->getProject();
if ($this->request->isPost()) { if ($this->request->isPost()) {
$values = $this->request->getValues(); $from = $this->request->getRawValue('from');
$from = empty($values['from']) ? '' : $values['from']; $to = $this->request->getRawValue('to');
$to = empty($values['to']) ? '' : $values['to'];
if ($from && $to) { if ($from && $to) {
$data = $this->$model->$method($project['id'], $from, $to); $data = $this->$model->$method($project['id'], $from, $to);
$this->response->withFileDownload($filename.'.csv'); $this->response->withFileDownload($filename.'.csv');
$this->response->csv($data); $this->response->csv($data);
return;
} }
} else { } else {
$this->response->html($this->template->render('export/'.$action, array( $this->response->html($this->template->render('export/'.$action, array(
@ -77,7 +75,31 @@ class ExportController extends BaseController
*/ */
public function summary() public function summary()
{ {
$this->common('projectDailyColumnStatsModel', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export')); $project = $this->getProject();
if ($this->request->isPost()) {
$from = $this->request->getRawValue('from');
$to = $this->request->getRawValue('to');
if ($from && $to) {
$from = $this->dateParser->getIsoDate($from);
$to = $this->dateParser->getIsoDate($to);
$data = $this->projectDailyColumnStatsModel->getAggregatedMetrics($project['id'], $from, $to);
$this->response->withFileDownload(t('Summary').'.csv');
$this->response->csv($data);
}
} else {
$this->response->html($this->template->render('export/summary', array(
'values' => array(
'project_id' => $project['id'],
'from' => '',
'to' => '',
),
'errors' => array(),
'project' => $project,
'title' => t('Daily project summary export'),
)));
}
} }
/** /**