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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2016-11-17 17:32:54 +08:00
parent 88b0595290 0bcb1b5cc8
commit a6210b9eb7
12 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/view/report.html.php
+1
View File
@@ -76,6 +76,7 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/common/lang/en.php
+3
View File
@@ -275,6 +275,9 @@ $lang->report->menu->prj = array('link' => $lang->projectCommon . '|report|p
$lang->report->menu->test = array('link' => 'Testing|report|bugcreate', 'alias' => 'bugassign');
$lang->report->menu->staff = array('link' => 'Company|report|workload');
$lang->report->notice = new stdclass();
$lang->report->notice->help = 'Note: Report is generated from search results. Please search in the list page before you generate a report.';
/* 组织结构视图菜单设置。*/
$lang->company = new stdclass();
$lang->company->menu = new stdclass();
module/common/lang/zh-cn.php
+3
View File
@@ -275,6 +275,9 @@ $lang->report->menu->prj = array('link' => $lang->projectCommon . '|report|p
$lang->report->menu->test = array('link' => '测试|report|bugcreate', 'alias' => 'bugassign');
$lang->report->menu->staff = array('link' => '组织|report|workload');
$lang->report->notice = new stdclass();
$lang->report->notice->help = '注：统计报表的数据，来源于列表页面的检索结果，生成统计报表前请先在列表页面进行检索。';
/* 组织结构视图菜单设置。*/
$lang->company = new stdclass();
$lang->company->menu = new stdclass();
module/product/view/browse.html.php
-1
View File
@@ -12,7 +12,6 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datatable.fix.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<?php js::set('browseType', $browseType);?>
<div id='featurebar'>
<ul class='nav'>
module/product/view/browsedata.html.php
+1
View File
@@ -10,6 +10,7 @@
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='storyList'>
<thead>
<tr>
module/product/view/project.html.php
+8 -8
View File
@@ -14,16 +14,16 @@
<div id='titlebar'>
<div class='heading'><i class='icon-folder-close'></i> <?php echo $lang->product->project;?> </div>
</div>
<table class='table'>
<table class='table table-fixed'>
<thead>
<tr class='colhead'>
<th class='w-150px'><?php echo $lang->project->name;?></th>
<th><?php echo $lang->project->code;?></th>
<th><?php echo $lang->project->end;?></th>
<th><?php echo $lang->project->status;?></th>
<th><?php echo $lang->project->totalEstimate;?></th>
<th><?php echo $lang->project->totalConsumed;?></th>
<th><?php echo $lang->project->totalLeft;?></th>
<th><?php echo $lang->project->name;?></th>
<th class='w-100px'><?php echo $lang->project->code;?></th>
<th class='w-120px'><?php echo $lang->project->end;?></th>
<th class='w-80px'><?php echo $lang->project->status;?></th>
<th class='w-50px'><?php echo $lang->project->totalEstimate;?></th>
<th class='w-50px'><?php echo $lang->project->totalConsumed;?></th>
<th class='w-50px'><?php echo $lang->project->totalLeft;?></th>
<th class='w-150px'><?php echo $lang->project->progess;?></th>
<th class='w-100px'><?php echo $lang->project->burn;?></th>
</tr>
module/project/view/taskdata.html.php
+16 -13
View File
@@ -10,30 +10,32 @@
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/tablesorter.html.php';?>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed' id='taskList'>
<thead>
<tr>
<th class='w-id'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-p30'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
<th class='w-status'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-70px'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<th class='w-id {sorter:false}'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-pri {sorter:false}'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='{sorter:false}'> <?php common::printOrderLink('name', $orderBy, $vars, $lang->task->name);?></th>
<th class='w-status {sorter:false}'><?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
<th class='w-70px {sorter:false}'> <?php common::printOrderLink('deadline', $orderBy, $vars, $lang->task->deadlineAB);?></th>
<?php if($this->cookie->windowWidth > $this->config->wideSize):?>
<th class='w-id'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->task->openedDateAB);?></th>
<th class='w-id {sorter:false}'> <?php common::printOrderLink('openedDate', $orderBy, $vars, $lang->task->openedDateAB);?></th>
<?php endif;?>
<th class='w-user'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
<th class='w-user'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
<th class='w-user {sorter:false}'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->task->assignedToAB);?></th>
<th class='w-user {sorter:false}'> <?php common::printOrderLink('finishedBy', $orderBy, $vars, $lang->task->finishedByAB);?></th>
<?php if($this->cookie->windowWidth > $this->config->wideSize):?>
<th class='w-50px'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<th class='w-50px {sorter:false}'> <?php common::printOrderLink('finishedDate', $orderBy, $vars, $lang->task->finishedDateAB);?></th>
<?php endif;?>
<th class='w-35px'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th class='w-50px'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px nobr'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<?php if($project->type == 'sprint') print '<th>' and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th class='w-35px {sorter:false}'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->task->estimateAB);?></th>
<th class='w-50px {sorter:false}'> <?php common::printOrderLink('consumed', $orderBy, $vars, $lang->task->consumedAB);?></th>
<th class='w-40px nobr {sorter:false}'> <?php common::printOrderLink('left', $orderBy, $vars, $lang->task->leftAB);?></th>
<th class='w-50px'><?php echo $lang->task->progess;?></th>
<?php if($project->type == 'sprint') print "<th class='w-100px {sorter:false}'>" and common::printOrderLink('story', $orderBy, $vars, $lang->task->story) and print '</th>';?>
<th class='w-150px {sorter:false}'><?php echo $lang->actions;?></th>
</tr>
</thead>
@@ -77,6 +79,7 @@
<td><?php echo $task->estimate;?></td>
<td><?php echo $task->consumed;?></td>
<td><?php echo $task->left;?></td>
<td><?php echo $task->progess;?>%</td>
<?php
if($project->type == 'sprint')
{
module/story/view/report.html.php
+1
View File
@@ -75,6 +75,7 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>
module/task/lang/en.php
+1
View File
@@ -33,6 +33,7 @@ $lang->task->reportChart = "Report Chart";
$lang->task->fromBug = 'From Bug';
$lang->task->case = 'Related Case';
$lang->task->confirmStoryChange = "Confirm Story Change";
$lang->task->progess = 'Progess';
$lang->task->common = 'Task';
$lang->task->id = 'ID';
module/task/lang/zh-cn.php
+1
View File
@@ -33,6 +33,7 @@ $lang->task->reportChart = "报表统计";
$lang->task->fromBug = '来源Bug';
$lang->task->case = '相关用例';
$lang->task->confirmStoryChange = "确认需求变动";
$lang->task->progess = '进度';
$lang->task->common = '任务';
$lang->task->id = '编号';
module/task/model.php
+14
View File
@@ -1190,6 +1190,20 @@ class taskModel extends model
$task->productType = $product->type;
}
/* Compute task progess. */
if($task->consumed == 0 and $task->left == 0)
{
$task->progess = 0;
}
elseif($task->consumed != 0 and $task->left == 0)
{
$task->progess = 100;
}
else
{
$task->progess = round($task->consumed / ($task->consumed + $task->left), 3) * 100;
}
return $task;
}
module/task/view/report.html.php
+1
View File
@@ -77,6 +77,7 @@
<?php endforeach;?>
</table>
</div>
<div class='alert alert-info'><?php echo $lang->report->notice->help?></div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>