From 9c2bd0310ee9a67452406c539a3e9fc531155a21 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 12 May 2015 14:58:24 +0800 Subject: [PATCH] * change report UI. --- module/task/control.php | 2 +- module/task/js/report.js | 13 +++++++++++++ module/task/lang/en.php | 19 ++++--------------- module/task/lang/zh-cn.php | 19 ++++--------------- module/task/model.php | 2 +- module/task/view/report.html.php | 11 +++++------ 6 files changed, 28 insertions(+), 38 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index 13f549c840..d4c068a4c1 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1003,7 +1003,7 @@ class task extends control $chartOption = $this->lang->task->report->$chart; $this->task->mergeChartOption($chart); - $this->view->charts[$chart] = $this->report->createJSChart($chartOption->swf, $chartXML, $chartOption->width, $chartOption->height); + $this->view->charts[$chart] = $chartOption; $this->view->datas[$chart] = $this->report->computePercent($chartData); } } diff --git a/module/task/js/report.js b/module/task/js/report.js index e69de29bb2..eb436d6e5a 100644 --- a/module/task/js/report.js +++ b/module/task/js/report.js @@ -0,0 +1,13 @@ +$(function() +{ + var resizeChartTable = function() + { + $('.table-wrapper').each(function() + { + var $this = $(this); + $this.css('max-height', $this.closest('.table').find('.chart-wrapper').outerHeight()); + }); + }; + resizeChartTable(); + $(window).resize(resizeChartTable); +}); diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 945d8c6003..acc0a500fd 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -182,18 +182,9 @@ $lang->task->report->charts['finishedTasksPerDay'] = 'Finished tasks per day'; $lang->task->report->options = new stdclass(); $lang->task->report->options->graph = new stdclass(); -$lang->task->report->options->swf = 'pie2d'; -$lang->task->report->options->width = 'auto'; -$lang->task->report->options->height = 300; -$lang->task->report->options->graph->baseFontSize = 12; -$lang->task->report->options->graph->showNames = 1; -$lang->task->report->options->graph->formatNumber = 1; -$lang->task->report->options->graph->decimalPrecision = 0; -$lang->task->report->options->graph->animation = 0; -$lang->task->report->options->graph->rotateNames = 0; -$lang->task->report->options->graph->yAxisName = 'COUNT'; -$lang->task->report->options->graph->pieRadius = 100; -$lang->task->report->options->graph->showColumnShadow = 0; +$lang->task->report->options->type = 'pie'; +$lang->task->report->options->width = 500; +$lang->task->report->options->height = 140; $lang->task->report->tasksPerProject = new stdclass(); $lang->task->report->tasksPerModule = new stdclass(); @@ -250,9 +241,7 @@ $lang->task->report->tasksPerConsumed->graph->xAxisName = 'Time'; $lang->task->report->tasksPerFinishedBy->graph->xAxisName = 'User'; $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Closed Reason'; -$lang->task->report->finishedTasksPerDay->swf = 'column2d'; -$lang->task->report->finishedTasksPerDay->height = 400; +$lang->task->report->finishedTasksPerDay->type = 'bar'; $lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date'; -$lang->task->report->finishedTasksPerDay->graph->rotateNames = '1'; $lang->task->estimateTip = 'The estimated time for this task'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 3541801cc0..44a3f7666c 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -182,18 +182,9 @@ $lang->task->report->charts['finishedTasksPerDay'] = '每天完成统计'; $lang->task->report->options = new stdclass(); $lang->task->report->options->graph = new stdclass(); -$lang->task->report->options->swf = 'pie2d'; -$lang->task->report->options->width = 'auto'; -$lang->task->report->options->height = 300; -$lang->task->report->options->graph->baseFontSize = 12; -$lang->task->report->options->graph->showNames = 1; -$lang->task->report->options->graph->formatNumber = 1; -$lang->task->report->options->graph->decimalPrecision = 0; -$lang->task->report->options->graph->animation = 0; -$lang->task->report->options->graph->rotateNames = 0; -$lang->task->report->options->graph->yAxisName = 'COUNT'; -$lang->task->report->options->graph->pieRadius = 100; // 饼图直径。 -$lang->task->report->options->graph->showColumnShadow = 0; // 是否显示柱状图阴影。 +$lang->task->report->options->type = 'pie'; +$lang->task->report->options->width = 500; +$lang->task->report->options->height = 140; $lang->task->report->tasksPerProject = new stdclass(); $lang->task->report->tasksPerModule = new stdclass(); @@ -250,9 +241,7 @@ $lang->task->report->tasksPerConsumed->graph->xAxisName = '时间'; $lang->task->report->tasksPerFinishedBy->graph->xAxisName = '用户'; $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因'; -$lang->task->report->finishedTasksPerDay->swf = 'column2d'; -$lang->task->report->finishedTasksPerDay->height = 400; +$lang->task->report->finishedTasksPerDay->type = 'bar'; $lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期'; -$lang->task->report->finishedTasksPerDay->graph->rotateNames = '1'; $lang->task->estimateTip = '对该任务最初的预计'; diff --git a/module/task/model.php b/module/task/model.php index 2ae01c19ab..698d8482eb 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1113,7 +1113,7 @@ class taskModel extends model $commonOption = $this->lang->task->report->options; $chartOption->graph->caption = $this->lang->task->report->charts[$chartType]; - if(!isset($chartOption->swf)) $chartOption->swf = $commonOption->swf; + if(!isset($chartOption->type)) $chartOption->type = $commonOption->type; if(!isset($chartOption->width)) $chartOption->width = $commonOption->width; if(!isset($chartOption->height)) $chartOption->height = $commonOption->height; diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index b73b6c2c72..1736d65122 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -44,23 +44,22 @@ task->report->common;?> - $chartContent):?> + $chartOption):?>
task->report->charts[$chartType];?>
-
+
- task->report->$chartType, 'height', $lang->story->report->options->height) . 'px'; ?> -
- +
+
- +
task->report->charts[$chartType];?>
task->report->$chartType->item;?>task->report->$chartType->item;?> task->report->value;?> report->percent;?>