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 @@ - program->realStarted;?> - realStarted, "class='form-control form-date'");?> + program->realBegan;?> + realBegan, "class='form-control form-date'");?> project->teamname;?> diff --git a/module/program/view/start.html.php b/module/program/view/start.html.php index a0e1629440..48bcc83218 100644 --- a/module/program/view/start.html.php +++ b/module/program/view/start.html.php @@ -14,8 +14,8 @@ - - + + diff --git a/module/programplan/config.php b/module/programplan/config.php index 084c2dcf86..e2e7334ed7 100644 --- a/module/programplan/config.php +++ b/module/programplan/config.php @@ -5,7 +5,7 @@ $config->programplan->create->requiredFields = 'name,begin,end'; $config->programplan->edit->requiredFields = 'name,begin,end'; $config->programplan->datatable = new stdclass(); -$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'milestone', 'begin', 'end', 'realStarted', 'realFinished', 'openedBy', 'openedDate', 'actions'); +$config->programplan->datatable->defaultField = array('id', 'name', 'percent', 'attribute', 'milestone', 'begin', 'end', 'realBegan', 'realEnd', 'openedBy', 'openedDate', 'actions'); $config->programplan->datatable->fieldList['id']['title'] = 'idAB'; $config->programplan->datatable->fieldList['id']['fixed'] = 'left'; @@ -52,15 +52,15 @@ $config->programplan->datatable->fieldList['end']['fixed'] = 'no'; $config->programplan->datatable->fieldList['end']['width'] = '90'; $config->programplan->datatable->fieldList['end']['required'] = 'no'; -$config->programplan->datatable->fieldList['realStarted']['title'] = 'realStarted'; -$config->programplan->datatable->fieldList['realStarted']['fixed'] = 'no'; -$config->programplan->datatable->fieldList['realStarted']['width'] = '90'; -$config->programplan->datatable->fieldList['realStarted']['required'] = 'no'; +$config->programplan->datatable->fieldList['realBegan']['title'] = 'realBegan'; +$config->programplan->datatable->fieldList['realBegan']['fixed'] = 'no'; +$config->programplan->datatable->fieldList['realBegan']['width'] = '90'; +$config->programplan->datatable->fieldList['realBegan']['required'] = 'no'; -$config->programplan->datatable->fieldList['realFinished']['title'] = 'realFinished'; -$config->programplan->datatable->fieldList['realFinished']['fixed'] = 'no'; -$config->programplan->datatable->fieldList['realFinished']['width'] = '90'; -$config->programplan->datatable->fieldList['realFinished']['required'] = 'no'; +$config->programplan->datatable->fieldList['realEnd']['title'] = 'realEnd'; +$config->programplan->datatable->fieldList['realEnd']['fixed'] = 'no'; +$config->programplan->datatable->fieldList['realEnd']['width'] = '90'; +$config->programplan->datatable->fieldList['realEnd']['required'] = 'no'; $config->programplan->datatable->fieldList['actions']['title'] = 'actions'; $config->programplan->datatable->fieldList['actions']['fixed'] = 'right'; diff --git a/module/programplan/lang/en.php b/module/programplan/lang/en.php index 34d8770bd6..fb98414e59 100644 --- a/module/programplan/lang/en.php +++ b/module/programplan/lang/en.php @@ -31,8 +31,8 @@ $lang->programplan->taskProgress = 'Task Progress'; $lang->programplan->task = 'Task'; $lang->programplan->begin = 'Begin'; $lang->programplan->end = 'End'; -$lang->programplan->realStarted = 'Actual Started'; -$lang->programplan->realFinished = 'Actual Finished'; +$lang->programplan->realBegan = 'Actual Started'; +$lang->programplan->realEnd = 'Actual End'; $lang->programplan->output = 'Output'; $lang->programplan->openedBy = 'Created By'; $lang->programplan->openedDate = 'Created Date'; diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 553ac57106..00c60f2012 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -31,8 +31,8 @@ $lang->programplan->taskProgress = '任务进度'; $lang->programplan->task = '任务'; $lang->programplan->begin = '计划开始'; $lang->programplan->end = '计划完成'; -$lang->programplan->realStarted = '实际开始'; -$lang->programplan->realFinished = '实际完成'; +$lang->programplan->realBegan = '实际开始'; +$lang->programplan->realEnd = '实际完成'; $lang->programplan->output = '输出'; $lang->programplan->openedBy = '由谁创建'; $lang->programplan->openedDate = '创建日期'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 8e8955bd21..05af5a22a3 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -228,8 +228,8 @@ class programplanModel extends model $data->milestone = zget($this->lang->programplan->milestoneList, $plan->milestone); $data->start_date = $start; $data->deadline = $end; - $data->realStarted = $plan->realStarted == '0000-00-00' ? '' : $plan->realStarted; - $data->realFinished = $plan->realFinished == '0000-00-00' ? '' : $plan->realFinished; + $data->realBegan = $plan->realBegan == '0000-00-00' ? '' : $plan->realBegan; + $data->realEnd = $plan->realEnd == '0000-00-00' ? '' : $plan->realEnd; $data->duration = helper::diffDate($plan->end, $plan->begin) + 1;; $data->parent = $plan->parent; $data->open = true; @@ -276,8 +276,8 @@ class programplanModel extends model $start = $task->estStarted == '0000-00-00' ? '' : date('d-m-Y', strtotime($task->estStarted)); $end = $task->deadline == '0000-00-00' ? '' : $task->deadline; - $realStarted = $task->realStarted == '0000-00-00' ? '' : $task->realStarted; - $realFinished = $task->finishedDate == '0000-00-00 00:00:00' ? '' : substr($task->finishedDate, 5, 11); + $realBegan = $task->realBegan == '0000-00-00' ? '' : $task->realBegan; + $realEnd = $task->finishedDate == '0000-00-00 00:00:00' ? '' : substr($task->finishedDate, 5, 11); $priIcon = sprintf($taskPri, $task->pri, $task->pri, $task->pri); $data = new stdclass(); @@ -289,8 +289,8 @@ class programplanModel extends model $data->milestone = ''; $data->start_date = $start; $data->deadline = $end; - $data->realStarted = $realStarted; - $data->realFinished = $realFinished; + $data->realBegan = $realBegan; + $data->realEnd = $realEnd; $data->duration = helper::diffDate($task->deadline, $task->estStarted) + 1; $data->parent = $task->parent > 0 ? $task->project . '-' . $task->parent : $task->project; $data->open = true; @@ -390,9 +390,9 @@ class programplanModel extends model } $plan->begin = $plan->begin == '0000-00-00' ? '' : $plan->begin; - $plan->end = $plan->end == '0000-00-00' ? '' : $plan->end; - $plan->realStarted = $plan->realStarted == '0000-00-00' ? '' : $plan->realStarted; - $plan->realFinished = $plan->realFinished == '0000-00-00' ? '' : $plan->realFinished; + $plan->end = $plan->end == '0000-00-00' ? '' : $plan->end; + $plan->realBegan = $plan->realBegan == '0000-00-00' ? '' : $plan->realBegan; + $plan->realEnd = $plan->realEnd == '0000-00-00' ? '' : $plan->realEnd; $plan->product = $this->loadModel('product')->getProductIDByProject($plan->id); $plan->productName = $this->dao->findByID($plan->product)->from(TABLE_PRODUCT)->fetch('name'); @@ -454,8 +454,8 @@ class programplanModel extends model $plan->milestone = $milestone[$key]; $plan->begin = empty($begin[$key]) ? '0000-00-00' : $begin[$key]; $plan->end = empty($end[$key]) ? '0000-00-00' : $end[$key]; - $plan->realStarted = empty($realStarted[$key]) ? '0000-00-00' : $realStarted[$key]; - $plan->realFinished = empty($realFinished[$key]) ? '0000-00-00' : $realFinished[$key]; + $plan->realBegan = empty($realBegan[$key]) ? '0000-00-00' : $realBegan[$key]; + $plan->realEnd = empty($realEnd[$key]) ? '0000-00-00' : $realEnd[$key]; $plan->output = empty($output[$key]) ? '' : implode(',', $output[$key]); $datas[] = $plan; @@ -523,7 +523,7 @@ class programplanModel extends model { /* Set planDuration and realDuration. */ $data->planDuration = $this->getDuration($data->begin, $data->end); - $data->realDuration = $this->getDuration($data->realStarted, $data->realFinished); + $data->realDuration = $this->getDuration($data->realBegan, $data->realEnd); $projectChanged = false; $data->days = helper::diffDate($data->end, $data->begin) + 1; @@ -610,8 +610,8 @@ class programplanModel extends model $plan = fixer::input('post') ->setDefault('begin', '0000-00-00') ->setDefault('end', '0000-00-00') - ->setDefault('realStarted', '0000-00-00') - ->setDefault('realFinished', '0000-00-00') + ->setDefault('realBegan', '0000-00-00') + ->setDefault('realEnd', '0000-00-00') ->join('output', ',') ->get(); @@ -650,7 +650,7 @@ class programplanModel extends model /* Set planDuration and realDuration. */ $plan->planDuration = $this->getDuration($plan->begin, $plan->end); - $plan->realDuration = $this->getDuration($plan->realStarted, $plan->realFinished); + $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd); if($plan->parent) $plan->attribute = $parentPlan->attribute; @@ -697,7 +697,7 @@ class programplanModel extends model { $class = 'c-' . $id; $title = ''; - $idList = array('id','name','output','percent','attribute','milestone','version','openedBy','openedDate','begin','end','realStarted','realFinished'); + $idList = array('id','name','output','percent','attribute','milestone','version','openedBy','openedDate','begin','end','realBegan','realEnd'); if(in_array($id,$idList)) { $class .= ' text-left'; @@ -738,11 +738,11 @@ class programplanModel extends model case 'end': echo $plan->end; break; - case 'realStarted': - echo $plan->realStarted; + case 'realBegan': + echo $plan->realBegan; break; - case 'realFinished': - echo $plan->realFinished; + case 'realEnd': + echo $plan->realEnd; break; case 'output': echo $plan->output; diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 52d3a00211..b9c3f17e7f 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -31,8 +31,8 @@ - - + + @@ -52,8 +52,8 @@ - - + + - - + + output) ? 0 : explode(',', $plan->output);?> - - + + - - + + - - + + - - + + diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index f0f4c35528..cdbebc37cc 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -262,8 +262,8 @@ $(function() } }, {name: 'taskProgress', align: 'center', resize: true, width: 60}, - {name: 'realStarted', align: 'center', resize: true, width: 80}, - {name: 'realFinished', align: 'center', width: 80} + {name: 'realBegan', align: 'center', resize: true, width: 80}, + {name: 'realEnd', align: 'center', width: 80} ]; gantt.locale.labels.column_text = "programplan->name;?>"; @@ -271,8 +271,8 @@ $(function() gantt.locale.labels.column_taskProgress = "programplan->taskProgress;?>"; gantt.locale.labels.column_start_date = "programplan->begin;?>"; gantt.locale.labels.column_deadline = "programplan->end;?>"; - gantt.locale.labels.column_realStarted = "programplan->realStarted;?>"; - gantt.locale.labels.column_realFinished = "programplan->realFinished;?>"; + gantt.locale.labels.column_realBegan = "programplan->realBegan;?>"; + gantt.locale.labels.column_realEnd = "programplan->realEnd;?>"; gantt.locale.labels.column_duration = "programplan->duration;?>"; if(dateDetails) diff --git a/module/project/model.php b/module/project/model.php index 9d1a9cc420..61144e16a8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -552,7 +552,7 @@ class projectModel extends model $oldProject = $this->getById($projectID); $now = helper::now(); $project = fixer::input('post') - ->add('realStarted', $now) + ->add('realBegan', $now) ->setDefault('status', 'doing') ->remove('comment')->get();
program->realStarted;?>program->realBegan;?>
programplan->milestone;?> programplan->begin;?> programplan->end;?>programplan->realStarted;?>programplan->realFinished;?>programplan->realBegan;?>programplan->realEnd;?> actions;?>
programplan->milestoneList, 0);?> @@ -79,8 +79,8 @@ programplan->milestoneList, $plan->milestone, $disabled);?> @@ -103,8 +103,8 @@ programplan->milestoneList, 0);?> @@ -138,8 +138,8 @@ programplan->milestoneList, 0);?> diff --git a/module/programplan/view/edit.html.php b/module/programplan/view/edit.html.php index c5381efbf1..371209b813 100644 --- a/module/programplan/view/edit.html.php +++ b/module/programplan/view/edit.html.php @@ -66,12 +66,12 @@ js::set('parentID', $plan->parent); end, "class='form-control form-date'");?>
programplan->realStarted;?> realStarted, "class='form-control form-date'");?>programplan->realBegan;?> realBegan, "class='form-control form-date'");?>
programplan->realFinished;?> realFinished, "class='form-control form-date'");?>programplan->realEnd;?> realEnd, "class='form-control form-date'");?>