diff --git a/module/holiday/model.php b/module/holiday/model.php index 17ddb5f8eb..6646a19364 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -360,17 +360,17 @@ class holidayModel extends model */ public function updateProjectRealDuration($beginDate, $endDate) { - $updateProjectList = $this->dao->select('id, realStarted, realFinished') + $updateProjectList = $this->dao->select('id, realBegan, realEnd') ->from(TABLE_PROJECT) - ->where('realStarted')->between($beginDate, $endDate) - ->orWhere('realFinished')->between($beginDate, $endDate) - ->orWhere("(realStarted < '$beginDate' AND realFinished > '$endDate')") + ->where('realBegan')->between($beginDate, $endDate) + ->orWhere('realEnd')->between($beginDate, $endDate) + ->orWhere("(realBegan < '$beginDate' AND realEnd > '$endDate')") ->andWhere('status')->ne('done') ->fetchAll(); foreach($updateProjectList as $project) { - $realDuration = $this->getActualWorkingDays($project->realStarted, $project->realFinished); + $realDuration = $this->getActualWorkingDays($project->realBegan, $project->realEnd); $realDuration = count($realDuration); $this->dao->update(TABLE_PROJECT) @@ -421,17 +421,17 @@ class holidayModel extends model */ public function updateTaskRealDuration($beginDate, $endDate) { - $updateTaskList = $this->dao->select('id, realStarted, finishedDate') + $updateTaskList = $this->dao->select('id, realBegan, finishedDate') ->from(TABLE_TASK) - ->where('realStarted')->between($beginDate, $endDate) + ->where('realBegan')->between($beginDate, $endDate) ->orWhere("date_format(finishedDate,'%Y-%m-%d')")->between($beginDate, $endDate) - ->orWhere("(realStarted < '$beginDate' AND date_format(finishedDate,'%Y-%m-%d') > '$endDate')") + ->orWhere("(realBegan < '$beginDate' AND date_format(finishedDate,'%Y-%m-%d') > '$endDate')") ->andWhere('status')->ne('done') ->fetchAll(); foreach($updateTaskList as $task) { - $realDuration = $this->getActualWorkingDays($task->realStarted, date('Y-m-d',strtotime($task->finishedDate))); + $realDuration = $this->getActualWorkingDays($task->realBegan, date('Y-m-d',strtotime($task->finishedDate))); $realDuration = count($realDuration); $this->dao->update(TABLE_TASK) diff --git a/module/program/lang/en.php b/module/program/lang/en.php index 1c399bc993..178dfdd629 100644 --- a/module/program/lang/en.php +++ b/module/program/lang/en.php @@ -38,8 +38,8 @@ $lang->program->PM = 'Manager'; $lang->program->budget = 'Budget'; $lang->program->dateRange = 'Duration'; $lang->program->to = ' to '; -$lang->program->realFinished = 'Actual Finished'; -$lang->program->realStarted = 'Actual Started'; +$lang->program->realEnd = 'Actual End'; +$lang->program->realBegan = 'Actual Began'; $lang->program->bygrid = 'Kanban'; $lang->program->bylist = 'List'; $lang->program->mine = 'My'; diff --git a/module/program/lang/zh-cn.php b/module/program/lang/zh-cn.php index ffd4c2cb86..5c7d7c60fb 100644 --- a/module/program/lang/zh-cn.php +++ b/module/program/lang/zh-cn.php @@ -38,8 +38,8 @@ $lang->program->PM = '项目负责人'; $lang->program->budget = '项目预算'; $lang->program->dateRange = '起止时间'; $lang->program->to = '至'; -$lang->program->realFinished = '实际完成日期'; -$lang->program->realStarted = '实际开始日期'; +$lang->program->realEnd = '实际完成日期'; +$lang->program->realBegan = '实际开始日期'; $lang->program->bygrid = '看板'; $lang->program->bylist = '列表'; $lang->program->mine = '我参与的'; diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php index 273298acad..a292805fc0 100644 --- a/module/program/view/edit.html.php +++ b/module/program/view/edit.html.php @@ -83,8 +83,8 @@