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

Merge branch 'sprint/master_zhouxudong_58575' into 'master'

Browse Source 
Sprint/master zhouxudong 58575

See merge request easycorp/zentaopms!4162
This commit is contained in:
王怡栋
2022-06-28 01:26:48 +00:00
parent 58f7fb77dd be59d6249b
commit 2a940ec8ce
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+6 -1
View File
@@ -745,6 +745,7 @@ class execution extends control
/* Save session. */
$this->app->session->set('storyList', $this->app->getURI(true), 'execution');
$this->app->session->set('executionStoryList', $this->app->getURI(true), 'execution');
/* Process the order by field. */
if(!$orderBy) $orderBy = $this->cookie->executionStoryOrder ? $this->cookie->executionStoryOrder : 'pri';
@@ -2608,6 +2609,8 @@ class execution extends control
$productPairs = $this->loadModel('product')->getProductPairsByProject($executionID);
if($productPairs) $productID = key($productPairs);
$this->app->session->set('executionStoryList', $this->app->getURI(true), 'execution');
$this->view->title = $this->lang->execution->storyKanban;
$this->view->position[] = html::a($this->createLink('execution', 'story', "executionID=$executionID"), $execution->name);
$this->view->position[] = $this->lang->execution->storyKanban;
@@ -2910,8 +2913,9 @@ class execution extends control
/* Get projects, executions and products. */
$object = $this->project->getByID($objectID, $this->app->tab == 'project' ? 'project' : 'sprint,stage,kanban');
$products = $this->product->getProducts($objectID);
$browseLink = $this->createLink($this->app->tab == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID");
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$browseLink = $this->session->executionStoryList;
if($this->app->tab == 'project') $browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID");
$this->session->set('storyList', $this->app->getURI(true), $this->app->tab); // Save session.
@@ -3034,6 +3038,7 @@ class execution extends control
$this->view->modules = $modules;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->branchGroups = $branchGroups;
$this->view->browseLink = $browseLink;
$this->display();
}
module/execution/view/linkstory.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->linkStory;?></span></span>
</div>
<div class='btn-toolbar pull-right'>
<?php common::printBack($this->createLink($this->app->rawModule, 'story', "objectID=$objectID"), 'btn btn-link');?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">
module/personnel/view/invest.html.php
+2 -2
View File
@@ -21,8 +21,8 @@
<table class="table has-sort-head table-fixed table-bordered text-center">
<thead>
<tr>
<th rowspan='2' class="c-user"> <?php echo $lang->personnel->name;?></th>
<th rowspan='2' class="c-role"><?php echo $lang->personnel->role;?></th>
<th rowspan='2' class="c-user"> <?php echo $lang->personnel->name;?></th>
<th rowspan='2'><?php echo $lang->personnel->projects;?></th>
<th rowspan='2'><?php echo $lang->personnel->executions;?></th>
<th colspan="2"><?php echo $lang->personnel->workingHours;?></th>
@@ -60,8 +60,8 @@
<tbody class="sortable">
<?php foreach($investList as $personnel):?>
<tr>
<td title='<?php echo $personnel['realname'];?>'><?php echo $personnel['realname'];?></td>
<td title='<?php echo $personnel['role'];?>' style="overflow: hidden; white-space:nowrap; text-overflow: ellipsis;"><?php echo $personnel['role'];?></td>
<td title='<?php echo $personnel['realname'];?>'><?php echo $personnel['realname'];?></td>
<td><?php echo $personnel['projects'];?></td>
<td><?php echo $personnel['executions'];?></td>
<td><?php echo round($personnel['consumedTask'], 1);?></td>