* change page of tasks report

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';

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';

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()
+    {
+
+    }
 }

module/task/view/report.html.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * The report view file of bug module of ZenTaoPMS.
+ * The report view file of task module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2010 QingDao Nature Easy Soft Network Technology Co,LTD (www.cnezsoft.com)
  * @license     LGPL (http://www.gnu.org/licenses/lgpl.html)