From 0f4927728a3ffeaceeef438fcea6596baaad44d9 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 16:58:34 +0800 Subject: [PATCH 1/7] * Code for stage. --- module/stage/control.php | 23 +++++++++++++++++--- module/stage/lang/zh-cn.php | 4 ++++ module/stage/model.php | 9 ++++++-- module/stage/view/browse.html.php | 36 +++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/module/stage/control.php b/module/stage/control.php index 00dba56607..0937f87b59 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -1,9 +1,10 @@ view->stages = $this->stage->getStages($orderBy); + $this->view->orderBy = $orderBy; $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->browse; $this->view->position[] = $this->lang->stage->common; $this->view->position[] = $this->lang->stage->browse; @@ -56,7 +57,7 @@ class stage extends control $actionID = $this->loadModel('action')->create('stage', $stageID, 'Edited'); if(!empty($changes)) $this->action->logHistory($actionID, $changes); - $response['locate'] = inlink('view', "stageID=$stageID"); + $response['locate'] = inlink('browse'); $this->send($response); } @@ -89,4 +90,20 @@ class stage extends control $this->view->position[] = $this->lang->stage->setType; $this->display(); } + + public function delete($stageID, $confirm = 'no') + { + $stage = $this->stage->getById($stageID); + + if($confirm == 'no') + { + die(js::confirm($this->lang->stage->confirmDelete, inlink('delete', "stageID=$stageID&confirm=yes"))); + } + else + { + $this->stage->delete(TABLE_STAGE, $stageID); + + die(js::reload('parent')); + } + } } diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index b6bf0f6b09..bddc5b63de 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -10,6 +10,7 @@ $lang->stage->view = '阶段详情'; /* Fields. */ $lang->stage->common = '阶段'; +$lang->stage->id = '编号'; $lang->stage->name = '阶段名称'; $lang->stage->type = '阶段分类'; $lang->stage->percent = '工作量比例'; @@ -22,3 +23,6 @@ $lang->stage->typeList['qa'] = '测试'; $lang->stage->typeList['release'] = '发布'; $lang->stage->typeList['review'] = '总结评审'; $lang->stage->typeList['other'] = '其他'; + +$lang->stage->noStage = '暂时没有阶段'; +$lang->stage->confirmDelete = '您确定要执行删除操作吗？'; diff --git a/module/stage/model.php b/module/stage/model.php index 928e1af022..9dd90aa2d4 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -29,9 +29,9 @@ class stageModel extends model return false; } - public function getStages() + public function getStages($orderBy = 'id_desc') { - return $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->fetchAll('id'); + return $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->orderBy($orderBy)->fetchAll('id'); } public function getPairs() @@ -46,4 +46,9 @@ class stageModel extends model return $pairs; } + + public function getByID($stageID) + { + return $this->dao->select('*')->from(TABLE_STAGE)->where('deleted')->eq(0)->andWhere('id')->eq((int)$stageID)->fetch(); + } } diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php index 58884631b2..8206ac111c 100644 --- a/module/stage/view/browse.html.php +++ b/module/stage/view/browse.html.php @@ -5,4 +5,40 @@ " . $lang->stage->create, '', "class='btn btn-primary'");?> +
+ +
+

+ stage->noStage;?> + + createLink('stage', 'create'), " " . $lang->stage->create, '', "class='btn btn-info'");?> + +

