From 2c28909140b1fc9e2350d89c7eedd29d1c3dea98 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 1 Jul 2019 10:12:02 +0800 Subject: [PATCH 1/5] * Fix case list style. --- module/testcase/config.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/config.php b/module/testcase/config.php index 63c6607aa1..5a2462e0f6 100644 --- a/module/testcase/config.php +++ b/module/testcase/config.php @@ -153,12 +153,12 @@ $config->testcase->datatable->fieldList['lastRunDate']['required'] = 'no'; $config->testcase->datatable->fieldList['lastRunResult']['title'] = 'lastRunResult'; $config->testcase->datatable->fieldList['lastRunResult']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['lastRunResult']['width'] = '50'; +$config->testcase->datatable->fieldList['lastRunResult']['width'] = '70'; $config->testcase->datatable->fieldList['lastRunResult']['required'] = 'no'; $config->testcase->datatable->fieldList['status']['title'] = 'statusAB'; $config->testcase->datatable->fieldList['status']['fixed'] = 'no'; -$config->testcase->datatable->fieldList['status']['width'] = '50'; +$config->testcase->datatable->fieldList['status']['width'] = '70'; $config->testcase->datatable->fieldList['status']['required'] = 'no'; $config->testcase->datatable->fieldList['lastEditedBy']['title'] = 'lastEditedBy'; From dc33a59896dc4388127d503a5a5cb55c05eb721f Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 1 Jul 2019 10:15:01 +0800 Subject: [PATCH 2/5] * Fix export style. --- module/file/lang/en.php | 2 +- module/file/view/export.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/file/lang/en.php b/module/file/lang/en.php index 64363c9613..84eb9a5dd5 100644 --- a/module/file/lang/en.php +++ b/module/file/lang/en.php @@ -20,7 +20,7 @@ $lang->file->delete = 'Delete File'; $lang->file->label = 'Label:'; $lang->file->maxUploadSize = "%s"; $lang->file->applyTemplate = "Apply Template"; -$lang->file->tplTitle = "Name"; +$lang->file->tplTitle = "Template Name"; $lang->file->setPublic = "Set Public Template"; $lang->file->exportFields = "Fields"; $lang->file->exportRange = "Data"; diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 035db7ecb8..d572967e3a 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -155,7 +155,7 @@ if($isCustomExport) - + From 368775a796266d7679cbcc1d803ee9e28e1168a8 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 1 Jul 2019 14:18:23 +0800 Subject: [PATCH 3/5] * Finish task #5892. --- module/task/js/finish.js | 11 +++++++++++ module/task/lang/en.php | 2 +- module/task/lang/zh-cn.php | 2 +- module/task/model.php | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 module/task/js/finish.js diff --git a/module/task/js/finish.js b/module/task/js/finish.js new file mode 100644 index 0000000000..465c895ecf --- /dev/null +++ b/module/task/js/finish.js @@ -0,0 +1,11 @@ +$(function() +{ + $('#currentConsumed').keyup(function() + { + var currentConsumed = $(this).val(); + if(!parseInt(currentConsumed)) currentConsumed = 0; + var total = parseInt(currentConsumed) + parseInt(consumed); + $('#totalConsumed').html(total); + $('#consumed').val(total); + }) +}) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 24a17fc186..2a73fa6dc7 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -185,7 +185,7 @@ $lang->task->noTask = 'No tasks yet. '; $lang->task->createDenied = 'Create Task is denied in this project'; $lang->task->error = new stdclass(); -$lang->task->error->consumedNumber = '"Hours Cost" must be numbers.'; +$lang->task->error->consumedNumber = '"Current Cost" must be numbers.'; $lang->task->error->estimateNumber = '"Estimates" must be numbers.'; $lang->task->error->consumedSmall = '"Hours Cost" must be > the last number.'; $lang->task->error->consumedThisTime = 'Please enter "Hours Cost"'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 5d3680dd59..a5f4e61f59 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -185,7 +185,7 @@ $lang->task->noTask = '暂时没有任务。'; $lang->task->createDenied = '你不能在该项目添加任务'; $lang->task->error = new stdclass(); -$lang->task->error->consumedNumber = '"已经消耗"必须为数字'; +$lang->task->error->consumedNumber = '"本次消耗"必须为数字'; $lang->task->error->estimateNumber = '"预计剩余"必须为数字'; $lang->task->error->consumedSmall = '"已经消耗"必须大于之前消耗'; $lang->task->error->consumedThisTime = '请填写"工时"'; diff --git a/module/task/model.php b/module/task/model.php index b6f5c1804c..56dc07a40d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1289,7 +1289,7 @@ class taskModel extends model ->remove('comment,files,labels,currentConsumed') ->get(); - if(!is_numeric($task->consumed)) + if(!is_numeric($this->post->currentConsumed)) { dao::$errors[] = $this->lang->task->error->consumedNumber; return false; From f7d4f5ff7171ca7d4d8f033181c872f0c6bb5a70 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 1 Jul 2019 14:37:50 +0800 Subject: [PATCH 4/5] * Code for task #5892. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 56dc07a40d..5dcb2ae776 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1327,7 +1327,7 @@ class taskModel extends model ->setDefault('date', date(DT_DATE1)) ->setIF($this->post->finishedDate, 'date', $this->post->finishedDate) ->setDefault('left', 0) - ->remove('finishedDate,comment,assignedTo,files,labels,consumed') + ->remove('finishedDate,comment,assignedTo,files,labels,consumed,currentConsumed') ->get(); $estimate->consumed = $consumed; From 97c498aeef35b0ab7d7a071ecd24963c77965f4d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 1 Jul 2019 15:05:49 +0800 Subject: [PATCH 5/5] * Fix finish view style. --- module/task/view/finish.html.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index 9066d99633..b9786bff33 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -35,7 +35,7 @@
file->fileName;?>file->fileName;?> file->untitled}'");?>
- getClientLang() == 'en' ? 'w-120px' : 'w-80px';?> + getClientLang() == 'en' ? 'w-120px' : 'w-100px';?> @@ -55,11 +55,11 @@
team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?> consumed;?> workingHour;?>
team) ? $lang->task->consumed : $lang->task->myConsumed;?> - team) ? $task->consumed : $task->myConsumed;?> - " . $consumed . "" . $lang->workingHour . html::hidden('consumed', $consumed); - js::set('consumed', $consumed); - ?> + team) ? $task->consumed : $task->myConsumed;?> + " . $consumed . "" . $lang->workingHour . html::hidden('consumed', $consumed); + js::set('consumed', $consumed); + ?>