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

* Finish task #92306.

Browse Source
This commit is contained in:
Yagami
2023-05-12 13:54:11 +08:00
parent 3c40bfe469
commit 2b42d7278b
6 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/programplan/lang/de.php
+1
View File
@@ -67,6 +67,7 @@ $lang->programplan->delayDays = 'Delay days';
$lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
$lang->programplan->wait = 'Wait';
$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
module/programplan/lang/en.php
+1
View File
@@ -67,6 +67,7 @@ $lang->programplan->delayDays = 'Delay days';
$lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
$lang->programplan->wait = 'Wait';
$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
module/programplan/lang/fr.php
+1
View File
@@ -67,6 +67,7 @@ $lang->programplan->delayDays = 'Delay days';
$lang->programplan->settingGantt = 'Gantt Setting';
$lang->programplan->viewSetting = 'Setting';
$lang->programplan->desc = 'Description';
$lang->programplan->wait = 'Wait';
$lang->programplan->errorBegin = "{$lang->projectCommon} begin date: %s, begin date should be >= {$lang->projectCommon} begin date.";
$lang->programplan->errorEnd = "{$lang->projectCommon} end date: %s, end date should be <= {$lang->projectCommon} end date.";
module/programplan/lang/zh-cn.php
+1
View File
@@ -67,6 +67,7 @@ $lang->programplan->delayDays = '延期天数';
$lang->programplan->settingGantt = '设置甘特图';
$lang->programplan->viewSetting = '显示设置';
$lang->programplan->desc = '描述';
$lang->programplan->wait = '待提交';
$lang->programplan->errorBegin = "阶段的开始时间不能小于所属{$lang->projectCommon}的开始时间%s";
$lang->programplan->errorEnd = "阶段的结束时间不能大于所属{$lang->projectCommon}的结束时间%s";
module/programplan/model.php
+5 -3
View File
@@ -368,7 +368,7 @@ class programplanModel extends model
if($project->model == 'ipd' and $datas)
{
$this->loadModel('review');
$reviewPoints = $this->dao->select('t1.*, t2.status')->from(TABLE_OBJECT)->alias('t1')
$reviewPoints = $this->dao->select('t1.*, t2.status, t2.lastReviewedDate')->from(TABLE_OBJECT)->alias('t1')
->leftJoin(TABLE_REVIEW)->alias('t2')->on('t1.id = t2.object')
->where('t1.deleted')->eq('0')
->andWhere('t1.project')->eq($projectID)
@@ -419,11 +419,13 @@ class programplanModel extends model
$data->attribute = '';
$data->milestone = '';
$data->owner_id = '';
$data->status = $point->status ? zget($this->lang->review->statusList, $point->status) : $this->lang->review->wait;
$data->rawStatus = $point->status;
$data->status = $point->status ? zget($this->lang->review->statusList, $point->status) : $this->lang->programplan->wait;
$data->status = "<span class='status-{$point->status}'>" . $data->status . '</span>';
$data->begin = $end;
$data->deadline = $end;
$data->realBegan = $point->createdDate;
$data->realEnd = '';;
$data->realEnd = $point->lastReviewedDate;;
$data->parent = $plan->id;
$data->open = true;
$data->start_date = $end;
module/programplan/view/gantt.html.php
+6 -2
View File
@@ -621,7 +621,7 @@ $(function()
function getSubmitBtn(task)
{
if(task.type == 'point') return '<button class="btn btn-link submitBtn" title="<?php echo $lang->programplan->submit;?>"><i class="icon-confirm"></i></button>';
if(task.type == 'point' && !task.rawStatus) return '<button class="btn btn-link submitBtn" title="<?php echo $lang->programplan->submit;?>"><i class="icon-confirm"></i></button>';
}
gantt.templates.task_end_date = function(data)
@@ -677,12 +677,15 @@ $(function()
gantt.templates.rightside_text = function(start, end, task)
{
if(typeof task.owner_id == 'undefined') return;
if(task.type == 'point') return "<span class='status-" + task.rawStatus + "'>" + task.status + '</span>';
return getByIdForGantt(gantt.serverList('userList'), task.owner_id);
};
gantt.templates.grid_row_class = function (start, end, task)
{
if(task.type == 'task') return 'task-item';
};
gantt.templates.link_class = function(link)
{
var types = gantt.config.links;
@@ -691,9 +694,10 @@ $(function()
if(link.type == types.finish_to_finish) return 'finish_to_finish';
if(link.type == types.start_to_finish) return 'start_to_finish';
};
gantt.templates.tooltip_text = function (start, end, task)
{
return task.text;
if(task.type != 'point') return task.text;
};
gantt.attachEvent('onTemplatesReady', function()