diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 7687eb1653..79db1c5eb8 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -561,11 +561,22 @@ $lang->execution->gantt->color[3] = '#D3F3FD';
$lang->execution->gantt->color[4] = '#DFF5D9';
$lang->execution->gantt->color[5] = '#EBDCF9';
+$lang->execution->gantt->textColor[0] = '#2D2D2D';
+$lang->execution->gantt->textColor[1] = '#8D0308';
+$lang->execution->gantt->textColor[2] = '#9D4200';
+$lang->execution->gantt->textColor[3] = '#006D8E';
+$lang->execution->gantt->textColor[4] = '#1A8100';
+$lang->execution->gantt->textColor[5] = '#660ABC';
+
$lang->execution->gantt->stage = new stdclass();
$lang->execution->gantt->stage->progressColor = '#70B8FE';
$lang->execution->gantt->stage->color = '#D2E7FC';
+$lang->execution->gantt->stage->textColor = '#0050A7';
+
+$lang->execution->gantt->defaultColor = '#EBDCF9';
+$lang->execution->gantt->defaultProgressColor = '#9BA8FF';
+$lang->execution->gantt->defaultTextColor = '#660ABC';
-$lang->execution->gantt->textColor = '000000';
$lang->execution->gantt->bar_height = '24';
$lang->execution->gantt->exportImg = 'Export as Image';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 66688546d8..55d0bd3aa9 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -561,11 +561,22 @@ $lang->execution->gantt->color[3] = '#D3F3FD';
$lang->execution->gantt->color[4] = '#DFF5D9';
$lang->execution->gantt->color[5] = '#EBDCF9';
+$lang->execution->gantt->textColor[0] = '#2D2D2D';
+$lang->execution->gantt->textColor[1] = '#8D0308';
+$lang->execution->gantt->textColor[2] = '#9D4200';
+$lang->execution->gantt->textColor[3] = '#006D8E';
+$lang->execution->gantt->textColor[4] = '#1A8100';
+$lang->execution->gantt->textColor[5] = '#660ABC';
+
$lang->execution->gantt->stage = new stdclass();
$lang->execution->gantt->stage->progressColor = '#70B8FE';
$lang->execution->gantt->stage->color = '#D2E7FC';
+$lang->execution->gantt->stage->textColor = '#0050A7';
+
+$lang->execution->gantt->defaultColor = '#EBDCF9';
+$lang->execution->gantt->defaultProgressColor = '#9BA8FF';
+$lang->execution->gantt->defaultTextColor = '#660ABC';
-$lang->execution->gantt->textColor = '000000';
$lang->execution->gantt->bar_height = '24';
$lang->execution->gantt->exportImg = 'Export as Image';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index bfc3a92108..f05784f71b 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -561,11 +561,22 @@ $lang->execution->gantt->color[3] = '#D3F3FD';
$lang->execution->gantt->color[4] = '#DFF5D9';
$lang->execution->gantt->color[5] = '#EBDCF9';
+$lang->execution->gantt->textColor[0] = '#2D2D2D';
+$lang->execution->gantt->textColor[1] = '#8D0308';
+$lang->execution->gantt->textColor[2] = '#9D4200';
+$lang->execution->gantt->textColor[3] = '#006D8E';
+$lang->execution->gantt->textColor[4] = '#1A8100';
+$lang->execution->gantt->textColor[5] = '#660ABC';
+
$lang->execution->gantt->stage = new stdclass();
$lang->execution->gantt->stage->progressColor = '#70B8FE';
$lang->execution->gantt->stage->color = '#D2E7FC';
+$lang->execution->gantt->stage->textColor = '#0050A7';
+
+$lang->execution->gantt->defaultColor = '#EBDCF9';
+$lang->execution->gantt->defaultProgressColor = '#9BA8FF';
+$lang->execution->gantt->defaultTextColor = '#660ABC';
-$lang->execution->gantt->textColor = '000000';
$lang->execution->gantt->bar_height = '24';
$lang->execution->gantt->exportImg = 'Export as Image';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 965cbd00e7..66eb961357 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -561,11 +561,22 @@ $lang->execution->gantt->color[3] = '#D3F3FD';
$lang->execution->gantt->color[4] = '#DFF5D9';
$lang->execution->gantt->color[5] = '#EBDCF9';
+$lang->execution->gantt->textColor[0] = '#2D2D2D';
+$lang->execution->gantt->textColor[1] = '#8D0308';
+$lang->execution->gantt->textColor[2] = '#9D4200';
+$lang->execution->gantt->textColor[3] = '#006D8E';
+$lang->execution->gantt->textColor[4] = '#1A8100';
+$lang->execution->gantt->textColor[5] = '#660ABC';
+
$lang->execution->gantt->stage = new stdclass();
$lang->execution->gantt->stage->progressColor = '#70B8FE';
$lang->execution->gantt->stage->color = '#D2E7FC';
+$lang->execution->gantt->stage->textColor = '#0050A7';
+
+$lang->execution->gantt->defaultColor = '#EBDCF9';
+$lang->execution->gantt->defaultProgressColor = '#9BA8FF';
+$lang->execution->gantt->defaultTextColor = '#660ABC';
-$lang->execution->gantt->textColor = '000000';
$lang->execution->gantt->bar_height = '24';
$lang->execution->gantt->exportImg = '导出图片';
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 6e82034175..2119433318 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -202,7 +202,7 @@ class programplanModel extends model
$data->duration = 1;
$data->color = $this->lang->execution->gantt->stage->color;
$data->progressColor = $this->lang->execution->gantt->stage->progressColor;
- $data->textColor = $this->lang->execution->gantt->textColor;
+ $data->textColor = $this->lang->execution->gantt->stage->textColor;
$data->bar_height = $this->lang->execution->gantt->bar_height;
if($data->endDate > $data->start_date) $data->duration = helper::diffDate($data->endDate, $data->start_date) + 1;
@@ -213,7 +213,6 @@ class programplanModel extends model
$stageIndex[$plan->id] = array('planID' => $plan->id, 'parent' => $plan->parent, 'progress' => array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalReal' => 0));
}
- $taskSign = "[ T ] ";
$taskPri = "%s ";
/* Judge whether to display tasks under the stage. */
@@ -260,7 +259,7 @@ class programplanModel extends model
$data = new stdclass();
$data->id = $task->execution . '-' . $task->id;
$data->type = 'task';
- $data->text = $taskSign . $priIcon . $task->name;
+ $data->text = $priIcon . $task->name;
$data->percent = '';
$data->status = $this->processStatus('task', $task);
$data->owner_id = $task->assignedTo;
@@ -281,9 +280,9 @@ class programplanModel extends model
$data->duration = 1;
$data->estimate = $task->estimate;
$data->consumed = $task->consumed;
- $data->color = zget($this->lang->execution->gantt->color, $task->pri);
- $data->progressColor = zget($this->lang->execution->gantt->progressColor, $task->pri);
- $data->textColor = $this->lang->execution->gantt->textColor;
+ $data->color = zget($this->lang->execution->gantt->color, $task->pri, $this->lang->execution->gantt->defaultColor);
+ $data->progressColor = zget($this->lang->execution->gantt->progressColor, $task->pri, $this->lang->execution->gantt->defaultProgressColor);
+ $data->textColor = zget($this->lang->execution->gantt->textColor, $task->pri, $this->lang->execution->gantt->defaultTextColor);
$data->bar_height = $this->lang->execution->gantt->bar_height;
/* If multi task then show the teams. */
@@ -370,7 +369,6 @@ class programplanModel extends model
foreach($plans as $plan) $planIdList[$plan->id] = $plan->id;
- $taskSign = "[ T ] ";
$taskPri = "%s ";
/* Judge whether to display tasks under the stage. */
@@ -432,8 +430,11 @@ class programplanModel extends model
$dataGroup->parent = 0;
$dataGroup->open = true;
$dataGroup->progress = '';
- $dataGroup->taskProgress = '';
- $dataGroup->bar_height = $this->lang->execution->gantt->bar_height;
+ $dataGroup->taskProgress = '';
+ $dataGroup->color = $this->lang->execution->gantt->stage->color;
+ $dataGroup->progressColor = $this->lang->execution->gantt->stage->progressColor;
+ $dataGroup->textColor = $this->lang->execution->gantt->stage->textColor;
+ $dataGroup->bar_height = $this->lang->execution->gantt->bar_height;
$groupKey = $groupID . $group;
$datas['data'][$groupKey] = $dataGroup;
@@ -461,7 +462,7 @@ class programplanModel extends model
$data = new stdclass();
$data->id = $task->id;
$data->type = 'task';
- $data->text = $taskSign . $priIcon . $task->name;
+ $data->text = $priIcon . $task->name;
$data->percent = '';
$data->status = $this->processStatus('task', $task);
$data->owner_id = $task->assignedTo;
@@ -482,9 +483,9 @@ class programplanModel extends model
$data->duration = 1;
$data->estimate = $task->estimate;
$data->consumed = $task->consumed;
- $data->color = zget($this->lang->execution->gantt->color, $task->pri);
- $data->progressColor = zget($this->lang->execution->gantt->progressColor, $task->pri);
- $data->textColor = $this->lang->execution->gantt->textColor;
+ $data->color = zget($this->lang->execution->gantt->color, $task->pri, $this->lang->execution->gantt->defaultColor);
+ $data->progressColor = zget($this->lang->execution->gantt->progressColor, $task->pri, $this->lang->execution->gantt->defaultProgressColor);
+ $data->textColor = zget($this->lang->execution->gantt->textColor, $task->pri, $this->lang->execution->gantt->defaultTextColor);
$data->bar_height = $this->lang->execution->gantt->bar_height;
if($data->endDate > $data->start_date) $data->duration = helper::diffDate($data->endDate, $data->start_date) + 1;