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

* Finish task #72678.

Browse Source
This commit is contained in:
Yagami
2022-10-18 11:23:12 +08:00
parent b75e9a34ca
commit b99203caa6
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/story.html.php
+1
View File
@@ -76,6 +76,7 @@
</div>
<?php endif;?>
<?php
if($productID) common::printIcon('story', 'report', "productID=$productID&branchID=&storyType=story&browseType=$type&moduleID=$param&chartType=pie&projectID=$execution->id", '', 'button', 'bar-chart muted');
common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe'");
$canLinkStory = $execution->hasProduct or $execution->multiple;
module/product/view/browse.html.php
+1 -1
View File
@@ -146,7 +146,7 @@ js::set('storyType', $storyType);
</div>
<?php if(!isonlybody()):?>
<div class="btn-toolbar pull-right">
<?php if($this->app->rawModule != 'projectstory') common::printIcon('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie", '', 'button', 'bar-chart muted'); ?>
<?php if($productID) common::printIcon('story', 'report', "productID=$productID&branchID=$branch&storyType=$storyType&browseType=$browseType&moduleID=$moduleID&chartType=pie&projectID=$projectID", '', 'button', 'bar-chart muted'); ?>
<div class="btn-group">
<button class="btn pull-right btn-link" data-toggle="dropdown"><i class="icon icon-export muted"></i> <span class="text"><?php echo $lang->export ?></span> <span class="caret"></span></button>
<ul class="dropdown-menu" id='exportActionMenu'>
module/story/control.php
+18 -2
View File
@@ -2570,10 +2570,11 @@ class story extends control
* @param string $browseType
* @param int $moduleID
* @param string $chartType
* @param int $projectID
* @access public
* @return void
*/
public function report($productID, $branchID, $storyType = 'story', $browseType = 'unclosed', $moduleID = 0, $chartType = 'pie')
public function report($productID, $branchID, $storyType = 'story', $browseType = 'unclosed', $moduleID = 0, $chartType = 'pie', $projectID = 0)
{
$this->loadModel('report');
$this->view->charts = array();
@@ -2593,8 +2594,23 @@ class story extends control
}
}
if($this->app->tab == 'project')
{
$project = $this->dao->findByID($projectID)->from(TABLE_PROJECT)->fetch();
if($project->type == 'project')
{
$this->loadModel('project')->setMenu($projectID);
$this->lang->story->report->charts['storysPerProduct'] = str_replace($this->lang->productCommon, $this->lang->projectCommon, $this->lang->story->report->charts['storysPerProduct']);
if($project and $project->model == 'waterfall') unset($this->lang->story->report->charts['storysPerPlan']);
}
else
{
$this->loadModel('execution')->setMenu($projectID);
}
}
$this->story->replaceURLang($storyType);
$this->products = $this->product->getPairs();
$this->products = $this->product->getPairs('', 0, '', 'all');
$this->product->setMenu($productID, $branchID);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->story->reportChart;