diff --git a/db/update9.7.sql b/db/update9.7.sql index db02057a12..0757cd8f41 100644 --- a/db/update9.7.sql +++ b/db/update9.7.sql @@ -1,6 +1,15 @@ ALTER TABLE `zt_story` CHANGE `stage` `stage` ENUM('','wait','planned','projected','developing','developed','testing','tested','verified','released','closed') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'wait'; ALTER TABLE `zt_todo` ADD `config` varchar(255) NOT NULL; ALTER TABLE `zt_todo` ADD `cycle` tinyint unsigned NOT NULL DEFAULT '0' AFTER `type`; +ALTER TABLE `zt_todo` ADD `assignedTo` VARCHAR(30) NOT NULL DEFAULT '' AFTER `config`; +ALTER TABLE `zt_todo` ADD `assignedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `assignedTo`; +ALTER TABLE `zt_todo` ADD `assignedDate` DATETIME NOT NULL AFTER `assignedBy`; +ALTER TABLE `zt_todo` ADD `finishedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `assignedDate`; +ALTER TABLE `zt_todo` ADD `finishedDate` DATETIME NOT NULL AFTER `finishedBy`; +ALTER TABLE `zt_todo` ADD `closedBy` VARCHAR(30) NOT NULL DEFAULT '' AFTER `finishedDate`; +ALTER TABLE `zt_todo` ADD `closedDate` DATETIME NOT NULL AFTER `closedBy`; +ALTER TABLE `zt_todo` CHANGE `status` `status` ENUM('wait','doing','done','closed') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'wait'; + INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); diff --git a/db/zentao.sql b/db/zentao.sql index ee0f1ec303..a3a98f5372 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -742,21 +742,28 @@ CREATE TABLE IF NOT EXISTS `zt_testtask` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_todo`; CREATE TABLE IF NOT EXISTS `zt_todo` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, + `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, `account` char(30) NOT NULL, `date` date NOT NULL, `begin` smallint(4) unsigned zerofill NOT NULL, `end` smallint(4) unsigned zerofill NOT NULL, `type` char(10) NOT NULL, `cycle` tinyint(3) unsigned NOT NULL DEFAULT '0', - `idvalue` mediumint(8) unsigned NOT NULL default '0', + `idvalue` mediumint(8) unsigned NOT NULL DEFAULT '0', `pri` tinyint(3) unsigned NOT NULL, `name` char(150) NOT NULL, `desc` text NOT NULL, - `status` enum('wait','doing','done') NOT NULL DEFAULT 'wait', + `status` enum('wait','doing','done','closed') NOT NULL DEFAULT 'wait', `private` tinyint(1) NOT NULL, `config` varchar(255) NOT NULL, - PRIMARY KEY (`id`), + `assignedTo` varchar(30) NOT NULL DEFAULT '', + `assignedBy` varchar(30) NOT NULL DEFAULT '', + `assignedDate` datetime NOT NULL, + `finishedBy` varchar(30) NOT NULL DEFAULT '', + `finishedDate` datetime NOT NULL, + `closedBy` varchar(30) NOT NULL DEFAULT '', + `closedDate` datetime NOT NULL, + PRIMARY KEY (`id`), KEY `todo` (`account`,`date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- DROP TABLE IF EXISTS `zt_user`; @@ -789,7 +796,7 @@ CREATE TABLE IF NOT EXISTS `zt_user` ( `fails` tinyint(5) NOT NULL default '0', `locked` datetime NOT NULL default '0000-00-00 00:00:00', `ranzhi` char(30) NOT NULL default '', - `score` INT(12) NOT NULL DEFAULT '0', + `score` INT(11) NOT NULL DEFAULT '0', `scoreLevel` INT(11) NOT NULL DEFAULT '0', `deleted` enum('0','1') NOT NULL default '0', PRIMARY KEY (`id`), diff --git a/module/my/control.php b/module/my/control.php index 64edbca388..5eff4c7b4b 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -108,6 +108,9 @@ class my extends control $this->view->account = $this->app->user->account; $this->view->orderBy = $orderBy == 'date_desc,status,begin,id_desc' ? '' : $orderBy; $this->view->pager = $pager; + $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); + $this->view->time = date::now(); + $this->view->members = $this->loadModel('user')->getPairs(); $this->view->importFuture = ($type != 'today'); $this->display(); diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index 4c593ec68b..0c8a7e3727 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -15,7 +15,7 @@ todo->confirmDelete)?>
+
" . $lang->todo->export, '', "class='btn export'") ?> " . $lang->todo->batchCreate, '', "class='btn'") ?> @@ -57,7 +57,7 @@ todo->beginAB);?> todo->endAB);?> todo->status);?> - actions;?> + actions;?> @@ -77,8 +77,11 @@ end;?> todo->statusList[$todo->status];?> - id", $todo, 'list', 'ok-sign', 'hiddenwin'); + status != 'done') echo html::a(helper::createLink('todo', 'assignto', "todoID=$todo->id"), '', '', "data-toggle='assigntoModal' class='btn-icon'"); + if($todo->status == 'done') common::printIcon('todo', 'activate', "id=$todo->id", $todo, 'list', 'magic', 'hiddenwin'); + if($todo->status != 'done') common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'list', 'ok-sign', 'hiddenwin'); + if($todo->status == 'done') common::printIcon('todo', 'close', "id=$todo->id", $todo, 'list', 'off', 'hiddenwin'); common::printIcon('todo', 'edit', "id=$todo->id", '', 'list', 'pencil', '', 'iframe', true); if(common::hasPriv('todo', 'delete')) @@ -97,7 +100,7 @@
- + diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 50b935fa13..7aa2f8a765 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -110,13 +110,13 @@ lang->task->children;?> - - - - - - - + + + + + + + @@ -167,11 +167,11 @@
task->legendBasic;?> -
task->id;?> task->lblPri;?> task->name;?>task->deadline;?> task->assignedTo;?> task->status;?> task->consumedAB . $lang->task->lblHour;?> task->id;?> task->lblPri;?> task->name;?>task->deadline;?> task->assignedTo;?> task->status;?>task->consumedAB . $lang->task->lblHour;?> task->leftAB . $lang->task->lblHour;?> actions;?>
+
- + - + - + @@ -272,7 +272,7 @@
task->legendEffort;?> -
task->project;?> project", $project->name)) echo $project->name;?>
task->module;?>
task->story;?> - storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle, '', "class='iframe' data-width='80%'", true, true)) echo $task->storyTitle; if($task->needConfirm) { @@ -222,7 +222,7 @@ fromBug):?>
task->fromBug;?>createLink('bug', 'view', "bugID=$task->fromBug"), "#$task->fromBug " . $fromBug->title, '_blank');?>createLink('bug', 'view', "bugID=$task->fromBug"), "#$task->fromBug " . $fromBug->title, '_blank');?>
+
@@ -280,7 +280,7 @@ - + - + - + - + @@ -306,7 +306,7 @@
task->legendLife;?> -
task->estStarted;?> estStarted;?>
task->realStarted;?> realStarted; ?>
task->deadline;?> @@ -289,15 +289,15 @@ if(isset($task->delay)) printf($lang->task->delayWarning, $task->delay); ?>
task->estimate;?> estimate . $lang->workingHour;?>
task->consumed;?> consumed, 2) . $lang->workingHour;?>
task->left;?> left . $lang->workingHour;?>
+
diff --git a/module/todo/control.php b/module/todo/control.php index 65b888a473..cbcf79e152 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -13,7 +13,7 @@ class todo extends control { /** * Construct function, load model of task, bug, my. - * + * * @access public * @return void */ @@ -28,9 +28,9 @@ class todo extends control /** * Create a todo. - * - * @param string|date $date - * @param string $account + * + * @param string|date $date + * @param string $account * @access public * @return void */ @@ -46,11 +46,11 @@ class todo extends control $date = str_replace('-', '', $this->post->date); if($date == '') { - $date = 'future'; + $date = 'future'; } elseif($date == date('Ymd')) { - $date = 'today'; + $date = 'today'; } if(!empty($_POST['idvalue'])) $this->send(array('result' => 'success')); @@ -64,14 +64,14 @@ class todo extends control $this->view->date = date("Y-m-d", strtotime($date)); $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); - $this->display(); + $this->display(); } /** * Batch create todo - * - * @param string $date - * @param string $account + * + * @param string $date + * @param string $account * @access public * @return void */ @@ -87,11 +87,11 @@ class todo extends control $date = str_replace('-', '', $this->post->date); if($date == '') { - $date = 'future'; + $date = 'future'; } else if($date == date('Ymd')) { - $date= 'today'; + $date= 'today'; } die(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent')); } @@ -114,8 +114,8 @@ class todo extends control /** * Edit a todo. - * - * @param int $todoID + * + * @param int $todoID * @access public * @return void */ @@ -137,7 +137,7 @@ class todo extends control /* Judge a private todo or not, If private, die. */ $todo = $this->todo->getById($todoID); if($todo->private and $this->app->user->account != $todo->account) die('private'); - + $todo->date = date("Y-m-d", strtotime($todo->date)); $this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->edit; $this->view->position[] = $this->lang->todo->common; @@ -149,11 +149,11 @@ class todo extends control /** * Batch edit todo. - * + * * @param string $from example:myTodo, todoBatchEdit. - * @param string $type - * @param string $account - * @param string $status + * @param string $type + * @param string $account + * @param string $status * @access public * @return void */ @@ -174,14 +174,14 @@ class todo extends control if($this->post->todoIDList) $todoIDList = $this->post->todoIDList; /* Initialize todos whose need to edited. */ - foreach($allTodos as $todo) + foreach($allTodos as $todo) { if(in_array($todo->id, $todoIDList)) { $editedTodos[$todo->id] = $todo; } } - foreach($editedTodos as $todo) + foreach($editedTodos as $todo) { if($todo->type == 'story') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_STORY)->fetch('title'); if($todo->type == 'task') $todo->name = $this->dao->findById($todo->idvalue)->from(TABLE_TASK)->fetch('name'); @@ -233,10 +233,61 @@ class todo extends control } /** - * View a todo. - * - * @param int $todoID - * @param string $from my|company + * Activated todo. + * + * @param $todoID + * @access public + * @return void + */ + public function activate($todoID) + { + $todo = $this->todo->getById($todoID); + if($todo->status == 'done') $this->todo->activate($todoID); + if(isonlybody()) die(js::reload('parent.parent')); + die(js::reload('parent')); + } + + /** + * Closed todo. + * + * @param $todoID + * + * @access public + * @return void + */ + public function close($todoID) + { + $todo = $this->todo->getById($todoID); + if($todo->status == 'done') $this->todo->close($todoID); + if(isonlybody()) die(js::reload('parent.parent')); + die(js::reload('parent')); + } + + /** + * Assign. + * + * @param $todoID + * + * @access public + * @return void + */ + public function assignTo($todoID) + { + if(!empty($_POST)) + { + if(empty($_POST['assignedTo'])) die(js::error($this->lang->todo->noAssignedTo)); + $this->todo->assignTo($todoID); + if(dao::isError()) die(js::error(dao::getError())); + die(js::reload('parent')); + } + } + + /** + * View a todo. + * + * @param int $todoID + * @param string $from my|company + * * @access public * @return void */ @@ -288,8 +339,8 @@ class todo extends control /** * Delete a todo. - * - * @param int $todoID + * + * @param int $todoID * @param string $confirm yes|no * @access public * @return void @@ -327,8 +378,8 @@ class todo extends control /** * Finish a todo. - * - * @param int $todoID + * + * @param int $todoID * @access public * @return void */ @@ -349,7 +400,7 @@ class todo extends control /** * Batch finish todos. - * + * * @access public * @return void */ @@ -357,7 +408,7 @@ class todo extends control { if(!empty($_POST['todoIDList'])) { - foreach($_POST['todoIDList'] as $todoID) + foreach($_POST['todoIDList'] as $todoID) { $todo = $this->todo->getById($todoID); if($todo->status != 'done') $this->todo->finish($todoID); @@ -368,7 +419,7 @@ class todo extends control /** * Import selected todoes to today. - * + * * @access public * @return void */ @@ -381,10 +432,10 @@ class todo extends control } /** - * Get data to export - * - * @param string $productID - * @param string $orderBy + * Get data to export + * + * @param string $productID + * @param string $orderBy * @access public * @return void */ @@ -446,8 +497,8 @@ class todo extends control /** * AJAX: get actions of a todo. for web app. - * - * @param int $todoID + * + * @param int $todoID * @access public * @return void */ @@ -459,7 +510,7 @@ class todo extends control /** * Create cycle. - * + * * @access public * @return void */ diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php index e179adef6b..99bd2884a4 100644 --- a/module/todo/lang/en.php +++ b/module/todo/lang/en.php @@ -12,8 +12,11 @@ $lang->todo->common = 'Todo'; $lang->todo->index = "Home"; $lang->todo->create = "Create Todo"; +$lang->todo->assignTo = "Assign"; +$lang->todo->activate = "Activate"; $lang->todo->batchCreate = "Batch Create"; $lang->todo->edit = "Edit"; +$lang->todo->close = "Close"; $lang->todo->batchEdit = "Batch Edit"; $lang->todo->view = "Overview"; $lang->todo->finish = "Finish"; @@ -59,9 +62,10 @@ $lang->todo->confirmBug = 'This Todo is related to Bug #%s. Do you want to edi $lang->todo->confirmTask = 'This Todo is related to Task #%s，Do you want to edit it?'; $lang->todo->confirmStory = 'This Todo is related to Story #%s，Do you want to edit it?'; -$lang->todo->statusList['wait'] = 'Wait'; -$lang->todo->statusList['doing'] = 'Doing'; -$lang->todo->statusList['done'] = 'Done'; +$lang->todo->statusList['wait'] = 'Wait'; +$lang->todo->statusList['doing'] = 'Doing'; +$lang->todo->statusList['done'] = 'Done'; +$lang->todo->statusList['closed'] = 'Closed'; //$lang->todo->statusList['cancel'] = 'Cancelled'; //$lang->todo->statusList['postpone'] = 'Delayed'; @@ -86,6 +90,7 @@ $lang->todo->thisIsPrivate = 'This is a private Todo'; $lang->todo->lblDisableDate = 'Set later.'; $lang->todo->lblBeforeDays = "%s early in advance to be done"; $lang->todo->noTodo = 'No this type of Todo.'; +$lang->todo->noAssignedTo = "The AssignedTo user can't be empty."; $lang->todo->periods['today'] = 'Today'; $lang->todo->periods['yesterday'] = 'Yesterday'; diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php index 5202990c6c..0fbda0b2a2 100644 --- a/module/todo/lang/zh-cn.php +++ b/module/todo/lang/zh-cn.php @@ -12,14 +12,17 @@ $lang->todo->common = '待办'; $lang->todo->index = "待办一览"; $lang->todo->create = "新增"; +$lang->todo->assignTo = "指派"; +$lang->todo->activate = "激活"; $lang->todo->batchCreate = "批量添加"; -$lang->todo->edit = "更新待办"; +$lang->todo->edit = "编辑"; +$lang->todo->close = "关闭"; $lang->todo->batchEdit = "批量编辑"; $lang->todo->view = "待办详情"; $lang->todo->finish = "完成"; $lang->todo->batchFinish = "批量完成"; $lang->todo->export = "导出"; -$lang->todo->delete = "删除待办"; +$lang->todo->delete = "删除"; $lang->todo->import2Today = "导入到今天"; $lang->todo->import = "导入"; $lang->todo->legendBasic = "基本信息"; @@ -59,9 +62,10 @@ $lang->todo->confirmBug = '该Todo关联的是Bug #%s，需要修改它吗？' $lang->todo->confirmTask = '该Todo关联的是Task #%s，需要修改它吗？'; $lang->todo->confirmStory = '该Todo关联的是Story #%s，需要修改它吗？'; -$lang->todo->statusList['wait'] = '未开始'; -$lang->todo->statusList['doing'] = '进行中'; -$lang->todo->statusList['done'] = '已完成'; +$lang->todo->statusList['wait'] = '未开始'; +$lang->todo->statusList['doing'] = '进行中'; +$lang->todo->statusList['done'] = '已完成'; +$lang->todo->statusList['closed'] = '已关闭'; //$lang->todo->statusList['cancel'] = '已取消'; //$lang->todo->statusList['postpone'] = '已延期'; @@ -86,6 +90,7 @@ $lang->todo->thisIsPrivate = '这是一条私人事务。:)'; $lang->todo->lblDisableDate = '暂时不设定时间'; $lang->todo->lblBeforeDays = "提前%s天生成待办"; $lang->todo->noTodo = '该类型没有待办事务'; +$lang->todo->noAssignedTo = '被指派人不能为空'; $lang->todo->periods['today'] = '今日'; $lang->todo->periods['yesterday'] = '昨日'; diff --git a/module/todo/model.php b/module/todo/model.php index 080d476e36..1c95418afa 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -15,9 +15,9 @@ class todoModel extends model { /** * Create a todo. - * - * @param date $date - * @param string $account + * + * @param date $date + * @param string $account * @access public * @return void */ @@ -81,7 +81,7 @@ class todoModel extends model /** * Create batch todo - * + * * @access public * @return void */ @@ -116,7 +116,7 @@ class todoModel extends model if($todo->type == 'story') $todo->idvalue = isset($todos->storys[$i + 1]) ? $todos->storys[$i + 1] : 0; $this->dao->insert(TABLE_TODO)->data($todo)->autoCheck()->exec(); - if(dao::isError()) + if(dao::isError()) { echo js::error(dao::getError()); die(js::reload('parent')); @@ -139,8 +139,8 @@ class todoModel extends model /** * update a todo. - * - * @param int $todoID + * + * @param int $todoID * @access public * @return void */ @@ -198,7 +198,7 @@ class todoModel extends model /** * Batch update todos. - * + * * @access public * @return array */ @@ -235,7 +235,7 @@ class todoModel extends model if($oldTodo->type == 'bug' or $oldTodo->type == 'task') $oldTodo->name = ''; $this->dao->update(TABLE_TODO)->data($todo) ->autoCheck() - ->checkIF($todo->type == 'custom', $this->config->todo->edit->requiredFields, 'notempty') + ->checkIF($todo->type == 'custom', $this->config->todo->edit->requiredFields, 'notempty') ->checkIF($todo->type == 'bug', 'idvalue', 'notempty') ->checkIF($todo->type == 'task', 'idvalue', 'notempty') ->where('id')->eq($todoID) @@ -243,7 +243,7 @@ class todoModel extends model if($oldTodo->status != 'done' and $todo->status == 'done') $this->loadModel('action')->create('todo', $todoID, 'finished', '', 'done'); - if(!dao::isError()) + if(!dao::isError()) { $allChanges[$todoID] = common::createChanges($oldTodo, $todo); } @@ -259,23 +259,28 @@ class todoModel extends model /** * Change the status of a todo. - * - * @param string $todoID - * @param string $status + * + * @param string $todoID + * @param string $status * @access public * @return void */ public function finish($todoID) { - $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq((int)$todoID)->exec(); + $this->dao->update(TABLE_TODO) + ->set('status')->eq('done') + ->set('finishedBy')->eq($this->app->user->account) + ->set('finishedDate')->eq(helper::now()) + ->where('id')->eq((int)$todoID) + ->exec(); $this->loadModel('action')->create('todo', $todoID, 'finished', '', 'done'); return; } /** * Get info of a todo. - * - * @param int $todoID + * + * @param int $todoID * @param bool $setImgSize * @access public * @return object|bool @@ -295,11 +300,11 @@ class todoModel extends model /** * Get todo list of a user. - * - * @param date $date - * @param string $account + * + * @param date $date + * @param string $account * @param string $status all|today|thisweek|lastweek|before, or a date. - * @param int $limit + * @param int $limit * @access public * @return void */ @@ -309,12 +314,12 @@ class todoModel extends model $todos = array(); $date = strtolower($date); - if($date == 'today') + if($date == 'today') { $begin = date::today(); $end = $begin; } - elseif($date == 'yesterday') + elseif($date == 'yesterday') { $begin = date::yesterday(); $end = $begin; @@ -370,7 +375,11 @@ class todoModel extends model if($account == '') $account = $this->app->user->account; $stmt = $this->dao->select('*')->from(TABLE_TODO) - ->where('account')->eq($account) + ->where('1') + ->andWhere('account', true)->eq($account) + ->orWhere('assignedTo')->eq($account) + ->orWhere('finishedBy')->eq($account) + ->markRight(1) ->beginIF($begin)->andWhere('date')->ge($begin)->fi() ->beginIF($end)->andWhere('date')->le($end)->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi() @@ -381,7 +390,7 @@ class todoModel extends model ->beginIF($limit > 0)->limit($limit)->fi() ->page($pager) ->query(); - + /* Set session. */ $sql = explode('WHERE', $this->dao->get()); $sql = explode('ORDER', $sql[1]); @@ -409,9 +418,9 @@ class todoModel extends model /** * Judge an action is clickable or not. - * - * @param object $todo - * @param string $action + * + * @param object $todo + * @param string $action * @access public * @return bool */ @@ -429,9 +438,9 @@ class todoModel extends model } /** - * CreateByCycle - * - * @param int $todoList + * CreateByCycle + * + * @param int $todoList * @access public * @return void */ @@ -495,4 +504,55 @@ class todoModel extends model } } } + + /** + * Activate todo. + * + * @param $todoID + * + * @access public + * @return bool + */ + public function activate($todoID) + { + $this->dao->update(TABLE_TODO)->set('status')->eq('wait')->where('id')->eq((int)$todoID)->exec(); + $this->loadModel('action')->create('todo', $todoID, 'activated', '', 'wait'); + return !dao::isError(); + } + + /** + * Closed todo. + * + * @param $todoID + * + * @access public + * @return bool + */ + public function close($todoID) + { + $this->dao->update(TABLE_TODO) + ->set('status')->eq('closed') + ->set('closedBy')->eq($this->app->user->account) + ->set('closedDate')->eq(helper::now()) + ->where('id')->eq((int)$todoID) + ->exec(); + $this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed'); + return !dao::isError(); + } + + public function assignTo($todoID) + { + $todo = fixer::input('post') + ->add('assignedBy', $this->app->user->account) + ->add('assignedDate', helper::now()) + ->setIF(isset($_POST['future']), 'date', '2030-01-01') + ->setIF(isset($_POST['lblDisableDate']), 'begin', '2400') + ->setIF(isset($_POST['lblDisableDate']), 'end', '2400') + ->remove('future,lblDisableDate') + ->get(); + + $this->dao->update(TABLE_TODO)->data($todo)->where('id')->eq((int)$todoID)->exec(); + $this->loadModel('action')->create('todo', $todoID, 'assigned', '', 'assigned'); + return !dao::isError(); + } } diff --git a/module/todo/view/assignto.html.php b/module/todo/view/assignto.html.php new file mode 100755 index 0000000000..fa9710cfd4 --- /dev/null +++ b/module/todo/view/assignto.html.php @@ -0,0 +1,88 @@ + + * @package todo + * @version $Id: create.html.php 2741 2012-04-07 07:24:21 $ + * @link http://www.zentao.net + */ +?> +
task->openedBy;?> openedBy) echo zget($users, $task->openedBy, $task->openedBy) . $lang->at . $task->openedDate;?>
+ + + + + + + + + + + + + + + + +
todo->assignTo;?> + +
todo->date;?> +
+ + todo->periods['future'];?> +
+
todo->beginAndEnd;?> +
+ +
+ 		todo->lblDisableDate;?>
+ +
+
+
+ + + \ No newline at end of file diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 8269a3486f..1b72750642 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -24,7 +24,7 @@
- todo->desc; if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue); if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue); @@ -40,7 +40,7 @@
todo->legendBasic;?> - +
@@ -71,7 +71,7 @@ config = json_decode($todo->config);?>
todo->cycle;?> -
todo->pri;?> todo->priList[$todo->pri];?>
+
@@ -105,6 +105,15 @@
account == $app->user->account) + { + //if($todo->status != 'done') echo html::a($this->createLink('todo', 'assignTo', "todoID=$todo->id"), " " . $lang->todo->assignTo, '', "class='btn showinonlybody'"); + if($todo->status != 'closed') echo html::a($this->createLink('todo', 'edit', "todoID=$todo->id"), " " . $lang->todo->edit, '', "class='btn showinonlybody'"); + if($todo->status == 'done' || $todo->status == 'closed') echo html::a($this->createLink('todo', 'activate', "todoID=$todo->id"), " " . $lang->todo->activate, 'hiddenwin', "class='btn showinonlybody'"); + if($todo->status == 'done') echo html::a($this->createLink('todo', 'close', "todoID=$todo->id"), " " . $lang->todo->close, 'hiddenwin', "class='btn showinonlybody'"); + echo html::a($this->createLink('todo', 'delete', "todoID=$todo->id"), " " . $lang->todo->delete, 'hiddenwin', "class='btn showinonlybody'"); + } + if($this->session->todoList) { $browseLink = $this->session->todoList; @@ -118,7 +127,7 @@ $browseLink = $this->createLink('user', 'todo', "account=$todo->account"); } - if($todo->status != 'done') + if($todo->status != 'done' && $todo->status != 'closed') { echo "
"; echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), " " . $lang->todo->finish, 'hiddenwin', "class='btn showinonlybody btn-success'"); @@ -140,11 +149,6 @@ echo "
"; } - if($todo->account == $app->user->account) - { - common::printIcon('todo', 'edit', "todoID=$todo->id"); - common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin'); - } common::printRPN($browseLink); ?>
todo->beginAndEnd?> config->begin . " ~ " . $todo->config->end;?>