This commit is contained in:
areyou123456
2012-05-19 08:35:09 +00:00
parent 56a91caf16
commit cc1deb7520
5 changed files with 7 additions and 11 deletions

View File

@@ -11,6 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<form method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'import2Today');?>' id='todoform'>
<div id='featurebar'>
@@ -22,7 +23,7 @@
echo '<span id="future">' . html::a(inlink('todo', "date=future"), $lang->todo->futureTodos) . '</span>';
echo '<span id="all">' . html::a(inlink('todo', "date=all"), $lang->todo->allDaysTodos) . '</span>';
echo '<span id="before">' . html::a(inlink('todo', "date=before&account={$app->user->account}&status=undone"), $lang->todo->allUndone) . '</span>';
echo "<span id='$date'>" . html::select('date', $dates, $date, 'onchange=changeDate(this.value)') . '</span>';
echo "<span id='$date'>" . html::input('date', $date,"class='select-2 date'") . '</span>';
?>
<script>$('#<?php echo $type;?>').addClass('active')</script>
</div>
@@ -48,7 +49,6 @@
<th class='w-140px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody>
<?php foreach($todos as $todo):?>
<tr class='a-center'>

View File

@@ -34,7 +34,6 @@ var moduleID = '<?php echo $moduleID;?>';
</div>
</div>
<div id='querybox' class='<?php if($browseType != 'bysearch') echo 'hidden';?>'><?php echo $searchForm;?></div>
<table class='cont-lt1'>
<tr valign='top'>
<td class='side <?php echo $treeClass;?>'>
@@ -49,12 +48,12 @@ var moduleID = '<?php echo $moduleID;?>';
<td class='divider <?php echo $treeClass;?>'></td>
<td>
<?php $vars = "productID=$productID&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<table class='table-1 colored tablesorter datatable fixed'>
<table class='table-1 colored tablesorter datatable'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p20'><?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<th><?php common::printOrderLink('title', $orderBy, $vars, $lang->testcase->title);?></th>
<?php if($browseType == 'needconfirm'):?>
<th><?php common::printOrderLink('story', $orderBy, $vars, $lang->testcase->story);?></th>
<th class='w-50px'><?php echo $lang->actions;?></th>
@@ -62,7 +61,7 @@ var moduleID = '<?php echo $moduleID;?>';
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
<th class='w-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunner', $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
<th><?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-120px'> <?php common::printOrderLink('lastRunDate', $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
<th class='w-80px'> <?php common::printOrderLink('lastRunResult',$orderBy, $vars, $lang->testtask->lastRunResult);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-220px {sorter:false}'><?php echo $lang->actions;?></th>
@@ -98,6 +97,7 @@ var moduleID = '<?php echo $moduleID;?>';
</tr>
<?php endforeach;?>
</thead>
</tbody>
<tfoot><tr><td colspan='10' class='f-left'><?php $pager->show();?></td></tr></tfoot>
</table>
</td>

View File

@@ -207,7 +207,6 @@ class testtask extends control
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Set the browseType and moduleID. */
$browseType = strtolower($browseType);
$moduleID = ($browseType == 'bymodule') ? (int)$param : 0;
@@ -217,7 +216,6 @@ class testtask extends control
if(!$task) die(js::error($this->lang->notFound) . js::locate('back'));
$productID = $task->product;
$this->testtask->setMenu($this->products, $productID);
if($browseType == 'bymodule' or $browseType == 'all')
{
$modules = '';
@@ -232,7 +230,6 @@ class testtask extends control
$this->view->header['title'] = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->cases;
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->cases;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->task = $task;

View File

@@ -24,7 +24,6 @@ $lang->testtask->results = "结果";
$lang->testtask->createBug = "提Bug";
$lang->testtask->assign = '指派';
$lang->testtask->cases = '用例';
$lang->testtask->common = '测试任务';
$lang->testtask->id = '任务编号';
$lang->testtask->product = '所属产品';

View File

@@ -89,7 +89,7 @@ var moduleID = '<?php echo $moduleID;?>';
<td colspan='10'>
<?php if($canBatchAssign):?>
<div class='f-left'>
<?php
<?php
echo html::selectAll() . html::selectReverse();
echo html::select('assignedTo', $users) . html::submitButton($lang->testtask->assign);
?>