diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php index 4a0c0f21a7..0e317fd985 100644 --- a/module/execution/lang/de.php +++ b/module/execution/lang/de.php @@ -560,11 +560,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 207c015449..ee900c616f 100644 --- a/module/execution/lang/en.php +++ b/module/execution/lang/en.php @@ -560,11 +560,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 81323a0cd6..f5e3749b30 100644 --- a/module/execution/lang/fr.php +++ b/module/execution/lang/fr.php @@ -560,11 +560,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 dd895e3e40..9d88988632 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -560,11 +560,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..191ce8da19 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; @@ -281,9 +281,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. */