From e39e835d404cd338f786c7f51410abc1c29bd4c9 Mon Sep 17 00:00:00 2001
From: liugang <liugang@easycorp.ltd>
Date: Tue, 26 Sep 2023 09:51:15 +0800
Subject: [PATCH] * testtask: move the default options of chart from lang to
 config.

---
 module/testtask/config.php     | 7 +++++++
 module/testtask/control.php    | 2 +-
 module/testtask/lang/de.php    | 6 ------
 module/testtask/lang/en.php    | 6 ------
 module/testtask/lang/fr.php    | 6 ------
 module/testtask/lang/vi.php    | 6 ------
 module/testtask/lang/zh-cn.php | 6 ------
 module/testtask/lang/zh-tw.php | 6 ------
 8 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/module/testtask/config.php b/module/testtask/config.php
index e3dac929ea..0925693b11 100644
--- a/module/testtask/config.php
+++ b/module/testtask/config.php
@@ -29,3 +29,10 @@ $config->testtask->datatable->defaultField = array('id', 'title', 'pri', 'assign
 $config->testtask->unitResultRules = new stdclass();
 $config->testtask->unitResultRules->common  = array('path' => array('testsuite/testcase', 'testcase'), 'name' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname'));
 $config->testtask->unitResultRules->phpunit = array('path' => array('test', 'testsuite/testcase', 'testcase'), 'name' => array('className', 'methodName'), 'aliasName' => array('classname', 'name'), 'failure' => 'failure', 'skipped' => 'skipped', 'suite' => 'name', 'aliasSuite' => array('classname', 'className'));
+
+$config->testtask->report = new stdclass();
+$config->testtask->report->options = new stdclass();
+$config->testtask->report->options->graph  = new stdclass();
+$config->testtask->report->options->type   = 'pie';
+$config->testtask->report->options->width  = 500;
+$config->testtask->report->options->height = 140;
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 012ea6d2bd..3cf787603c 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -407,7 +407,7 @@ class testtask extends control
             {
                 $chartFunc   = 'getDataOf' . $chart;
                 $chartData   = $this->testtask->$chartFunc($taskID);
-                $chartOption = $this->lang->testtask->report->options;
+                $chartOption = $this->config->testtask->report->options;
                 if(!empty($chartType))
                 {
                     $chartOption->type           = $chartType;
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index f764838cb6..e1c1959739 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -198,12 +198,6 @@ $lang->testtask->report->charts['testTaskPerType']      = 'Berichttyp';
 $lang->testtask->report->charts['testTaskPerModule']    = 'Modulbericht';
 $lang->testtask->report->charts['testTaskPerRunner']    = 'Ausgeführt von Bericht';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 428dad3235..5022a6945a 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -198,12 +198,6 @@ $lang->testtask->report->charts['testTaskPerType']      = 'Test Case Type';
 $lang->testtask->report->charts['testTaskPerModule']    = 'Test Case Module';
 $lang->testtask->report->charts['testTaskPerRunner']    = 'Test Case RunBy';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 790962f6ae..fcc01ac531 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -198,12 +198,6 @@ $lang->testtask->report->charts['testTaskPerType']      = 'Type de CasTests';
 $lang->testtask->report->charts['testTaskPerModule']    = 'Module CasTests';
 $lang->testtask->report->charts['testTaskPerRunner']    = 'CasTests joués par';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
diff --git a/module/testtask/lang/vi.php b/module/testtask/lang/vi.php
index cf182ccbfd..e556706b45 100644
--- a/module/testtask/lang/vi.php
+++ b/module/testtask/lang/vi.php
@@ -178,12 +178,6 @@ $lang->testtask->report->charts['testTaskPerType']      = 'Test Loại tình hu
 $lang->testtask->report->charts['testTaskPerModule']    = 'Test Case Module';
 $lang->testtask->report->charts['testTaskPerRunner']    = 'Test Case RunBy';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index adc4838236..4f16e898fd 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -198,12 +198,6 @@ $lang->testtask->report->charts['testTaskPerType']      = '按用例类型统计
 $lang->testtask->report->charts['testTaskPerModule']    = '按用例模块统计';
 $lang->testtask->report->charts['testTaskPerRunner']    = '按用例执行人统计';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 77b198a2a0..e09d497328 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -188,12 +188,6 @@ $lang->testtask->report->charts['testTaskPerType']      = '按用例類型統計
 $lang->testtask->report->charts['testTaskPerModule']    = '按用例模組統計';
 $lang->testtask->report->charts['testTaskPerRunner']    = '按用例執行人統計';
 
-$lang->testtask->report->options = new stdclass();
-$lang->testtask->report->options->graph  = new stdclass();
-$lang->testtask->report->options->type   = 'pie';
-$lang->testtask->report->options->width  = 500;
-$lang->testtask->report->options->height = 140;
-
 $lang->testtask->featureBar['browse']['totalStatus'] = $lang->testtask->totalStatus;
 $lang->testtask->featureBar['browse']['wait']        = $lang->testtask->wait;
 $lang->testtask->featureBar['browse']['doing']       = $lang->testtask->testing;