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

* finish task#1189.

Browse Source
This commit is contained in:
chencongzhi520@gmail.com
2013-04-18 02:01:39 +00:00
parent 243aa368cf
commit 31dcfb2325
3 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+22 -3
View File
@@ -30,11 +30,31 @@ class task extends control
*
* @param int $projectID
* @param int $storyID
* @param int $moduleID
* @param int $taskID
* @access public
* @return void
*/
public function create($projectID = 0, $storyID = 0, $moduleID = 0)
public function create($projectID = 0, $storyID = 0, $moduleID = 0, $taskID = 0)
{
$task = new stdClass();
$task->module = $moduleID;
$task->assignedTo = '';
$task->name = '';
$task->story = $storyID;
$task->type = '';
$task->pri = '';
$task->estimate = '';
$task->desc = '';
$task->estStarted = '';
$task->deadline = '';
$task->mailto = '';
if($taskID > 0)
{
$task = $this->task->getByID($taskID);
$projectID = $task->project;
}
$project = $this->project->getById($projectID);
$taskLink = $this->createLink('project', 'browse', "projectID=$projectID&tab=task");
$storyLink = $this->session->storyList ? $this->session->storyList : $this->createLink('project', 'story', "projectID=$projectID");
@@ -84,11 +104,10 @@ class task extends control
$this->view->title = $title;
$this->view->position = $position;
$this->view->project = $project;
$this->view->task = $task;
$this->view->stories = $stories;
$this->view->storyID = $storyID;
$this->view->members = $members;
$this->view->contactLists = $contactLists;
$this->view->moduleID = $moduleID;
$this->view->moduleOptionMenu = $moduleOptionMenu;
$this->display();
}
module/task/view/create.html.php
+11 -11
View File
@@ -35,17 +35,17 @@
<?php if($project->type != 'sprint'):?>
<tr>
<th class='rowhead'><?php echo $lang->task->module;?></th>
<td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='select-3'");?></span></td>
<td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='select-3'");?></span></td>
</tr>
<?php endif;?>
<tr>
<th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
<td><?php echo html::select('assignedTo[]', $members, '', 'class=select-3');?></td>
<td><?php echo html::select('assignedTo[]', $members, $task->assignedTo, 'class=select-3');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->story;?></th>
<td>
<?php echo html::select('story', $stories, $storyID, 'class=select-1 onchange=setPreview();');?>
<?php echo html::select('story', $stories, $task->story, 'class=select-1 onchange=setPreview();');?>
<a href='' id='preview' class='iframe'><?php echo $lang->preview;?></a>
</td>
</tr>
@@ -53,39 +53,39 @@
<th class='rowhead'><?php echo $lang->task->name;?></th>
<td>
<?php
echo html::input('name', '', "class='text-1'");
echo html::input('name', $task->name, "class='text-1'");
echo html::commonButton($lang->task->copyStoryTitle, 'onclick=copyStoryTitle()');?>
</td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->desc;?></th>
<td><?php echo html::textarea('desc', '', "rows='7' class='area-1'");?></td>
<td><?php echo html::textarea('desc', $task->desc, "rows='7' class='area-1'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->pri;?></th>
<td><?php echo html::select('pri', $lang->task->priList, '', 'class=select-3');?>
<td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=select-3');?>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->estimate;?></th>
<td><?php echo html::input('estimate', '', "class='text-3'") . $lang->task->hour;?></td>
<td><?php echo html::input('estimate', $task->estimate, "class='text-3'") . $lang->task->hour;?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->estStarted;?></th>
<td><?php echo html::input('estStarted', '', "class='text-3 date'");?></td>
<td><?php echo html::input('estStarted', $task->estStarted, "class='text-3 date'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->deadline;?></th>
<td><?php echo html::input('deadline', '', "class='text-3 date'");?></td>
<td><?php echo html::input('deadline', $task->deadline, "class='text-3 date'");?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->type;?></th>
<td><?php echo html::select('type', $lang->task->typeList, '', 'class=select-3 onchange="setOwners(this.value)"');?></td>
<td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=select-3 onchange="setOwners(this.value)"');?></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->mailto;?></th>
<td>
<?php
echo html::input('mailto', '', 'class="text-1"');
echo html::input('mailto', $task->mailto, 'class="text-1"');
if($contactLists) echo html::select('', $contactLists, '', "onchange=\"setMailto('mailto', this.value)\"");
?>
</td>
module/task/view/view.html.php
+2 -1
View File
@@ -36,7 +36,8 @@
common::printDivider();
common::printIcon('task', 'edit', "taskID=$task->id");
common::printCommentIcon('task');
common::printIcon('task', 'delete',"projectID=$task->project&taskID=$task->id", '', 'button', '', 'hiddenwin');
common::printIcon('task', 'create', "productID=0&storyID=0&moduleID=0&taskID=$task->id", '', 'button', 'copy');
common::printIcon('task', 'delete', "projectID=$task->project&taskID=$task->id", '', 'button', '', 'hiddenwin');
common::printDivider();
common::printRPN($browseLink, $preAndNext);