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

* [task#135343,done,1h] get zero cases under the project.

Browse Source
This commit is contained in:
liumengyi
2024-12-30 09:51:11 +08:00
committed by 刘刚
parent 1ae491106d
commit d76d1d8322
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+14 -3
View File
@@ -3193,16 +3193,27 @@ class storyModel extends model
* Get zero case.
*
* @param int $productID
* @param int $projectID
* @param int $executionID
* @param int $branchID
* @param string $orderBy
* @param object $pager
* @access public
* @return array
*/
public function getZeroCase(int $productID, int $branchID = 0, string $orderBy = 'id_desc', object $pager = null): array
public function getZeroCase(int $productID, int $projectID = 0, int $executionID = 0, int $branchID = 0, string $orderBy = 'id_desc', object $pager = null): array
{
$casedStories = $this->dao->select('DISTINCT story')->from(TABLE_CASE)->where('product')->eq($productID)->andWhere('story')->ne(0)->andWhere('deleted')->eq(0)->fetchAll('story');
$allStories = $this->getProductStories($productID, $branchID, '', 'all', 'story', $orderBy, false, array_keys($casedStories), $pager);
$casedStories = $this->dao->select('DISTINCT story')
->from(TABLE_CASE)
->where('product')->eq($productID)
->andWhere('story')->ne(0)
->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
->beginIF($executionID)->andWhere('execution')->eq($executionID)->fi()
->andWhere('deleted')->eq(0)
->fetchAll('story');
if($projectID) $allStories = $this->getExecutionStories($projectID, $productID, $orderBy, '', '', 'story', array_keys($casedStories), $pager);
if($executionID) $allStories = $this->getExecutionStories($executionID, $productID, $orderBy, '', '', 'story', array_keys($casedStories), $pager);
if(!$projectID && !$executionID) $allStories = $this->getProductStories($productID, $branchID, '', 'all', 'story', $orderBy, false, array_keys($casedStories), $pager);
if(!empty($allStories)) $allStories = $this->loadModel('story')->mergeReviewer($allStories);
return $allStories;
}
module/testcase/control.php
+7 -4
View File
@@ -165,14 +165,14 @@ class testcase extends control
* @param int $productID
* @param int $branchID
* @param string $orderBy
* @param int $projectID
* @param int $objectID
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
public function zeroCase(int $productID = 0, int $branchID = 0, string $orderBy = 'id_desc', int $projectID = 0, int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
public function zeroCase(int $productID = 0, int $branchID = 0, string $orderBy = 'id_desc', int $objectID = 0, int $recTotal = 0, int $recPerPage = 20, int $pageID = 1)
{
$this->testcaseZen->checkProducts(); // 如果不存在产品，则跳转到产品创建页面。
@@ -181,13 +181,16 @@ class testcase extends control
$this->session->set('storyList', $this->app->getURI(true) . '#app=' . $this->app->tab, 'product');
$this->session->set('caseList', $this->app->getURI(true), $this->app->tab);
$this->testcaseZen->setMenu((int)$this->session->project, 0, $productID, $branchID);
$projectID = $executionID = 0;
if($this->app->tab == 'project')
{
$projectID = $objectID;
$products = $this->product->getProducts($this->session->project, 'all', '', false);
$productID = $this->product->checkAccess($productID, $products);
$this->config->hasSwitcherMethods[] = 'testcase-zerocase';
$productPairs = $this->loadModel('project')->getMultiLinkedProducts($this->session->project);
$this->view->projectID = $projectID;
$this->view->switcherParams = "projectID={$this->session->project}&productID={$productID}&currentMethod=zerocase";
$this->view->switcherText = zget($productPairs, $productID, $this->lang->product->all);
}
@@ -216,9 +219,9 @@ class testcase extends control
/* Show the variables. */
$this->loadModel('story');
$this->view->title = $this->lang->story->zeroCase;
$this->view->stories = $this->story->getZeroCase($productID, $branchID, $sort, $pager);
$this->view->stories = $this->story->getZeroCase($productID, $projectID, $executionID, $branchID, $sort, $pager);
$this->view->users = $this->user->getPairs('noletter');
$this->view->projectID = $projectID;
$this->view->objectID = $objectID;
$this->view->productID = $productID;
$this->view->branch = $branchID;
$this->view->orderBy = $orderBy;