diff --git a/module/program/js/common.js b/module/program/js/common.js index f34e41c406..ee200bbefa 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -75,6 +75,13 @@ function computeWorkDays(currentID) { beginDate = $('#begin').val(); endDate = $('#end').val(); + + var begin = new Date(beginDate.replace(/-/g,"/")); + var end = new Date(endDate.replace(/-/g,"/")); + var time = end.getTime() - begin.getTime(); + var days = parseInt(time / (1000 * 60 * 60 * 24)) + 1; + if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked', false); + if(endDate == longTime) $("#delta999").prop('checked', true); } if(beginDate && endDate) diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index 6d993796a0..c3f59398a1 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -87,7 +87,7 @@ project->dateRange;?>
- project->begin . "' required");?> + project->begin . "' required");?> project->to;?> project->end . "' required");?>
diff --git a/module/project/js/common.js b/module/project/js/common.js index 1f7db86b14..5965156fdd 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -80,7 +80,8 @@ function computeWorkDays(currentID) var end = new Date(endDate.replace(/-/g,"/")); var time = end.getTime() - begin.getTime(); var days = parseInt(time / (1000 * 60 * 60 * 24)) + 1; - if(days != $("input:radio[name='delta']:checked").val() && $("input:radio[name='delta']:checked").val() != 999) $("input:radio[name='delta']:checked").attr('checked',false); + if(days != $("input:radio[name='delta']:checked").val()) $("input:radio[name='delta']:checked").attr('checked', false); + if(endDate == longTime) $("#delta999").prop('checked', true); } if(beginDate && endDate) diff --git a/module/testcase/model.php b/module/testcase/model.php index 332a6644d0..9fbf37c07b 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -568,7 +568,8 @@ class testcaseModel extends model ->andWhere('deleted')->eq(0) ->beginIF($auto != 'skip' and $auto != 'unit')->andWhere('auto')->ne('unit')->fi() ->beginIF($auto == 'unit')->andWhere('auto')->eq('unit')->fi() - ->orderBy($orderBy)->page($pager)->fetchAll('id'); + ->orderBy($orderBy)->page($pager) + ->fetchAll('id'); } /** @@ -589,7 +590,7 @@ class testcaseModel extends model { $modules = $moduleID ? $this->loadModel('tree')->getAllChildId($moduleID) : '0'; - $cases = $this->dao->select('t1.*, t2.title as storyTitlen')->from(TABLE_CASE)->alias('t1') + $cases = $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1') ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id') ->beginIF($productID)->where('t1.product')->eq((int) $productID)->fi() ->beginIF($productID == 0)->where('t1.product')->in($this->app->user->view->products)->fi() @@ -600,7 +601,8 @@ class testcaseModel extends model ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi() ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() ->andWhere('t1.deleted')->eq('0') - ->orderBy($orderBy)->page($pager)->fetchAll('id'); + ->orderBy($orderBy)->page($pager) + ->fetchAll('id'); return $this->appendData($cases); } @@ -1006,10 +1008,9 @@ class testcaseModel extends model $actions = array(); $this->loadModel('action'); + $oldCases = $this->getByList($caseIdList); foreach($caseIdList as $caseID) { - $oldCase = $this->getById($caseID); - $case = new stdClass(); $case->lastEditedBy = $this->app->user->account; $case->lastEditedDate = $now; @@ -1017,7 +1018,7 @@ class testcaseModel extends model $this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec(); $actionID = $this->action->create('case', $caseID, 'Edited', '', ucfirst($result)); - $changes = common::createChanges($oldCase, $case); + $changes = common::createChanges($oldCases[$caseID], $case); $this->action->logHistory($actionID, $changes); } } diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js index 40be674e7a..e4b41e46da 100644 --- a/module/testtask/js/common.js +++ b/module/testtask/js/common.js @@ -85,6 +85,7 @@ function loadExecutionRelated(executionID) * Load execution builds. * * @param int $executionID + * @param int $selected * @access public * @return void */ diff --git a/module/todo/lang/de.php b/module/todo/lang/de.php index 12930f3d08..4fc9836de8 100644 --- a/module/todo/lang/de.php +++ b/module/todo/lang/de.php @@ -69,8 +69,8 @@ $lang->todo->closedBy = 'ClosedBy'; $lang->todo->closedDate = 'ClosedDate'; $lang->todo->deadline = 'Fällig'; -$lang->todo->cycleDayTxt = 'Interval days'; -$lang->todo->beforeDaysTxt = 'Days in advance'; +$lang->todo->cycleDaysLabel = 'Interval days'; +$lang->todo->beforeDaysLabel = 'Days in advance'; $lang->todo->every = 'Jeden'; $lang->todo->specify = 'ernennen'; diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index 99dfe7a03f..b12f55bd9d 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -70,8 +70,8 @@ $lang->todo->closedDate = 'ClosedDate'; $lang->todo->deadline = 'Expiration'; $lang->todo->deleted = 'Deleted'; -$lang->todo->cycleDayTxt = 'Interval days'; -$lang->todo->beforeDaysTxt = 'Days in advance'; +$lang->todo->cycleDaysLabel = 'Interval days'; +$lang->todo->beforeDaysLabel = 'Days in advance'; $lang->todo->every = 'Every'; $lang->todo->specify = 'Specify'; diff --git a/module/todo/lang/fr.php b/module/todo/lang/fr.php index 9e8eafc6fc..9154e1d034 100644 --- a/module/todo/lang/fr.php +++ b/module/todo/lang/fr.php @@ -69,8 +69,8 @@ $lang->todo->closedBy = 'ClosedBy'; $lang->todo->closedDate = 'ClosedDate'; $lang->todo->deadline = 'Expiration'; -$lang->todo->cycleDayTxt = 'Interval days'; -$lang->todo->beforeDaysTxt = 'Days in advance'; +$lang->todo->cycleDaysLabel = 'Interval days'; +$lang->todo->beforeDaysLabel = 'Days in advance'; $lang->todo->every = 'Chaque'; $lang->todo->specify = 'Désigner'; diff --git a/module/todo/lang/vi.php b/module/todo/lang/vi.php index 5e4ae560b0..afbb9a22f3 100644 --- a/module/todo/lang/vi.php +++ b/module/todo/lang/vi.php @@ -69,8 +69,8 @@ $lang->todo->closedBy = 'Người đóng'; $lang->todo->closedDate = 'Ngày đóng'; $lang->todo->deadline = 'Quá hạn'; -$lang->todo->cycleDayTxt = 'Interval days'; -$lang->todo->beforeDaysTxt = 'Days in advance'; +$lang->todo->cycleDaysLabel = 'Interval days'; +$lang->todo->beforeDaysLabel = 'Days in advance'; $lang->todo->every = 'Mọi'; $lang->todo->specify = 'bổ nhiệm'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 7eae292cc4..d0fdb00809 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -70,8 +70,8 @@ $lang->todo->closedDate = '关闭时间'; $lang->todo->deadline = '过期时间'; $lang->todo->deleted = '已删除'; -$lang->todo->cycleDayTxt = '间隔天数'; -$lang->todo->beforeDaysTxt = '提前天数'; +$lang->todo->cycleDaysLabel = '间隔天数'; +$lang->todo->beforeDaysLabel = '提前天数'; $lang->todo->every = '间隔'; $lang->todo->specify = '指定'; diff --git a/module/todo/model.php b/module/todo/model.php index 94ef901090..cb5f8782d3 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -77,12 +77,12 @@ class todoModel extends model unset($todo->config['month']); if(!$todo->config['day']) { - dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDayTxt); + dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel); return false; } if(!validater::checkInt($todo->config['day'])) { - dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDayTxt); + dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel); return false; } } @@ -101,7 +101,7 @@ class todoModel extends model if($todo->config['beforeDays'] and !validater::checkInt($todo->config['beforeDays'])) { - dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysTxt); + dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysLabel); return false; } $todo->config['beforeDays'] = (int)$todo->config['beforeDays'];