Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* task #7660, add UI for cmmigantt block.

Browse Source
This commit is contained in:
Catouse
2020-08-25 15:52:13 +08:00
parent eae8fae1f1
commit 79c2decff2
5 changed files with 197 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/lang/zh-cn.php
+2
View File
@@ -14,9 +14,11 @@ $lang->programplan->emptyParent = '无';
$lang->programplan->name = '名称';
$lang->programplan->percent = '计划工作量';
$lang->programplan->percentAB = '计划工作量';
$lang->programplan->planPercent = '工作量';
$lang->programplan->attribute = '阶段';
$lang->programplan->milestone = '里程碑';
$lang->programplan->taskProgress = '任务进度';
$lang->programplan->task = '任务';
$lang->programplan->begin = '计划开始';
$lang->programplan->end = '计划完成';
$lang->programplan->realStarted = '实际开始';
module/programplan/model.php
+4 -2
View File
@@ -133,6 +133,7 @@ class programplanModel extends model
$data = new stdclass();
$data->id = $plan->id;
$data->type = 'plan';
$data->text = empty($plan->milestone) ? $plan->name : $isMilestone . $plan->name;
$data->percent = $plan->percent;
$data->attribute = zget($this->lang->stage->typeList, $plan->attribute);
@@ -141,7 +142,7 @@ class programplanModel extends model
$data->deadline = $end;
$data->realStarted = $plan->realStarted == '0000-00-00' ? '' : $plan->realStarted;
$data->realFinished = $plan->realFinished == '0000-00-00' ? '' : $plan->realFinished;
$data->duration = helper::diffDate($plan->end, $plan->begin) + 1;;
$data->duration = helper::diffDate($plan->end, $plan->begin) + 1;;
$data->parent = $plan->parent;
$data->open = true;
@@ -192,6 +193,7 @@ class programplanModel extends model
$data = new stdclass();
$data->id = $task->project . '-' . $task->id;
$data->type = 'task';
$data->text = $taskSign . $priIcon . $task->name;
$data->percent = '';
$data->attribute = '';
@@ -287,7 +289,7 @@ class programplanModel extends model
return $plan;
}
public function getDuration($begin, $end)
{
$duration = $this->loadModel('holiday')->getActualWorkingDays($begin, $end);