diff --git a/module/project/control.php b/module/project/control.php index ba0eb10a0e..7c43b7bb10 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2312,6 +2312,23 @@ class project extends control public function treeProduct($productID) { + $this->loadModel('product'); + $product = $this->product->getStatByID($productID); + $product->desc = $this->loadModel('file')->setImgSize($product->desc); + + $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('product')->like("%,$productID,%")->orderBy('date_desc')->limit(6)->fetchAll(); + if($actions) $this->loadModel('action')->transformActions($actions); + + $releases = $this->dao->select('*')->from(TABLE_RELEASE)->where('deleted')->eq(0)->andWhere('product')->eq($productID)->orderBy('date')->fetchAll(); + + $this->view->product = $product; + $this->view->actions = $this->loadModel('action')->getList('product', $productID); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->groups = $this->loadModel('group')->getPairs(); + $this->view->lines = array('') + $this->loadModel('tree')->getLinePairs(); + $this->view->branches = $this->loadModel('branch')->getPairs($productID); + $this->view->actions = $actions; + $this->view->releases = $releases; $this->display(); } @@ -2347,6 +2364,38 @@ class project extends control public function treeTask($taskID) { + $this->loadModel('task'); + $task = $this->task->getById($taskID, true); + if($task->fromBug != 0) + { + $bug = $this->loadModel('bug')->getById($task->fromBug); + $task->bugSteps = ''; + if($bug) + { + $task->bugSteps = $this->loadModel('file')->setImgSize($bug->steps); + foreach($bug->files as $file) $task->files[] = $file; + } + $this->view->fromBug = $bug; + } + else + { + $story = $this->loadModel('story')->getById($task->story); + $task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec); + $task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify); + $task->storyFiles = $this->loadModel('file')->getByObject('story', $task->story); + } + + if($task->team) $this->lang->task->assign = $this->lang->task->transfer; + + /* Update action. */ + if($task->assignedTo == $this->app->user->account) $this->loadModel('action')->read('task', $taskID); + + $project = $this->project->getById($task->project); + + $this->view->task = $task; + $this->view->project = $project; + $this->view->actions = $this->loadModel('action')->getList('task', $taskID); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); } } diff --git a/module/project/view/treetask.html.php b/module/project/view/treetask.html.php index 0527e9efd3..96e243f89f 100644 --- a/module/project/view/treetask.html.php +++ b/module/project/view/treetask.html.php @@ -1,124 +1,82 @@
-

91 任务 添加项目页内容区设置时间模块

+

+ id?> + task->common?> + + parent)) echo '' . $this->lang->task->childrenAB . '';?> + team)) echo '' . $this->lang->task->multipleAB . '';?> + parentName) ? $task->parentName . '/' : '';?>name;?> + +

- 未开始 - 预计 1h - 消耗 1h - 剩余 1h + task->statusList, $task->status);?> + task->estimate;?> estimate . $lang->workingHour;?> + task->consumed;?> consumed, 2) . $lang->workingHour;?> + task->left;?> left . $lang->workingHour;?>
- 类型: 开发 - 截止: 2018-11-23 延期1天 + task->type;?>: task->typeList[$task->type];?> + task->deadline;?>: deadline; if(isset($task->delay)) printf($lang->task->delayWarning, $task->delay);?>
- - - - - - + status == 'wait') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon iframe', true); + if($task->status == 'wait') common::printIcon('task', 'start', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon iframe', true); + if($task->status == 'pause') common::printIcon('task', 'restart', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon iframe', true); + if($task->status == 'done' or $task->status == 'cancel' or $task->status == 'closed') common::printIcon('task', 'close', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon iframe', true); + if($task->status == 'doing') common::printIcon('task', 'finish', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon iframe', true); + + common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'btn btn-info btn-icon iframe', true); + common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'btn btn-info btn-icon'); + if(empty($task->team) or empty($task->children)) + { + common::printIcon('task', 'batchCreate', "project=$task->project&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=0", $task, 'list', 'plus', '', 'btn btn-info btn-icon', '', '', $lang->task->children); + } + ?>
- -
- 任务描述 +
+
task->legendDesc;?>
-

建议教程中的所有表单，不要做表单验证，方便用户快速完成教程，了解各功能入口。现在教程中的‘提Bug’， 在未输入必填项时，无相关提示，会令访客疑惑）

-
    -
  • 调整教程右侧区块的布局。用户在教程中会跟随可视化的提示一步步操作，所以‘当前任务’对访客不重要，下方的‘所有任务’可以让访客了解教程的进度，利于鼓励其完成教程。
    • -
  • 如果‘快速入口’功能被采纳，建议在新手教程中，加入相关任务。
    • -
- + desc) ? $task->desc : "
" . $lang->task->noData . '
';?>
-
- -
- 需求描述 + +type != 'ops'):?> +fromBug != 0):?> +
+
bug->steps;?>
-

