diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 5ee90f59a2..de6b2950e6 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -122,7 +122,7 @@ $lang->task->report->selectReverse = 'Reverse'; $lang->task->report->charts['tasksPerProject'] = 'Project tasks'; $lang->task->report->charts['tasksPerAssignedTo'] = 'Assigned To'; $lang->task->report->charts['tasksPerType'] = 'Type'; -$lang->task->report->charts['tasksPerPrimary'] = 'Primary'; +$lang->task->report->charts['tasksPerPri'] = 'Priority'; $lang->task->report->charts['tasksPerDeadline'] = 'Deadline'; $lang->task->report->charts['tasksPerEstimate'] = 'Estimate time'; $lang->task->report->charts['tasksPerLeft'] = 'Left time'; @@ -130,3 +130,19 @@ $lang->task->report->charts['tasksPerConsumed'] = 'Consumed time'; $lang->task->report->charts['tasksPerFinishedBy'] = 'Finished By'; $lang->task->report->charts['tasksPerClosedReason'] = 'Closed reason'; $lang->task->report->charts['finishedTasksPerDay'] = 'Finished tasks per day'; + +$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->tasksPerProject->graph->xAxisName = 'Project'; +$lang->task->report->tasksPerProject->graph->rotateNames = 'Module'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 198ee51bbd..da35ce48ec 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -122,7 +122,7 @@ $lang->task->report->selectReverse = '反选'; $lang->task->report->charts['tasksPerProject'] = '项目任务数统计'; $lang->task->report->charts['tasksPerAssignedTo'] = '指派给统计'; $lang->task->report->charts['tasksPerType'] = '任务类型统计'; -$lang->task->report->charts['tasksPerPrimary'] = '优先级统计'; +$lang->task->report->charts['tasksPerPri'] = '优先级统计'; $lang->task->report->charts['tasksPerDeadline'] = '截止日期统计'; $lang->task->report->charts['tasksPerEstimate'] = '预计时间统计'; $lang->task->report->charts['tasksPerLeft'] = '剩余时间统计'; @@ -130,3 +130,19 @@ $lang->task->report->charts['tasksPerConsumed'] = '消耗时间统计'; $lang->task->report->charts['tasksPerFinishedBy'] = '由有谁完成统计'; $lang->task->report->charts['tasksPerClosedReason'] = '关闭原因统计'; $lang->task->report->charts['finishedTasksPerDay'] = '每天完成统计'; + +$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->tasksPerProject->graph->xAxisName = 'Project'; +$lang->task->report->tasksPerProject->graph->rotateNames = 'Module'; diff --git a/module/task/model.php b/module/task/model.php index 60e06ab097..eddb530b76 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -513,4 +513,74 @@ class taskModel extends model { $task->statusCustom = strpos(self::CUSTOM_STATUS_ORDER, $task->status) + 1; } + + /** + * Merge the default chart settings and the settings of current chart. + * + * @param string $chartType + * @access public + * @return void + */ + public function mergeChartOption($chartType) + { + $chartOption = $this->lang->task->report->$chartType; + $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->width)) $chartOption->width = $commonOption->width; + if(!isset($chartOption->height)) $chartOption->height = $commonOption->height; + + /* 合并配置。*/ + foreach($commonOption->graph as $key => $value) if(!isset($chartOption->graph->$key)) $chartOption->graph->$key = $value; + } + + /** + * tasks report + */ + + public function getDataOftasksPerProject() + { + + } + public function getDataOftasksPerAssignedTo() + { + + } + public function getDataOftasksPerType() + { + + } + public function getDataOftasksPerDeadline() + { + + } + public function getDataOftasksPerPri() + { + + } + public function getDataOftasksPerEstimate() + { + + } + public function getDataOftasksPerLeft() + { + + } + public function getDataOftasksPerConsumed() + { + + } + public function getDataOftasksPerFinishedBy() + { + + } + public function getDataOftasksPerClosedReason() + { + + } + public function getDataOffinishedtasksPerDay() + { + + } } diff --git a/module/task/view/report.html.php b/module/task/view/report.html.php index 088b1fc033..b83f101e8e 100644 --- a/module/task/view/report.html.php +++ b/module/task/view/report.html.php @@ -1,6 +1,6 @@