Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/185_zhangzilong_49284' into sprint/185

Browse Source
This commit is contained in:
孙广明
2022-02-18 14:24:11 +08:00
parent 60937d3a52 ffbbfe417f
commit a453e3109e
12 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update16.4.sql
+3
View File
@@ -19,5 +19,8 @@ ALTER TABLE `zt_block` DROP INDEX `account_module_type_order`, ADD UNIQUE `accou
ALTER TABLE `zt_effort` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
ALTER TABLE `zt_story` ADD `vision` varchar(10) NOT NULL DEFAULT 'rnd' AFTER `id`;
ALTER TABLE `zt_story` ADD `activatedDate` datetime NOT NULL AFTER `closedReason`;
ALTER TABLE `zt_task` MODIFY `activatedDate` datetime NOT NULL AFTER `lastEditedDate`;
ALTER TABLE `zt_user` ADD `visions` varchar(20) NOT NULL AFTER `visits`;
UPDATE `zt_user` SET `visions`='rnd,lite';
db/zentao.sql
+2 -1
View File
@@ -1293,6 +1293,7 @@ CREATE TABLE IF NOT EXISTS `zt_story` (
`closedBy` varchar(30) NOT NULL default '',
`closedDate` datetime NOT NULL,
`closedReason` varchar(30) NOT NULL,
`activatedDate` datetime NOT NULL,
`toBug` mediumint(8) unsigned NOT NULL,
`childStories` varchar(255) NOT NULL,
`linkStories` varchar(255) NOT NULL,
@@ -1395,7 +1396,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
`closedReason` varchar(30) NOT NULL,
`lastEditedBy` varchar(30) NOT NULL,
`lastEditedDate` datetime NOT NULL,
`activatedDate` date NOT NULL,
`activatedDate` datetime NOT NULL,
`repo` mediumint(8) unsigned NOT NULL,
`mr` mediumint(8) unsigned NOT NULL,
`entry` varchar(255) NOT NULL,
module/bug/config.php
+2
View File
@@ -105,6 +105,7 @@ $config->bug->search['fields']['resolvedDate'] = $lang->bug->resolvedDate;
$config->bug->search['fields']['closedDate'] = $lang->bug->closedDate;
$config->bug->search['fields']['lastEditedDate'] = $lang->bug->lastEditedDateAB;
$config->bug->search['fields']['deadline'] = $lang->bug->deadline;
$config->bug->search['fields']['activatedDate'] = $lang->bug->activatedDate;
$config->bug->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->bug->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
@@ -149,6 +150,7 @@ $config->bug->search['params']['resolvedDate'] = array('operator' => '=',
$config->bug->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->datatable = new stdclass();
$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'confirmed', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions');
module/execution/config.php
+2
View File
@@ -78,6 +78,7 @@ $config->execution->search['fields']['finishedDate'] = $lang->task->finishedDa
$config->execution->search['fields']['closedDate'] = $lang->task->closedDate;
$config->execution->search['fields']['canceledDate'] = $lang->task->canceledDate;
$config->execution->search['fields']['lastEditedDate'] = $lang->task->lastEditedDate;
$config->execution->search['fields']['activatedDate'] = $lang->task->activatedDate;
$config->execution->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->execution->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->task->statusList);
@@ -112,6 +113,7 @@ $config->execution->search['params']['finishedDate'] = array('operator' => '='
$config->execution->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->execution->search['params']['canceledDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->execution->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->execution->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->printKanban = new stdClass();
$config->printKanban->col['story'] = 1;
module/product/config.php
+2
View File
@@ -51,6 +51,7 @@ $config->product->search['fields']['reviewedDate'] = $lang->story->reviewedDat
$config->product->search['fields']['assignedDate'] = $lang->story->assignedDate;
$config->product->search['fields']['closedDate'] = $lang->story->closedDate;
$config->product->search['fields']['lastEditedDate'] = $lang->story->lastEditedDate;
$config->product->search['fields']['activatedDate'] = $lang->story->activatedDate;
$config->product->search['params']['title'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
$config->product->search['params']['keywords'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
@@ -84,6 +85,7 @@ $config->product->search['params']['reviewedDate'] = array('operator' => '=',
$config->product->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->product->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->product->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->product->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->product->create = new stdclass();
$config->product->edit = new stdclass();
module/story/config.php
+5
View File
@@ -166,6 +166,11 @@ $config->story->datatable->fieldList['lastEditedDate']['fixed'] = 'no';
$config->story->datatable->fieldList['lastEditedDate']['width'] = '90';
$config->story->datatable->fieldList['lastEditedDate']['required'] = 'no';
$config->story->datatable->fieldList['activatedDate']['title'] = 'activatedDate';
$config->story->datatable->fieldList['activatedDate']['fixed'] = 'no';
$config->story->datatable->fieldList['activatedDate']['width'] = '90';
$config->story->datatable->fieldList['activatedDate']['required'] = 'no';
$config->story->datatable->fieldList['feedbackBy']['title'] = 'feedbackBy';
$config->story->datatable->fieldList['feedbackBy']['fixed'] = 'no';
$config->story->datatable->fieldList['feedbackBy']['width'] = '100';
module/story/lang/zh-cn.php
+1
View File
@@ -126,6 +126,7 @@ $lang->story->rejectedReason = '拒绝原因';
$lang->story->reviewedBy = '由谁评审';
$lang->story->reviewers = '评审人员';
$lang->story->reviewedDate = '评审时间';
$lang->story->activatedDate = '激活日期';
$lang->story->version = '版本号';
$lang->story->feedbackBy = '反馈者';
$lang->story->notifyEmail = '通知邮箱';
module/story/model.php
+1
View File
@@ -1968,6 +1968,7 @@ class storyModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->setDefault('assignedDate', $now)
->setDefault('activatedDate', $now)
->remove('comment')
->get();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec();
module/task/config.php
+5
View File
@@ -189,6 +189,11 @@ $config->task->datatable->fieldList['lastEditedDate']['fixed'] = 'no';
$config->task->datatable->fieldList['lastEditedDate']['width'] = '120';
$config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
$config->task->datatable->fieldList['activatedDate']['title'] = 'activatedDate';
$config->task->datatable->fieldList['activatedDate']['fixed'] = 'no';
$config->task->datatable->fieldList['activatedDate']['width'] = '90';
$config->task->datatable->fieldList['activatedDate']['required'] = 'no';
$config->task->datatable->fieldList['actions']['title'] = 'actions';
$config->task->datatable->fieldList['actions']['fixed'] = 'right';
$config->task->datatable->fieldList['actions']['width'] = '180';
module/task/lang/zh-cn.php
+1
View File
@@ -40,6 +40,7 @@ $lang->task->cancel = "取消";
$lang->task->cancelAction = "取消任务";
$lang->task->activateAction = "激活任务";
$lang->task->activate = "激活";
$lang->task->activatedDate = "激活日期";
$lang->task->export = "导出数据";
$lang->task->exportAction = "导出任务";
$lang->task->reportChart = "报表统计";
module/task/model.php
+1
View File
@@ -1906,6 +1906,7 @@ class taskModel extends model
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', helper::now())
->setDefault('assignedDate', helper::now())
->setDefault('activatedDate', helper::now())
->remove('comment')
->get();
module/upgrade/model.php
+25
View File
@@ -760,6 +760,11 @@ class upgradeModel extends model
$this->saveLogs('Execute 16_3');
$this->execSQL($this->getUpgradeFile('16.3'));
$this->appendExec('16_3');
case '16_4':
$this->saveLogs('Execute 16_4');
$this->execSQL($this->getUpgradeFile('16.4'));
$this->updateActivatedDate();
$this->appendExec('16_4');
}
$this->deletePatch();
@@ -5608,4 +5613,24 @@ class upgradeModel extends model
}
return true;
}
/**
* Update activated date by history action.
*
* @access public
* @return bool
*/
public function updateActivatedDate()
{
$actions = $this->dao->select('objectID, objectType, max(date) as date')->from(TABLE_ACTION)->where('action')->eq('activated')->andWhere('objectType')->in('story, task, bug')->groupBy('objectID, objectType')->fetchAll();
foreach($actions as $action)
{
$table = TABLE_BUG;
if($action->objectType == 'story') $table = TABLE_STORY;
if($action->objectType == 'task') $table = TABLE_TASK;
$this->dao->update($table)->set('activatedDate')->eq($action->date)->where('id')->eq($action->objectID)->exec();
}
return true;
}
}