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

* Finish task#37020.

Browse Source
This commit is contained in:
tianshujie98
2021-04-01 17:40:15 +08:00
parent 992ad08c17
commit d0b6699671
8 changed files with 144 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+1 -1
View File
@@ -885,7 +885,7 @@ class block extends control
$this->app->loadClass('pager', $static = true);
$pager = pager::init(0, 3, 1);
$project->progress = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
$project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_asc', $pager);
$project->executions = $this->project->getStats($projectID, 'all', 0, 0, 30, 'id_desc', $pager);
}
elseif($project->model == 'waterfall' and isset($this->config->maxVersion))
{
module/block/lang/de.php
+14 -6
View File
@@ -11,12 +11,20 @@
*/
global $config;
$lang->block = new stdclass();
$lang->block->common = 'InfoBlock';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Gitter';
$lang->block->color = 'Farbe';
$lang->block->reset = 'Zurücksetzen';
$lang->block->common = 'InfoBlock';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Gitter';
$lang->block->color = 'Farbe';
$lang->block->reset = 'Zurücksetzen';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Konto';
$lang->block->module = 'Modul';
module/block/lang/en.php
+14 -6
View File
@@ -11,12 +11,20 @@
*/
global $config;
$lang->block = new stdclass();
$lang->block->common = 'Block';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Position';
$lang->block->color = 'Color';
$lang->block->reset = 'Reset Layout';
$lang->block->common = 'Block';
$lang->block->name = 'Name';
$lang->block->style = 'Style';
$lang->block->grid = 'Position';
$lang->block->color = 'Color';
$lang->block->reset = 'Reset Layout';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Account';
$lang->block->module = 'Module';
module/block/lang/fr.php
+14 -6
View File
@@ -11,12 +11,20 @@
*/
global $config;
$lang->block = new stdclass();
$lang->block->common = 'Bloc';
$lang->block->name = 'Nom';
$lang->block->style = 'Style';
$lang->block->grid = 'Position';
$lang->block->color = 'Couleur';
$lang->block->reset = 'Réinit';
$lang->block->common = 'Bloc';
$lang->block->name = 'Nom';
$lang->block->style = 'Style';
$lang->block->grid = 'Position';
$lang->block->color = 'Couleur';
$lang->block->reset = 'Réinit';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Compte';
$lang->block->module = 'Module';
module/block/lang/vi.php
+14 -6
View File
@@ -11,12 +11,20 @@
*/
global $config;
$lang->block = new stdclass();
$lang->block->common = 'Block';
$lang->block->name = 'Tên';
$lang->block->style = 'Kiểu';
$lang->block->grid = 'Vị trí';
$lang->block->color = 'Màu';
$lang->block->reset = 'Thiết lập lại giao diện';
$lang->block->common = 'Block';
$lang->block->name = 'Tên';
$lang->block->style = 'Kiểu';
$lang->block->grid = 'Vị trí';
$lang->block->color = 'Màu';
$lang->block->reset = 'Thiết lập lại giao diện';
$lang->block->story = 'Story';
$lang->block->bug = 'Bug';
$lang->block->investment = 'Investment';
$lang->block->left = 'Left';
$lang->block->estimate = 'Estimate';
$lang->block->doneBugs = 'Done';
$lang->block->leftBugs = 'Left';
$lang->block->last = 'Last';
$lang->block->account = 'Tài khoản';
$lang->block->module = 'Module';
module/block/lang/zh-cn.php
+14 -6
View File
@@ -11,12 +11,20 @@
*/
global $config;
$lang->block = new stdclass();
$lang->block->common = '区块';
$lang->block->name = '区块名称';
$lang->block->style = '外观';
$lang->block->grid = '位置';
$lang->block->color = '颜色';
$lang->block->reset = '恢复默认';
$lang->block->common = '区块';
$lang->block->name = '区块名称';
$lang->block->style = '外观';
$lang->block->grid = '位置';
$lang->block->color = '颜色';
$lang->block->reset = '恢复默认';
$lang->block->story = '需求';
$lang->block->bug = 'Bug';
$lang->block->investment = '投入';
$lang->block->left = '剩余';
$lang->block->estimate = '预计工时';
$lang->block->doneBugs = '已解决';
$lang->block->leftBugs = '未解决';
$lang->block->last = '近期';
$lang->block->account = '所属用户';
$lang->block->module = '所属模块';
module/block/lang/zh-tw.php
+14 -6
View File
@@ -10,12 +10,20 @@
* @link http://www.zentao.net
*/
$lang->block = new stdclass();
$lang->block->common = '區塊';
$lang->block->name = '區塊名稱';
$lang->block->style = '外觀';
$lang->block->grid = '位置';
$lang->block->color = '顏色';
$lang->block->reset = '恢復預設';
$lang->block->common = '區塊';
$lang->block->name = '區塊名稱';
$lang->block->style = '外觀';
$lang->block->grid = '位置';
$lang->block->color = '顏色';
$lang->block->reset = '恢復預設';
$lang->block->story = '需求';
$lang->block->bug = 'Bug';
$lang->block->investment = '投入';
$lang->block->left = '剩余';
$lang->block->estimate = '预计工时';
$lang->block->doneBugs = '已解决';
$lang->block->leftBugs = '未解决';
$lang->block->last = '近期';
$lang->block->account = '所屬用戶';
$lang->block->module = '所屬模組';
module/block/view/projectstatisticblock.html.php
+59 -43
View File
@@ -60,6 +60,13 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
.block-statistic .project-info .col-xs-5, .block-statistic .project-info .col-xs-7 {margin-top: 8px;}
.block-statistic .project-info .col-xs-5 {padding-left: 0;}
.block-statistic .data {width: 40%; text-align: left; padding: 10px 0px; font-size: 14px; font-weight: 700;}
.block-statistic .dataTitle {width: 60%; text-align: right; padding: 10px 0px; font-size: 14px;}
.block-statistic .executionName {padding-top: 2px; font-size: 14px;}
.block-statistic .lastIteration {padding-top: 6px;}
.block-statistic .progress-text-left {margin-right: 90px}
.block-statistic .progress-text-left .progress-text {padding-top: 2px; font-size: 14px;}
.status-count {margin: auto;}
.status-count tr:first-child td:last-child {color: #000; font-weight: bold;}
@@ -127,57 +134,66 @@ $(function()
<div class="tab-pane fade<?php if($project->id == $selected) echo ' active in';?>" id="tab3Content<?php echo $project->id;?>">
<div class="table-row">
<?php if($project->model == 'scrum'):?>
<div class="col-5 text-middle text-center">
<div class="progress-pie inline-block space" data-value="<?php echo $project->progress;?>" data-doughnut-size="84">
<canvas width="120" height="120"></canvas>
<div class="progress-info">
<small><?php echo $lang->story->common . $lang->project->doneStories;?></small>
<strong><?php echo $project->doneStories;?></strong>
</div>
<div class='table-row'>
<div class="col-4 text-center">
<div><h4><?php echo $lang->block->story;?></h4></div>
<div>
<div class="col dataTitle"><?php echo $lang->project->allStories . "：";?></div>
<div class="col data"><?php echo $project->allStories;?></div>
</div>
<div class="table-row text-center small text-muted with-padding">
<div class="col-4 text-bottom">
<div><?php echo $lang->project->allStories;?></div>
<div><?php echo $project->allStories;?></div>
</div>
<div class="col-4">
<span class="label label-dot label-primary"></span>
<div><?php echo $lang->project->doneStories;?></div>
<div><?php echo $project->doneStories;?></div>
</div>
<div class="col-4">
<span class="label label-dot label-pale"></span>
<div><?php echo $lang->project->leftStories;?></div>
<div><?php echo $project->leftStories;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->project->doneStories . "：";?></div>
<div class="col data"><?php echo $project->doneStories;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->left . "：";?></div>
<div class="col data"><?php echo $project->leftStories;?></div>
</div>
</div>
<div class="col-7">
<div class="project-info">
<h4><?php echo $lang->project->allInput;?></h4>
<div class='info'>
<span><i class='icon icon-group'></i> <?php echo sprintf($lang->project->membersUnit, $project->teamCount);?></span>
<span><i class='icon icon-clock'></i> <?php echo sprintf($lang->project->hoursUnit, $project->estimate);?></span>
<span><i class='icon icon-cost'></i> <?php echo $project->budget . ' ' . zget($lang->project->unitList, $project->budgetUnit);?></span>
</div>
<div class="col-4 text-center">
<div><h4><?php echo $lang->block->investment;?></h4></div>
<div>
<div class="col dataTitle"><?php echo $lang->block->totalPeople . "：";?></div>
<div class="col data"><?php echo $project->teamCount;?></div>
</div>
<div class="project-info">
<?php $i = 0;?>
<h4><?php echo $lang->project->lastIteration;?></h4>
<?php foreach($project->executions as $execution):?>
<?php $i ++;?>
<?php if($i > 3) break;?>
<div class='col-xs-5'><?php echo $execution->name;?></div>
<div class='col-xs-7'>
<div class='progress progress-text-left'>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $execution->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $execution->hours->progress;?>%">
<span class='progress-text'><?php echo $execution->hours->progress . '%';?></span>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->estimate . "：";?></div>
<div class="col data"><?php echo $project->estimate;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->consumedHours . "：";?></div>
<div class="col data"><?php echo $project->consumed;?></div>
</div>
</div>
<div class="col-4 text-center">
<div><h4><?php echo $lang->block->bug;?></h4></div>
<div>
<div class="col dataTitle"><?php echo $lang->block->totalBug . "：";?></div>
<div class="col data"><?php echo $project->allBugs;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->doneBugs . "：";?></div>
<div class="col data"><?php echo $project->doneBugs;?></div>
</div>
<div>
<div class="col dataTitle"><?php echo $lang->block->leftBugs . "：";?></div>
<div class="col data"><?php echo $project->leftBugs;?></div>
</div>
</div>
</div>
<div class="table-row project-info">
<div class="col-3 text-center"><h4><?php echo $lang->block->last;?></h4></div>
<div class="table-row lastIteration">
<div class='col-3 text-center executionName'><?php echo $project->executions[0]->name;?></div>
<div class='col-8'>
<div class='progress progress-text-left'>
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->executions[0]->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->executions[0]->hours->progress;?>%">
<span class='progress-text'><?php echo $project->executions[0]->hours->progress . '%';?></span>
</div>
</div>
<?php endforeach;?>
</div>
</div>
</div>
<?php else:?>
<div class="col-12">
<div class='table-row text-left weekly-row with-padding'>