Finish task#3255 禅道中所有列表页面都增加自定义显示字段的功能,cost:12 left:0

2017-10-19 11:17:25 +08:00
parent fe16db7484
commit 19dc3cdae5
23 changed files with 228 additions and 769 deletions
@@ -15,4 +15,4 @@ $config->testtask->editor->block   = array('id' => 'comment', 'tools' => 'simple
 $config->testtask->editor->activate= array('id' => 'comment', 'tools' => 'simpleTools');

 $config->testtask->datatable = new stdclass();
-$config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'actions');
+$config->testtask->datatable->defaultField = array('id', 'pri', 'title', 'type', 'assignedTo', 'lastRunner', 'lastRunDate', 'lastRunResult', 'status', 'bugs', 'results', 'stepNumber','actions');
@@ -37,17 +37,47 @@ var moduleID   = '<?php echo $moduleID;?>';
    $vars         = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
    $datatableId  = $this->moduleName . ucfirst($this->methodName);
    $useDatatable = (isset($this->config->datatable->$datatableId->mode) and $this->config->datatable->$datatableId->mode == 'datatable');
-    $file2Include = $useDatatable ? dirname(__FILE__) . '/datatabledata.html.php' : dirname(__FILE__) . '/casesdata.html.php';

    $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
    $canBatchAssign = common::hasPriv('testtask', 'batchAssign');
    $canBatchRun    = common::hasPriv('testtask', 'batchRun');
    $hasCheckbox    = ($canBatchEdit or $canBatchAssign or $canBatchRun);
-    include $file2Include;
+
+    if($useDatatable) include '../../common/view/datatable.html.php';
+    if(!$useDatatable) include '../../common/view/tablesorter.html.php';
+
+    $this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField;
+    $this->config->testcase->datatable->fieldList['actions']['width'] = '100';
+
+    $setting = $this->datatable->getSetting('testtask');
+    $widths  = $this->datatable->setFixedFieldWidth($setting);
+    $columns = 0;
    ?>
+    <table class='table table-condensed table-hover table-striped tablesorter table-fixed datatable' id='caseList' data-checkable='<?php echo $hasCheckbox?>' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-custom-menu='true' data-checkbox-name='caseIDList[]'>
+      <thead>
+        <tr>
+        <?php
+        foreach($setting as $key => $value)
+        {
+            if($value->show)
+            {
+                $this->datatable->printHead($value, $orderBy, $vars);
+                $columns ++;
+            }
+        }
+        ?>
+        </tr>
+      </thead>
+      <tbody>
+        <?php foreach($runs as $run):?>
+        <tr class='text-center' data-id='<?php echo $run->case?>'>
+          <?php foreach($setting as $key => $value) $this->testtask->printCell($value, $run, $users, $task, $branches);?>
+        </tr>
+        <?php endforeach;?>
+      </tbody>
      <tfoot>
        <tr>
-          <td colspan='13'>
+          <td colspan='<?php echo $columns?>'>
            <?php if($runs):?>
            <div class='table-actions clearfix'>
              <?php if($hasCheckbox) echo html::selectButton();?>
