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

+ add the feature of order by.

Browse Source
This commit is contained in:
wangchunsheng
2009-11-17 09:51:38 +00:00
parent 0eccb649d0
commit 28ca53f166
2 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
trunk/module/bug/control.php
View File

@@ -49,10 +49,11 @@ class bug extends control
/* 浏览一个产品下面的bug。*/
public function browse($productID = 0, $type = 'byModule', $param = 0, $orderBy = 'id|desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$type = strtolower($type);
$this->session->set('bugList', $this->app->getURI(true));
$productID = common::saveProductState($productID, key($this->products));
$currentModuleID = ($type == 'byModule') ? (int)$param : 0;
$currentModuleID = ($type == 'bymodule') ? (int)$param : 0;
if($currentModuleID == 0)
{
$currentModuleName = $this->lang->bug->allBugs;
@@ -63,13 +64,39 @@ class bug extends control
$currentModuleName = sprintf($this->lang->bug->moduleBugs, $currentModule->name);
}
if($type == "byModule")
$this->app->loadClass('pager', $static = true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
$bugs = array();
if($type == "bymodule")
{
$this->app->loadClass('pager', $static = true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
$childModuleIds = $this->tree->getAllChildId($currentModuleID);
$bugs = $this->bug->getModuleBugs($productID, $childModuleIds, $orderBy, $pager);
}
elseif($type == 'assigntome')
{
$bugs = $this->dao->findByAssignedTo($this->app->user->account)->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
elseif($type == 'openedbyme')
{
$bugs = $this->dao->findByOpenedBy($this->app->user->account)->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
elseif($type == 'resolvedbyme')
{
$bugs = $this->dao->findByResolvedBy($this->app->user->account)->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
elseif($type == 'assigntonull')
{
$bugs = $this->dao->findByAssignedTo('')->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
elseif($type == 'longlifebugs')
{
$bugs = $this->dao->findByLastEditedDate("<", date('Y-m-d', strtotime('-7 days')))->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
elseif($type == 'postponedbugs')
{
$bugs = $this->dao->findByResolution('postponed')->from(TABLE_BUG)->orderBy($orderBy)->page($pager)->fetchAll();
}
$users = $this->user->getPairs($this->app->company->id, 'noletter');
@@ -85,7 +112,11 @@ class bug extends control
$this->assign('type', $type);
$this->assign('bugs', $bugs);
$this->assign('users', $users);
$this->assign('recTotal', $pager->recTotal);
$this->assign('recPerPage', $pager->recPerPage);
$this->assign('pager', $pager->get());
$this->assign('param', $param);
$this->assign('orderBy', $orderBy);
$this->assign('currentModuleID', $currentModuleID);
$this->assign('currentModuleName', $currentModuleName);

49
trunk/module/bug/view/browse.html.php
View File

@@ -55,33 +55,52 @@ function selectProduct(productID)
<ul>
<?php
echo "<li><nobr>$productName</nobr></li>";
echo "<li id='byModuleTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=byModule&param=$currentModuleID"), $currentModuleName) . "</nobr></li>";
//echo "<li id='assignToMeTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=assignToMe"), $lang->bug->assignToMe) . "</nobr></li>";
//echo "<li id='openedByMeTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=openedByMe"), $lang->bug->openedByMe) . "</nobr></li>";
//echo "<li id='resolvedByMeTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=resolvedByMe"), $lang->bug->resolvedByMe) . "</nobr></li>";
//echo "<li id='assignToNullTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=assignToNull"), $lang->bug->assignToNull) . "</nobr></li>";
//echo "<li id='longLifeBugsTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=longLifeBugs"), $lang->bug->longLifeBugs) . "</nobr></li>";
//echo "<li id='postponedBugsTab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=postponedBugs"), $lang->bug->postponedBugs) . "</nobr></li>";
echo "<li id='bymoduletab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=byModule&param=$currentModuleID"), $currentModuleName) . "</nobr></li>";
echo "<li id='assigntometab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=assignToMe&param=0"), $lang->bug->assignToMe) . "</nobr></li>";
echo "<li id='openedbymetab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=openedByMe&param=0"), $lang->bug->openedByMe) . "</nobr></li>";
echo "<li id='resolvedbymetab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=resolvedByMe&param=0"), $lang->bug->resolvedByMe) . "</nobr></li>";
echo "<li id='assigntonulltab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=assignToNull&param=0"), $lang->bug->assignToNull) . "</nobr></li>";
echo "<li id='longlifebugstab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=longLifeBugs&param=0"), $lang->bug->longLifeBugs) . "</nobr></li>";
echo "<li id='postponedbugstab'><nobr>" . html::a($this->createLink('bug', 'browse', "productid=$productID&type=postponedBugs&param=0"), $lang->bug->postponedBugs) . "</nobr></li>";
echo <<<EOT
<script language="Javascript">
$("#{$type}Tab").addClass('active');
$("#{$type}tab").addClass('active');
</script>
EOT;
?>
</ul>
<?php if(common::hasPriv('bug', 'create')) echo '<div>' . html::a($this->createLink('bug', 'create', "type=product&productID=$productID&moduleID=$currentModuleID"), $lang->bug->create) . '</div>';?>
</div>
<?php
$app->global->vars = "productID=$productID&type=$type&param=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage";
$app->global->orderBy = $orderBy;
function printOrderLink($fieldName)
{
global $app, $lang;
if(strpos($app->global->orderBy, $fieldName) !== false)
{
if(stripos($app->global->orderBy, 'desc') !== false) $orderBy = str_replace('desc', 'asc', $app->global->orderBy);
if(stripos($app->global->orderBy, 'asc') !== false) $orderBy = str_replace('asc', 'desc', $app->global->orderBy);
}
else
{
$orderBy = $fieldName . '|' . 'asc';
}
$link = helper::createLink('bug', 'browse', sprintf($app->global->vars, $orderBy));
echo html::a($link, $lang->bug->$fieldName);
}
?>
<table class='table-1'>
<thead>
<tr class='colhead'>
<th><?php echo $lang->bug->id;?></th>
<th><?php echo $lang->bug->severity;?></th>
<th><?php echo $lang->bug->title;?></th>
<th><?php echo $lang->bug->openedBy;?></th>
<th><?php echo $lang->bug->assignedTo;?></th>
<th><?php echo $lang->bug->resolvedBy;?></th>
<th><?php echo $lang->bug->resolution;?></th>
<th><?php printOrderLink('id');?></th>
<th><?php printOrderLink('severity');?></th>
<th><?php printOrderLink('title');?></th>
<th><?php printOrderLink('openedBy');?></th>
<th><?php printOrderLink('assignedTo');?></th>
<th><?php printOrderLink('resolvedBy');?></th>
<th><?php printOrderLink('resolution');?></th>
</tr>
</thead>
<tbody>