+
+ + + + + + + + + + + + + + + + + + + + + + + +
stage->id);?>stage->name);?>stage->percent);?>stage->type);?>actions;?>
id;?>name;?>percent;?>stage->typeList, $stage->type);?>id", "", "list") . common::printIcon('stage', 'delete', "stageID=$stage->id", "", "list")?>
+ +
From 3b72ae82387dc5c37c3d9ad4f5f007317e6d2b3d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 17 Aug 2020 17:24:22 +0800 Subject: [PATCH 2/7] * Add stage to 20.x. --- module/stage/control.php | 26 ++++++++++++++++++++ module/stage/lang/zh-cn.php | 1 - module/stage/model.php | 25 +++++++++++++++++++ module/stage/view/batchcreate.html.php | 34 ++++++++++++++++++++++++++ module/stage/view/create.html.php | 1 + 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 module/stage/view/batchcreate.html.php diff --git a/module/stage/control.php b/module/stage/control.php index 0937f87b59..38d7431e25 100644 --- a/module/stage/control.php +++ b/module/stage/control.php @@ -39,6 +39,32 @@ class stage extends control $this->display(); } + public function batchCreate() + { + if($_POST) + { + $this->stage->batchCreate(); + + $response['result'] = 'success'; + $response['message'] = $this->lang->saveSuccess; + if(dao::isError()) + { + $response['result'] = 'fail'; + $response['message'] = dao::getError(); + $this->send($response); + } + + $response['locate'] = inlink('browse'); + $this->send($response); + } + + $this->view->title = $this->lang->stage->common . $this->lang->colon . $this->lang->stage->batchCreate; + $this->view->position[] = $this->lang->stage->common; + $this->view->position[] = $this->lang->stage->batchCreate; + + $this->display(); + } + public function edit($stageID = 0) { $stage = $this->stage->getByID($stageID); diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index bddc5b63de..3af3bbe6a4 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -7,7 +7,6 @@ $lang->stage->edit = '编辑'; $lang->stage->delete = '删除'; $lang->stage->view = '阶段详情'; - /* Fields. */ $lang->stage->common = '阶段'; $lang->stage->id = '编号'; diff --git a/module/stage/model.php b/module/stage/model.php index 9dd90aa2d4..3da64cccfd 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -14,6 +14,31 @@ class stageModel extends model return false; } + public function batchCreate() + { + $data = fixer::input('post')->get(); + + $this->loadModel('action'); + foreach($data->name as $i => $name) + { + if(!$name) continue; + + $stage = new stdclass(); + $stage->name = $name; + $stage->percent = $data->percent[$i]; + $stage->type = $data->type[$i]; + $stage->createdBy = $this->app->user->account; + $stage->createdDate = helper::today(); + + $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec(); + + $stageID = $this->dao->lastInsertID(); + $this->action->create('stage', $stageID, 'Opened'); + } + + return true; + } + public function update($stageID) { $oldStage = $this->dao->select('*')->from(TABLE_STAGE)->where('id')->eq((int)$stageID)->fetch(); diff --git a/module/stage/view/batchcreate.html.php b/module/stage/view/batchcreate.html.php new file mode 100644 index 0000000000..9a0460d538 --- /dev/null +++ b/module/stage/view/batchcreate.html.php @@ -0,0 +1,34 @@ + +
+
+

stage->batchCreate;?>

+
+
+ + + + + + + + + + + + + + + + + + + + + + +
stage->id;?>stage->name;?>stage->percent;?>stage->type;?>
stage->typeList, '', "class='form-control chosen'");?>
+ +
+
+
+ diff --git a/module/stage/view/create.html.php b/module/stage/view/create.html.php index 3b07b46f95..6f7dffa22c 100644 --- a/module/stage/view/create.html.php +++ b/module/stage/view/create.html.php @@ -36,4 +36,5 @@ + From 4c2d627fd9c3b54ff3afb6dbb3807d7ffbd29254 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 17 Aug 2020 17:27:42 +0800 Subject: [PATCH 3/7] * Code for stage. --- module/stage/view/browse.html.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php index 8206ac111c..2b529892b1 100644 --- a/module/stage/view/browse.html.php +++ b/module/stage/view/browse.html.php @@ -34,7 +34,12 @@ name;?> percent;?> stage->typeList, $stage->type);?> - id", "", "list") . common::printIcon('stage', 'delete', "stageID=$stage->id", "", "list")?> + + id", "", "list"); + common::printIcon('stage', 'delete', "stageID=$stage->id", "", "list", '', 'hiddenwin'); + ?> + From 4ad3e6d979b78bcbcf4f9505b78ff76eed75e383 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Tue, 18 Aug 2020 09:06:13 +0800 Subject: [PATCH 4/7] * Code for stage. --- module/stage/lang/zh-cn.php | 1 + module/stage/view/browse.html.php | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/module/stage/lang/zh-cn.php b/module/stage/lang/zh-cn.php index 3af3bbe6a4..37d64800aa 100644 --- a/module/stage/lang/zh-cn.php +++ b/module/stage/lang/zh-cn.php @@ -23,5 +23,6 @@ $lang->stage->typeList['release'] = '发布'; $lang->stage->typeList['review'] = '总结评审'; $lang->stage->typeList['other'] = '其他'; +$lang->stage->viewList = '浏览列表'; $lang->stage->noStage = '暂时没有阶段'; $lang->stage->confirmDelete = '您确定要执行删除操作吗？'; diff --git a/module/stage/view/browse.html.php b/module/stage/view/browse.html.php index 2b529892b1..f1597bbdb5 100644 --- a/module/stage/view/browse.html.php +++ b/module/stage/view/browse.html.php @@ -1,5 +1,9 @@ +
+ +
+

+ noData;?> + + createLink('risk', 'create'), " " . $lang->risk->create, '', "class='btn btn-info'");?> + +

+
+ + + recTotal}&recPerPage={$pager->recPerPage}";?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
risk->id);?>risk->name);?>risk->strategy);?>risk->status);?>risk->identifiedDate);?>risk->riskindex);?>risk->pri);?>risk->assignedTo);?>risk->category);?>actions;?>
id);?>name;?>risk->strategyList, $risk->strategy);?>risk->statusList, $risk->status);?>identifiedDate;?>riskindex;?>risk->priList, $risk->pri)?>assignedTo);?>risk->categoryList, $risk->category);?>
+
+
+ +
- diff --git a/module/risk/view/create.html.php b/module/risk/view/create.html.php index 0f6850953c..112f830e70 100644 --- a/module/risk/view/create.html.php +++ b/module/risk/view/create.html.php @@ -1,4 +1,5 @@ +
@@ -7,28 +8,57 @@
+ + + + + - - - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
risk->source;?>risk->sourceList, '', "class='form-control chosen'");?>
risk->name;?>
risk->percent;?> -
- - % -
- 		risk->category;?>risk->categoryList, '', "class='form-control chosen'");?>
risk->type;?>risk->typeList, '', "class='form-control chosen'");?>risk->strategy;?>risk->strategyList, '', "class='form-control chosen'");?>
+ risk->impact;?>risk->impactList, 3, "class='form-control chosen'");?>
risk->probability;?>risk->probabilityList, 3, "class='form-control chosen'");?>
risk->riskindex;?>
risk->pri;?>risk->priList, '', "class='form-control chosen'");?>
risk->plannedClosedDate;?>
risk->assignedTo;?>
risk->prevention;?>
risk->remedy;?>