@@ -1,79 +0,0 @@
-<?php
-/**
- * The cases data view file of testtask module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Yidong Wang <yidong@cnezsoft.com>
- * @package     testtask
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-    <?php include '../../common/view/tablesorter.html.php';?>
-    <?php $vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed table-selectable' id='caseList'>
-      <thead>
-        <tr class='colhead'>
-          <th class='w-id {sorter: false}'><nobr><?php common::printOrderLink('id',            $orderBy, $vars, $lang->idAB);?></nobr></th>
-          <th class='w-pri {sorter: false}'>     <?php common::printOrderLink('pri',           $orderBy, $vars, $lang->priAB);?></th>
-          <th class='{sorter: false}'>           <?php common::printOrderLink('title',         $orderBy, $vars, $lang->testcase->title);?></th>
-          <th class='w-type {sorter: false}'>    <?php common::printOrderLink('type',          $orderBy, $vars, $lang->testcase->type);?></th>
-          <th class='w-user {sorter: false}'>    <?php common::printOrderLink('assignedTo',    $orderBy, $vars, $lang->testtask->assignedTo);?></th>
-          <th class='w-user {sorter: false}'>    <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
-          <th class='w-100px {sorter: false}'>   <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
-          <th class='w-80px {sorter: false}'>    <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-          <th class='w-status {sorter: false}'>  <?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='w-30px' title='<?php echo $lang->testcase->bugs?>'> <?php echo $lang->testcase->bugsAB;?></th>
-          <th class='w-30px' title='<?php echo $lang->testcase->results?>'> <?php echo $lang->testcase->resultsAB;?></th>
-          <th class='w-30px' title='<?php echo $lang->testcase->stepNumber?>'> <?php echo $lang->testcase->stepNumberAB;?></th>
-          <th class='w-120px {sorter: false}'><?php echo $lang->actions;?></th>
-        </tr>
-      </thead>
-      <?php
-      $canBatchEdit   = common::hasPriv('testcase', 'batchEdit');
-      $canBatchAssign = common::hasPriv('testtask', 'batchAssign');
-      $canBatchRun    = common::hasPriv('testtask', 'batchRun');
-      ?>
-      <?php if($runs):?>
-      <tbody>
-        <?php foreach($runs as $run):?>
-        <tr class='text-center'>
-          <td class='cell-id'>
-            <?php if($canBatchEdit or $canBatchAssign or $canBatchRun):?>
-            <input type='checkbox' name='caseIDList[]' value='<?php echo $run->case;?>'/> 
-            <?php endif;?>
-            <?php printf('%03d', $run->case);?>
-          </td>
-          <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $run->pri, $run->pri)?>'><?php echo zget($lang->testcase->priList, $run->pri, $run->pri)?></span></td>
-          <td class='text-left nobr'>
-            <?php if($run->branch) echo "<span class='label label-info label-badge'>{$branches[$run->branch]}</span>"?>
-            <?php echo html::a($this->createLink('testcase', 'view', "caseID=$run->case&version=$run->version&from=testtask&taskID=$run->task"), $run->title);?>
-          </td>
-          <td><?php echo $lang->testcase->typeList[$run->type];?></td>
-          <td><?php $assignedTo = $users[$run->assignedTo]; echo substr($assignedTo, strpos($assignedTo, ':') + 1);?></td>
-          <td><?php $lastRunner = $users[$run->lastRunner]; echo substr($lastRunner, strpos($lastRunner, ':') + 1);?></td>
-          <td><?php if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));?></td>
-          <td class='<?php echo $run->lastRunResult;?>'><?php if($run->lastRunResult) echo $lang->testcase->resultList[$run->lastRunResult];?></td>
-          <td class='<?php echo $run->status;?>'><?php echo ($run->version < $run->caseVersion) ? "<span class='warning'>{$lang->testcase->changed}</span>" : $lang->testtask->statusList[$run->status];?></td>
-          <td><?php echo (common::hasPriv('testcase', 'bugs') and $run->bugs) ? html::a($this->createLink('testcase', 'bugs', "runID={$run->id}&caseID={$run->case}"), $run->bugs, '', "class='iframe'") : $run->bugs;?></td>
-          <td><?php echo (common::hasPriv('testtask', 'results') and $run->results) ? html::a($this->createLink('testtask', 'results', "runID={$run->id}&caseID={$run->case}"), $run->results, '', "class='iframe'") : $run->results;?></td>
-          <td><?php echo $run->stepNumber;?></td>
-          <td class='text-center'>
-            <?php
-            common::printIcon('testtask', 'runCase',    "id=$run->id", $run, 'list', '', '', 'runCase iframe', false, "data-width='95%'");
-            common::printIcon('testtask', 'results',    "id=$run->id", $run, 'list', '', '', 'iframe', '', "data-width='90%'");
-
-            if(common::hasPriv('testtask', 'unlinkCase', $run))
-            {
-                $unlinkURL = $this->createLink('testtask', 'unlinkCase', "caseID=$run->id&confirm=yes");
-                echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$lang->testtask->unlinkCase}' class='btn-icon'");
-            }
-
-            common::printIcon('testcase', 'createBug', "product=$productID&branch=$task->branch&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$taskID", $run, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
-            ?>
-          </td>
-        </tr>
-        <?php endforeach;?>
-      </tbody>
-      <?php endif;?>
@@ -1,36 +0,0 @@
-<?php
-/**
- * The datatable data view file of testtask module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Yidong Wang <yidong@cnezsoft.com>
- * @package     testtask
- * @version     $Id$
- * @link        http://www.zentao.net
- */
-?>
-<?php
-include '../../common/view/datatable.html.php';
-$this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField;
-$this->config->testcase->datatable->fieldList['assignedTo']['title']    = 'assignedTo';
-$this->config->testcase->datatable->fieldList['assignedTo']['fixed']    = 'no';
-$this->config->testcase->datatable->fieldList['assignedTo']['width']    = '80';
-$this->config->testcase->datatable->fieldList['assignedTo']['required'] = 'no';
-$this->config->testcase->datatable->fieldList['actions']['width']       = '100';
-
-$setting = $this->datatable->getSetting('testtask');
-$widths  = $this->datatable->setFixedFieldWidth($setting);
-extract($widths);
-?>
-    <table class='table table-condensed table-hover table-striped tablesorter table-fixed datatable' id='caseList' data-checkable='<?php echo $hasCheckbox?>' data-fixed-left-width='<?php echo $leftWidth?>' data-fixed-right-width='<?php echo $rightWidth?>' data-custom-menu='true' data-checkbox-name='caseIDList[]'>
-      <thead>
-        <tr><?php foreach($setting as $key => $value) $this->datatable->printHead($value, $orderBy, $vars);?></tr>
-      </thead>
-      <tbody>
-        <?php foreach($runs as $run):?>
-        <tr class='text-center' data-id='<?php echo $run->case?>'>
-          <?php foreach($setting as $key => $value) $this->testtask->printCell($value, $run, $users, $task, $branches);?>
-        </tr>
-        <?php endforeach;?>
-      </tbody>