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

Merge remote-tracking branch 'origin/sprint/168_chaideqing_44857' into sprint/168_xuan_notifications

Browse Source
This commit is contained in:
Lwrless
2021-12-01 10:17:48 +08:00
parent 6f6266c448 74f7a95902
commit 4aad07f95f
13 changed files with 243 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -164,7 +164,7 @@ class bug extends control
/* Load pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
if($this->app->getViewType() == 'mhtml' || $this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Get executios. */
module/bug/css/x.browse.css
+13
View File
@@ -0,0 +1,13 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {width: 700px; margin-bottom: 0px !important;}
#main {min-width: 100%;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed; width: 100%; bottom: 0;}
module/bug/view/browse.html.php
+36
View File
@@ -186,6 +186,13 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<?php endif;?>
</div>
<?php endif;?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo $this->product->getByID($productID)->name ?>
</strong>
</div>
<?php endif;?>
<div id="mainContent" class="main-row fade">
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -218,7 +225,11 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
$datatableId = $this->moduleName . ucfirst($this->methodName);
$useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<form class='main-table table-bug' method='post' id='bugForm'>
<?php else:?>
<form class='main-table table-bug' method='post' id='bugForm' <?php if(!$useDatatable) echo "data-ride='table'";?>>
<?php endif;?>
<div class="table-header fixed-right">
<nav class="btn-toolbar pull-right"></nav>
</div>
@@ -246,6 +257,20 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
<table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='bugList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
{
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
$this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
$columns ++;
}
}
?>
<?php else:?>
<?php
foreach($setting as $value)
{
@@ -259,12 +284,23 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
}
}
?>
<?php endif;?>
</tr>
</thead>
<tbody>
<?php foreach($bugs as $bug):?>
<tr data-id='<?php echo $bug->id?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status'){
$this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');
}
}?>
<?php else:?>
<?php foreach($setting as $value) $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?>
<?php endif;?>
</tr>
<?php endforeach;?>
</tbody>
module/execution/control.php
+3 -1
View File
@@ -206,7 +206,7 @@ class execution extends control
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
if($this->app->getViewType() == 'mhtml' || $this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Get tasks. */
@@ -734,6 +734,7 @@ class execution extends control
/* Load pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
$stories = $this->story->getExecutionStories($executionID, 0, 0, $sort, $type, $param, 'story', '', $pager);
@@ -878,6 +879,7 @@ class execution extends control
/* Load pager and get bugs, user. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
$sort = $this->loadModel('common')->appendOrder($orderBy);
$bugs = $this->bug->getExecutionBugs($executionID, $productID, $build, $type, $param, $sort, '', $pager);
module/execution/css/x.bug.css
+14
View File
@@ -0,0 +1,14 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {width: 700px; margin-bottom: 0px !important;}
#main {min-width: 100%;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed; width: 100%; bottom: 0;}
.c-status {width: 70px;}
module/execution/css/x.story.css
+22
View File
@@ -0,0 +1,22 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.c-sort, .c-category, .c-user, .c-estimate, .c-stage, .c-count, .c-actions-7, .c-actions {display: none;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {width: 700px; margin-bottom: 0px !important;}
#main {min-width: 100%;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.main-col .table-responsive {height: 420px; margin-bottom: 0px;}
#storyList > thead > tr > .c-status {display: table-cell !important;}
#storyList > thead > tr > .c-pri {display: table-cell !important;}
#storyList > tbody > tr > .c-status {display: table-cell !important;}
#storyList > tbody > tr > .c-pri {display: table-cell !important;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
module/execution/css/x.task.css
+16
View File
@@ -0,0 +1,16 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {width: 700px; margin-bottom: 0px !important;}
#main {min-width: 100%;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
module/execution/view/bug.html.php
+32
View File
@@ -29,6 +29,13 @@
<?php if(common::canModify('execution', $execution)) common::printLink('bug', 'create', "productID=$productID&branch=$branchID&extras=executionID=$execution->id", "<i class='icon icon-plus'></i> " . $lang->bug->create, '', "class='btn btn-primary'");?>
</div>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo $this->execution->getByID($execution->id)->name ?>
</strong>
</div>
<?php endif;?>
<div id="mainContent">
<div class="cell <?php if($type == 'bysearch') echo 'show';?>" id="queryBox" data-module='executionBug'></div>
<?php if(empty($bugs)):?>
@@ -41,12 +48,24 @@
</p>
</div>
<?php else:?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<form class='main-table' method='post' id='executionBugForm'>
<?php else:?>
<form class='main-table' method='post' id='executionBugForm' data-ride="table">
<?php endif;?>
<table class='table has-sort-head' id='bugList'>
<?php $canBatchAssignTo = common::hasPriv('bug', 'batchAssignTo');?>
<?php $vars = "executionID={$execution->id}&productID={$productID}&orderBy=%s&build=$buildID&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<th class='c-id'>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th class='c-pri'><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th><?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='c-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->bug->statusAB);?></th>
<?php else:?>
<th class='c-id'>
<?php if($canBatchAssignTo):?>
<div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -64,6 +83,7 @@
<th class='c-user'><?php common::printOrderLink('resolvedBy', $orderBy, $vars, $lang->bug->resolvedBy);?></th>
<th class='c-resolution'><?php common::printOrderLink('resolution', $orderBy, $vars, $lang->bug->resolutionAB);?></th>
<th class='c-actions-5'><?php echo $lang->actions;?></th>
<?php endif;?>
</tr>
</thead>
<?php
@@ -85,6 +105,17 @@
$viewLink = helper::createLink('bug', 'view', "bugID=$bug->id");
?>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php $status = $this->processStatus('bug', $bug);?>
<td class='cell-id'>
<?php printf('%03d', $bug->id);?>
</td>
<td><span class='label-pri <?php echo 'label-pri-' . $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
<td class='text-left' title="<?php echo $bug->title?>"><?php echo html::a($viewLink, $bug->title, null, "style='color: $bug->color' data-app={$this->app->tab}");?></td>
<td class='c-status' title='<?php echo $status;?>'>
<span class='status-bug status-<?php echo $bug->status;?>'><?php echo $status;?></span>
</td>
<?php else:?>
<td class='cell-id'>
<?php if($canBatchAssignTo):?>
<?php echo html::checkbox('bugIDList', array($bug->id => ''), '', $arrtibute) . html::a($viewLink, sprintf('%03d', $bug->id), '', "data-app={$this->app->tab}");?>
@@ -119,6 +150,7 @@
}
?>
</td>
<?php endif;?>
</tr>
<?php endforeach;?>
</tbody>
module/execution/view/story.html.php
+7
View File
@@ -137,6 +137,13 @@
</div>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo $this->execution->getByID($execution->id)->name ?>
</strong>
</div>
<?php endif;?>
<div id="mainContent" class="main-row fade">
<div class='side-col' id='sidebar'>
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
module/execution/view/task.html.php
+40
View File
@@ -178,6 +178,13 @@ body {margin-bottom: 25px;}
<?php endif;?>
</div>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo $this->execution->getByID($executionID)->name ?>
</strong>
</div>
<?php endif;?>
<div id="mainContent" class="main-row fade">
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -236,6 +243,20 @@ body {margin-bottom: 25px;}
<table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='taskList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
{
if($field->show)
{
$this->datatable->printHead($field, $orderBy, $vars, $canBatchAction);
$columns++;
}
}
}?>
<?php else:?>
<?php
foreach($customFields as $field)
{
@@ -246,12 +267,22 @@ body {margin-bottom: 25px;}
}
}
?>
<?php endif;?>
</tr>
</thead>
<tbody>
<?php foreach($tasks as $task):?>
<tr data-id='<?php echo $task->id;?>' data-status='<?php echo $task->status?>' data-estimate='<?php echo $task->estimate?>' data-consumed='<?php echo $task->consumed?>' data-left='<?php echo $task->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
<?php endif;?>
</tr>
<?php if(!empty($task->children)):?>
<?php $i = 0;?>
@@ -259,7 +290,16 @@ body {margin-bottom: 25px;}
<?php $class = $i == 0 ? ' table-child-top' : '';?>
<?php $class .= ($i + 1 == count($task->children)) ? ' table-child-bottom' : '';?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>' data-consumed='<?php echo $child->consumed?>' data-left='<?php echo $child->left?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($customFields as $field)
{
if($field->id == 'name' || $field->id == 'id' || $field->id == 'pri' || $field->id == 'status')
$this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);
}?>
<?php else:?>
<?php foreach($customFields as $field) $this->task->printCell($field, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table', true);?>
<?php endif;?>
</tr>
<?php $i ++;?>
<?php endforeach;?>
module/product/control.php
+1
View File
@@ -207,6 +207,7 @@ class product extends control
/* Load pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'xhtml') $recPerPage = 10;
$pager = new pager($recTotal, $recPerPage, $pageID);
$product = $this->product->getById($productID);
module/product/css/x.browse.css
+16
View File
@@ -0,0 +1,16 @@
#mainMenu {display: none;}
#sidebar {display: none;}
.table-footer>.table-statistic {display: none;}
.checkbox-primary {display: none !important;}
.dropdown {display: none;}
#xx-title {background-color: #F2F2F2; padding-left: 15px; line-height: 40px;}
body {width: 700px; margin-bottom: 0px !important;}
#main {min-width: 100%;}
#main > .container {width: 100% !important;}
#mainContent > .main-col {margin-top: 0px;}
.pager > li > .pager-size-menu {display: none;}
.table-footer > .table-actions {display: none;}
.table-footer{position: fixed !important; width: 100% !important; bottom: 0; z-index: -10 !important; background:none !important;}
.table-footer .pager:before {display: none !important;}
.table-footer .pager {background-color: #fff !important;}
.table-footer .pager li *{color: #838a9d !important;}
module/product/view/browse.html.php
+42
View File
@@ -231,6 +231,13 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
</div>
<?php endif;?>
</div>
<?php if($this->app->getViewType() == 'xhtml'):?>
<div id="xx-title">
<strong>
<?php echo $this->product->getByID($productID)->name ?>
</strong>
</div>
<?php endif;?>
<div id="mainContent" class="main-row fade">
<div class="side-col" id="sidebar">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
@@ -294,6 +301,22 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='storyList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
<thead>
<tr>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $key => $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
{
if($storyType == 'requirement' and (in_array($value->id, array('plan', 'stage')))) $value->show = false;
if($value->show)
{
$this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
$columns ++;
}
}
}?>
<?php else:?>
<?php
foreach($setting as $key => $value)
{
@@ -306,13 +329,23 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
}
}
?>
<?php endif;?>
</tr>
</thead>
<tbody>
<?php foreach($stories as $story):?>
<tr data-id='<?php echo $story->id?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0);?>'>
<?php $story->from = $from;?>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $key => $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
$this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');
}?>
<?php else:?>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $story, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table');?>
<?php endif;?>
</tr>
<?php if(!empty($story->children)):?>
<?php $i = 0;?>
@@ -321,7 +354,16 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<?php $class = $i == 0 ? ' table-child-top' : '';?>
<?php $class .= ($i + 1 == count($story->children)) ? ' table-child-bottom' : '';?>
<tr class='table-children<?php echo $class;?> parent-<?php echo $story->id;?>' data-id='<?php echo $child->id?>' data-status='<?php echo $child->status?>' data-estimate='<?php echo $child->estimate?>'>
<?php if($this->app->getViewType() == 'xhtml'):?>
<?php
foreach($setting as $key => $value)
{
if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status')
$this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);
}?>
<?php else:?>
<?php foreach($setting as $key => $value) $this->story->printCell($value, $child, $users, $branches, $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', $storyType);?>
<?php endif;?>
</tr>
<?php $i ++;?>
<?php endforeach;?>