From 7b4e12dcc3a537a704e42c135f07e8cb902a95ca Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 19 Jun 2012 07:38:18 +0000 Subject: [PATCH] * finish task #763. --- module/task/lang/en.php | 84 ++++++++++++++++---------------- module/task/lang/zh-cn.php | 84 ++++++++++++++++---------------- module/task/view/create.html.php | 4 ++ module/task/view/edit.html.php | 4 ++ module/task/view/start.html.php | 4 ++ module/task/view/view.html.php | 4 ++ 6 files changed, 102 insertions(+), 82 deletions(-) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 14a97a2b3f..16c5c7254d 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -29,47 +29,49 @@ $lang->task->reportChart = "Report chart"; $lang->task->fromBug = 'From Bug'; $lang->task->confirmStoryChange = "Confirm story change"; -$lang->task->common = 'Task'; -$lang->task->id = 'ID'; -$lang->task->project = 'Project'; -$lang->task->story = 'Story'; -$lang->task->storyVersion = 'Version'; -$lang->task->name = 'Name'; -$lang->task->type = 'Type'; -$lang->task->pri = 'Pri'; -$lang->task->mailto = 'Mailto'; -$lang->task->estimate = 'Estimate'; -$lang->task->estimateAB = 'Est'; -$lang->task->left = 'Left'; -$lang->task->leftAB = 'Left'; -$lang->task->consumed = 'Consumed'; -$lang->task->consumedAB = 'Use'; -$lang->task->hour = 'Hour'; -$lang->task->deadline = 'Deadline'; -$lang->task->deadlineAB = 'Deadline'; -$lang->task->status = 'Status'; -$lang->task->statusCustom = 'Status Order'; -$lang->task->desc = 'Desc'; -$lang->task->assign = 'Assign'; -$lang->task->assignedTo = 'Assigned To'; -$lang->task->assignedToAB = 'Assign'; -$lang->task->assignedDate = 'Assigned Date'; -$lang->task->openedBy = 'Opened By'; -$lang->task->openedByAB = 'Open'; -$lang->task->openedDate = 'Opened Date'; -$lang->task->openedDateAB = 'Open'; -$lang->task->finishedBy = 'Finished By'; -$lang->task->finishedByAB = 'Finishe'; -$lang->task->finishedDate = 'Finished Date'; -$lang->task->finishedDateAB = 'Date'; -$lang->task->canceledBy = 'Canceled By'; -$lang->task->canceledDate = 'Canceled Date'; -$lang->task->closedBy = 'Closed By'; -$lang->task->closedDate = 'Closed Date'; -$lang->task->closedReason = 'Closed Reason'; -$lang->task->lastEditedBy = 'Last Edited By'; -$lang->task->lastEditedDate = 'Last Edited Date'; -$lang->task->lastEdited = 'Last Edited'; +$lang->task->common = 'Task'; +$lang->task->id = 'ID'; +$lang->task->project = 'Project'; +$lang->task->story = 'Story'; +$lang->task->storyVersion = 'Version'; +$lang->task->name = 'Name'; +$lang->task->type = 'Type'; +$lang->task->pri = 'Pri'; +$lang->task->mailto = 'Mailto'; +$lang->task->estimate = 'Estimate'; +$lang->task->estimateAB = 'Est'; +$lang->task->left = 'Left'; +$lang->task->leftAB = 'Left'; +$lang->task->consumed = 'Consumed'; +$lang->task->consumedAB = 'Use'; +$lang->task->hour = 'Hour'; +$lang->task->estimateStartDate = 'Start date'; +$lang->task->actualStartDate = 'Actual start'; +$lang->task->deadline = 'Deadline'; +$lang->task->deadlineAB = 'Deadline'; +$lang->task->status = 'Status'; +$lang->task->statusCustom = 'Status Order'; +$lang->task->desc = 'Desc'; +$lang->task->assign = 'Assign'; +$lang->task->assignedTo = 'Assigned To'; +$lang->task->assignedToAB = 'Assign'; +$lang->task->assignedDate = 'Assigned Date'; +$lang->task->openedBy = 'Opened By'; +$lang->task->openedByAB = 'Open'; +$lang->task->openedDate = 'Opened Date'; +$lang->task->openedDateAB = 'Open'; +$lang->task->finishedBy = 'Finished By'; +$lang->task->finishedByAB = 'Finishe'; +$lang->task->finishedDate = 'Finished Date'; +$lang->task->finishedDateAB = 'Date'; +$lang->task->canceledBy = 'Canceled By'; +$lang->task->canceledDate = 'Canceled Date'; +$lang->task->closedBy = 'Closed By'; +$lang->task->closedDate = 'Closed Date'; +$lang->task->closedReason = 'Closed Reason'; +$lang->task->lastEditedBy = 'Last Edited By'; +$lang->task->lastEditedDate = 'Last Edited Date'; +$lang->task->lastEdited = 'Last Edited'; $lang->task->same = 'The same as above'; $lang->task->notes = '(Notes: the name, type, pri and estimate must be written, otherwise it is no use)'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 84375038be..45aa6d01fd 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -29,47 +29,49 @@ $lang->task->reportChart = "报表统计"; $lang->task->fromBug = '来源Bug'; $lang->task->confirmStoryChange = "确认需求变动"; -$lang->task->common = '任务'; -$lang->task->id = '编号'; -$lang->task->project = '所属项目'; -$lang->task->story = '相关需求'; -$lang->task->storyVersion = '需求版本'; -$lang->task->name = '任务名称'; -$lang->task->type = '任务类型'; -$lang->task->pri = '优先级'; -$lang->task->mailto = '抄送给'; -$lang->task->estimate = '最初预计'; -$lang->task->estimateAB = '预'; -$lang->task->left = '预计剩余'; -$lang->task->leftAB = '剩'; -$lang->task->consumed = '已经消耗'; -$lang->task->consumedAB = '耗'; -$lang->task->hour = '小时'; -$lang->task->deadline = '截止日期'; -$lang->task->deadlineAB = '截止'; -$lang->task->status = '任务状态'; -$lang->task->statusCustom = '状态排序'; -$lang->task->desc = '任务描述'; -$lang->task->assign = '指派'; -$lang->task->assignedTo = '指派给'; -$lang->task->assignedToAB = '指派给'; -$lang->task->assignedDate = '指派日期'; -$lang->task->openedBy = '由谁创建'; -$lang->task->openedByAB = '创建者'; -$lang->task->openedDate = '创建日期'; -$lang->task->openedDateAB = '创建'; -$lang->task->finishedBy = '由谁完成'; -$lang->task->finishedByAB = '完成者'; -$lang->task->finishedDate = '完成时间'; -$lang->task->finishedDateAB = '完成'; -$lang->task->canceledBy = '由谁取消'; -$lang->task->canceledDate = '取消时间'; -$lang->task->closedBy = '由谁关闭'; -$lang->task->closedDate = '关闭时间'; -$lang->task->closedReason = '关闭原因'; -$lang->task->lastEditedBy = '最后修改'; -$lang->task->lastEditedDate = '最后修改日期'; -$lang->task->lastEdited = '最后编辑'; +$lang->task->common = '任务'; +$lang->task->id = '编号'; +$lang->task->project = '所属项目'; +$lang->task->story = '相关需求'; +$lang->task->storyVersion = '需求版本'; +$lang->task->name = '任务名称'; +$lang->task->type = '任务类型'; +$lang->task->pri = '优先级'; +$lang->task->mailto = '抄送给'; +$lang->task->estimate = '最初预计'; +$lang->task->estimateAB = '预'; +$lang->task->left = '预计剩余'; +$lang->task->leftAB = '剩'; +$lang->task->consumed = '已经消耗'; +$lang->task->consumedAB = '耗'; +$lang->task->hour = '小时'; +$lang->task->estimateStartDate = '开始日期'; +$lang->task->actualStartDate = '实际开始'; +$lang->task->deadline = '截止日期'; +$lang->task->deadlineAB = '截止'; +$lang->task->status = '任务状态'; +$lang->task->statusCustom = '状态排序'; +$lang->task->desc = '任务描述'; +$lang->task->assign = '指派'; +$lang->task->assignedTo = '指派给'; +$lang->task->assignedToAB = '指派给'; +$lang->task->assignedDate = '指派日期'; +$lang->task->openedBy = '由谁创建'; +$lang->task->openedByAB = '创建者'; +$lang->task->openedDate = '创建日期'; +$lang->task->openedDateAB = '创建'; +$lang->task->finishedBy = '由谁完成'; +$lang->task->finishedByAB = '完成者'; +$lang->task->finishedDate = '完成时间'; +$lang->task->finishedDateAB = '完成'; +$lang->task->canceledBy = '由谁取消'; +$lang->task->canceledDate = '取消时间'; +$lang->task->closedBy = '由谁关闭'; +$lang->task->closedDate = '关闭时间'; +$lang->task->closedReason = '关闭原因'; +$lang->task->lastEditedBy = '最后修改'; +$lang->task->lastEditedDate = '最后修改日期'; +$lang->task->lastEdited = '最后编辑'; $lang->task->same = '同上'; $lang->task->notes = '(注：“任务类型”、“任务名称”、“优先级”和“预计工时”必需填写，否则此行无效)'; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 2679417808..7bcde0c092 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -62,6 +62,10 @@ $(function() task->estimate;?> task->hour;?> + + task->estimateStartDate;?> + + task->deadline;?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 92305f1678..6b16519dfb 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -83,6 +83,10 @@
task->legendEffort;?> + + + + diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 941e247b93..70ca36134e 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -14,6 +14,10 @@
task->estimateStartDate;?>actualStartDate, "class='text-1 date'");?>
task->deadline;?> deadline, "class='text-1 date'");?>
+ + + + diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 150874b141..7456616aca 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -136,6 +136,10 @@
task->legendEffort;?>
name;?>
task->estimateStartDate;?>
task->consumed;?> consumed, "class='text-3'") . $lang->task->hour;?>
+ + + +
task->estimateStartDate;?> actualStartDate) ? substr($task->actualStartDate, 0, 10) : substr($task->estimateStartDate, 0, 10); ?>
task->deadline;?>