From 4f7052c4fc9f0f9489548c781efc3cd91615a511 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 23 May 2018 16:03:52 +0800 Subject: [PATCH 01/11] * adjust style of report/bugcreate view. --- module/report/css/bugcreate.css | 3 +-- module/report/view/bugcreate.html.php | 34 ++++++++++++++------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/module/report/css/bugcreate.css b/module/report/css/bugcreate.css index a658e9d7bc..8b13789179 100644 --- a/module/report/css/bugcreate.css +++ b/module/report/css/bugcreate.css @@ -1,2 +1 @@ -#product_chosen .chosen-single{width:150px;} -#project_chosen .chosen-single{width:150px;} + diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index 68f78139d1..906c834103 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -11,23 +11,25 @@
-
-
-
-
- report->bugOpenedDate;?> -
- report->to;?> -
-
+
+
+
+ report->bugOpenedDate;?> +
+ report->to;?> +
-
-
- report->product;?> - - report->project;?> - -
+
+
+
+ report->product;?> + +
+
+
+
+ report->project;?> +
From 02ec99fee6b120754b74c14aeb51e6ad7feb0823 Mon Sep 17 00:00:00 2001 From: Catouse Date: Wed, 23 May 2018 16:13:15 +0800 Subject: [PATCH 02/11] * adjust style of report views. --- module/report/view/bugassign.html.php | 2 +- module/report/view/bugcreate.html.php | 2 +- module/report/view/productsummary.html.php | 24 +++---- module/report/view/projectdeviation.html.php | 16 ++--- module/report/view/workload.html.php | 74 +++++++++++--------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/module/report/view/bugassign.html.php b/module/report/view/bugassign.html.php index 12ccb20f49..c0e7094074 100644 --- a/module/report/view/bugassign.html.php +++ b/module/report/view/bugassign.html.php @@ -16,7 +16,7 @@
- +
diff --git a/module/report/view/bugcreate.html.php b/module/report/view/bugcreate.html.php index 906c834103..5cb0e1ca17 100644 --- a/module/report/view/bugcreate.html.php +++ b/module/report/view/bugcreate.html.php @@ -41,7 +41,7 @@
-
report->user;?>
+
diff --git a/module/report/view/productsummary.html.php b/module/report/view/productsummary.html.php index beafb7f5bd..3b458a497b 100644 --- a/module/report/view/productsummary.html.php +++ b/module/report/view/productsummary.html.php @@ -10,18 +10,16 @@
-
-
-
report->conditions?>
-
-
- /> - -
-
- /> - -
+
+
report->conditions?>
+
+
+ /> + +
+
+ /> +
@@ -33,7 +31,7 @@
-
bug->openedBy;?>
+
diff --git a/module/report/view/projectdeviation.html.php b/module/report/view/projectdeviation.html.php index e58b8861e0..2e677fd1dd 100644 --- a/module/report/view/projectdeviation.html.php +++ b/module/report/view/projectdeviation.html.php @@ -12,14 +12,12 @@
-
-
-
- projectCommon . $lang->report->beginAndEnd;?> -
- report->to;?> -
-
+
+
+ projectCommon . $lang->report->beginAndEnd;?> +
+ report->to;?> +
@@ -30,7 +28,7 @@
-
product->name;?>
+
diff --git a/module/report/view/workload.html.php b/module/report/view/workload.html.php index 130c10092d..d1559c0d2b 100644 --- a/module/report/view/workload.html.php +++ b/module/report/view/workload.html.php @@ -11,42 +11,46 @@
-
-
-
-
-
- report->dept;?> - -
+ +
+
+
+ report->dept;?> +
-
-
- report->taskAssignedDate;?> -
- report->to;?> -
-
-
-
-
- report->diffDays;?> - -
-
-
-
- report->workday;?> - -
-
-
- report->assign, $assign, "class='form-control' onchange='changeParams(this)' style='width:90px'");?> -
-
report->query);?>
- -
+
+
+ report->taskAssignedDate;?> +
+ report->to;?> +
+
+
+
+
+ report->diffDays;?> + +
+
+
+
+
+
+ report->workday;?> + +
+
+
+ report->assign, $assign, "class='form-control chosen-simple' onchange='changeParams(this)'");?> +
+
+ report->query, '', 'btn btn-primary btn-block');?> +
+
+
+
+
@@ -55,7 +59,7 @@
-
report->id;?>
+
From ee0ac234b256c1f9d02093d1d1c8c14d412f1c36 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:19:11 +0800 Subject: [PATCH 03/11] * finish task #4220. --- module/custom/view/set.html.php | 10 +++++----- module/score/model.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/custom/view/set.html.php b/module/custom/view/set.html.php index ac39c8385e..200f290431 100644 --- a/module/custom/view/set.html.php +++ b/module/custom/view/set.html.php @@ -21,9 +21,9 @@ $itemRow = << - EOT; @@ -54,9 +54,9 @@ EOT;
report->user;?> - - + + +
- + - + > diff --git a/module/score/model.php b/module/score/model.php index e3d394f7a0..881642ff13 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -221,7 +221,7 @@ class scoreModel extends model $data->time = empty($time) ? helper::now() : $time; $this->dao->insert(TABLE_SCORE)->data($data)->exec(); - $this->dao->update(TABLE_USER)->set("`score`=`score` + " . $rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec(); + $this->dao->update(TABLE_USER)->set("`score`=`score` + " . (int)$rule['score'])->set("`scoreLevel`=`scoreLevel` + " . $rule['score'])->where('account')->eq($account)->exec(); } /** From 057f94defaad88984c14520c4744b99b63f5a8f1 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:20:46 +0800 Subject: [PATCH 04/11] * finish task #4219. --- module/cron/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/cron/lang/zh-cn.php b/module/cron/lang/zh-cn.php index 5bcb8d189c..a769b15faf 100644 --- a/module/cron/lang/zh-cn.php +++ b/module/cron/lang/zh-cn.php @@ -37,7 +37,7 @@ $lang->cron->confirmDelete = '是否删除该计划任务？'; $lang->cron->confirmTurnon = '是否关闭计划任务？'; $lang->cron->introduction = <<计划任务功能可以定时执行诸如更新燃尽图、备份等操作，免除自己布置计划任务。

-

该功能还有待完善，所以默认关闭该功能

+

该功能还有待完善，所以默认关闭该功能。

EOD; $lang->cron->confirmOpen = <<是否开启该功能？打开计划任务

From 244a261be4d03b6b00a3915dd4a1bc400dd9ee78 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 23 May 2018 16:25:50 +0800 Subject: [PATCH 05/11] * finish task #4217. --- module/bug/view/view.html.php | 2 -- module/project/view/view.html.php | 4 ---- module/score/model.php | 2 +- module/task/view/view.html.php | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index cc623456ae..9f349d8dfd 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -336,8 +336,6 @@ $convertParams = "productID=$productID&branch=$bug->branch&moduleID=0&from=bug&b common::printIcon('bug', 'create', $copyParams, $bug, 'button', 'copy'); common::printIcon('bug', 'delete', $params, $bug, 'button', '', 'hiddenwin'); ?> - - diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index ff7dae0e24..21251ba7ff 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -289,10 +289,6 @@ common::printIcon('project', 'edit', $params, $project); common::printIcon('project', 'delete', $params, $project, 'button', '', 'hiddenwin'); } - else - { - common::printBack($browseLink); - } ?>
custom->storyReview;?>custom->storyReview;?> custom->reviewList, $needReview);?>
custom->forceReview;?>