建议教程中的所有表单，不要做表单验证，方便用户快速完成教程，了解各功能入口。现在教程中的‘提Bug’， 在未输入必填项时，无相关提示，会令访客疑惑）

+ bugSteps) ? $task->bugSteps : "
" . $lang->task->noData . '
';?>
-
- -
- 附件 -
-
+story):?> +
+
task->storySpec;?>
+
+ storySpec) || !empty($task->storyFiles)) ? $task->storySpec : "
" . $lang->task->noData . '
';?> +
+ fetch('file', 'printFiles', array('files' => $task->storyFiles, 'fieldset' => 'false'));?> +
+
+
task->storyVerify;?>
+
+ storyVerify) ? $task->storyVerify : "
" . $lang->task->noData . '
';?> +
+
+ +cases) and $task->cases):?> +
+
task->case;?>
+
+
    + cases as $caseID => $case) echo '
  • ' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), "#$caseID " . $case, '', "data-toggle='modal' data-type='iframe' data-width='90%'") . '
    • ';?>
-
- -
- - 历史记录   - 添加备注 - -
-
    -
  1. 2017-06-02 12:21:00 由 王一栋 创建。
    2. -
  2. - 2018-03-01 12:00:00 由 孙浩 编辑。 -
    - 修改了 预计工时，旧值为 "0"，新值为 "5"。 -
    -
    3. -
  3. - 2017-06-02 12:21:00 由 王一栋 指派给 孙浩。 -
    - 修改了 版本号 ，旧值为 "1"，新值为 "2"。
    - 修改了 当前状态，旧值为 "active"，新值为 "changed"。
    - 修改了 由谁评审，旧值为 "liyunling"，新值为 ""。
    - 修改了 评审时间，旧值为 "2018-03-27"，新值为 "0000-00-00"。
    - 修改了 需求描述，区别为： - -
    001- Bug列表进入 bug详情页页面布局。
    - 001+ <p>Bug列表进入 bug详情页页面布局。</p>
    - 002+ <p><br /></p>
    - 003+ <p><img src="{1603.jpg}" alt="" /></p>
    -
    001- Bug列表进入 bug详情页页面布局。
    - 001+ Bug列表进入 bug详情页页面布局。
    - 002+
    - 003+
    -
    -
    4. -
  4. - 2017-06-02 12:21:00 由 Catouse 添加了备注。 - -
    备注测试
    -
    -
    - -
    -
    - - -
    -
    -
    5. -
-
- -
+ + + +fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?> +createLink('action', 'comment', "objectType=task&objectID=$task->id");?> + \ No newline at end of file diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 1c3d4e6019..fc98f44e11 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -160,7 +160,7 @@ $lang->task->confirmDeleteEstimate = "Do you want to delete it?"; $lang->task->copyStoryTitle = "Copy Story"; $lang->task->afterSubmit = "After Created,"; $lang->task->successSaved = "Created!"; -$lang->task->delayWarning = " Delay %s days "; +$lang->task->delayWarning = " Delay %s days "; $lang->task->remindBug = "This Task is converted from a Bug. Do you want to update te Bug:%s?"; $lang->task->confirmChangeProject = "If you change {$lang->projectCommon}, the related Module, Story and Assignor will be changed. Do you want to do it?"; $lang->task->confirmFinish = '"Left Hour" is 0. Do you want to change the Status to "Done"?'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 8e6b96d75a..b749966ad8 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -162,7 +162,7 @@ $lang->task->confirmDeleteEstimate = "您确定要删除这个记录吗？"; $lang->task->copyStoryTitle = "同需求"; $lang->task->afterSubmit = "添加之后"; $lang->task->successSaved = "成功添加，"; -$lang->task->delayWarning = " 延期%s天 "; +$lang->task->delayWarning = " 延期%s天 "; $lang->task->remindBug = "该任务为Bug转化得到，是否更新Bug:%s ?"; $lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相应的所属模块、相关需求和指派人发生变化，确定吗？"; $lang->task->confirmFinish = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';