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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-04-01 15:36:22 +08:00
parent d8e8b86a98 c9c22cdecd
commit 6dc76629cd
4 changed files with 55 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/projectstatisticblock.html.php
+39 -58
View File
@@ -63,13 +63,21 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
.status-count {margin: auto;}
.status-count tr:first-child td:last-child {color: #000; font-weight: bold;}
.block-statistic .progress-group {margin-top: 20px; margin-bottom: 10px; height: 65px;}
.block-statistic .weekly-title {font-weight: bold; font-size:14px; color: #3C4253;}
.block-statistic .project-info {margin-left: 3px;}
.block-statistic .progress-group {margin-top: 10px;}
.block-statistic .progress-group .col {padding-left: 0;}
.block-statistic .progress-percent {top: 4px;}
.block-statistic .weekly-title {font-weight: bold; color: #3C4253;}
.block-statistic .weekly-small {font-size:12px; color: #838A9D;}
.block-statistic .weekly-progress {font-weight: bold; font-size:24px;}
.block-statistic .weekly-name {font-size: 14px; color: #838A9D;}
.block-statistic .weekly-value {font-size: 14px;}
.block-statistic .col-6 .stage {margin-left: 10px;}
.block-statistic .col-12 .stage {margin-left: 10px;}
.block-statistic .col-12 .waterfall-title {padding-top: 5px;}
.block-statistic .col-12 .waterfall-value {padding-top: 10px; font-size: 18px; font-weight: 600;}
.block-statistic .col-12 .waterfall-title .col {padding-right: 0px; padding-left: 0px;}
.twenty-percent {width: 20%;}
</style>
<script>
<?php $blockNavId = 'nav-' . uniqid(); ?>
@@ -171,71 +179,44 @@ $(function()
</div>
</div>
<?php else:?>
<div class="col-6">
<div class="col-12">
<div class='table-row text-left weekly-row with-padding'>
<span class='weekly-title'><?php echo $lang->project->weekly;?></span>
<span class='stage text-muted'><?php echo $project->current;?></span>
</div>
<div class='progress-group col-10 center-block'>
<div class='progress-num text-center'>
<div class='weekly-title'><?php echo $lang->project->progress;?></div>
<div class='weekly-progress'><?php echo $project->progress . '%';?></div>
<div class='text-center progress-group col-12 with-padding center-block'>
<div class='progress-num col'>
<span><?php echo $lang->project->progress . ':';?></span>
<span class='project-info'><?php echo $project->progress . '%';?></span>
</div>
<div class='progress'>
<div class='progress progress-percent twenty-percent col'>
<div class="progress-bar" role="progressbar" aria-valuenow="82" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->progress;?>%"></div>
</div>
<div class="twenty-percent col">
<span><?php echo $lang->project->teamCount . ':';?></span>
<span class='project-info'><?php echo $project->teamCount;?></span>
</div>
<div class="twenty-percent col">
<span><?php echo $lang->project->budget . ':';?></span>
<span class='project-info'><?php echo $project->budget;?></span>
</div>
</div>
<div class="table-row text-center small with-padding col-10 center-block">
<div class="col-4 text-bottom">
<div class='weekly-name'><?php echo $lang->project->pv;?></div>
<div class='weekly-value'><?php echo $project->pv;?></div>
</div>
<div class="col-4">
<div class='weekly-name'><?php echo $lang->project->ev;?></div>
<div class='weekly-value'><?php echo $project->ev;?></div>
</div>
<div class="col-4">
<div class='weekly-name'><?php echo $lang->project->sv;?></div>
<div class='weekly-value'><?php echo $project->sv;?></div>
</div>
<div class="table-row text-center waterfall-title small col-12 center-block">
<?php $isChineseLang = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']);?>
<div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv; ?></div>
<div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev;?></div>
<div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac;?></div>
<div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->sv . '(' . $lang->project->svTitle . ')' : $lang->project->sv;?></div>
<div class="twenty-percent col"><?php echo $isChineseLang ? $lang->project->cv . '(' . $lang->project->cvTitle . ')' : $lang->project->cv;?></div>
</div>
<div class="table-row text-center waterfall-value small col-12 center-block">
<div class="twenty-percent col"><?php echo $project->pv;?></div>
<div class="twenty-percent col"><?php echo $project->ev;?></div>
<div class="twenty-percent col"><?php echo $project->ac;?></div>
<div class="twenty-percent col"><?php echo $project->sv;?></div>
<div class="twenty-percent col"><?php echo $project->cv;?></div>
</div>
</div>
<div class='col-6'>
<div class='table-row weekly-row with-padding'>
<div class='col-4 text-center w-70px'>
<span class='weekly-title'><?php echo $lang->project->allInput;?></span>
</div>
<div class='col-8'></div>
</div>
<div class='progress-group'>
<div class="table-row text-center small with-padding">
<div class="col-4 text-bottom">
<div class='weekly-name'><?php echo $lang->project->PM;?></div>
<div class='weekly-value'><?php echo $project->PM ? zget($users, $project->PM) : $lang->project->emptyPM;?></div>
</div>
<div class="col-4">
<div class='weekly-name'><?php echo $lang->project->teamCount;?></div>
<div class='weekly-value'><?php echo $project->teamCount;?></div>
</div>
<div class="col-4">
<div class='weekly-name'><?php echo $lang->project->budget;?></div>
<div class='weekly-value'><?php echo $project->budget;?></div>
</div>
</div>
</div>
<div class="table-row text-center small with-padding">
<div class="col-4 text-bottom">
<div class='weekly-name'><?php echo $lang->project->ac;?></div>
<div class='weekly-value'><?php echo $project->ac;?></div>
</div>
<div class="col-4">
<div class='weekly-name'><?php echo $lang->project->cv;?></div>
<div class='weekly-value'><?php echo $project->cv;?></div>
</div>
<div>
</div>
</div>
</div>
<?php endif;?>
</div>
</div>
module/project/lang/zh-cn.php
+7 -2
View File
@@ -94,9 +94,14 @@ $lang->project->allInput = '项目总投入';
$lang->project->weekly = '项目周报';
$lang->project->pv = 'PV';
$lang->project->ev = 'EV';
$lang->project->sv = 'SV%';
$lang->project->sv = 'SV';
$lang->project->ac = 'AC';
$lang->project->cv = 'CV%';
$lang->project->cv = 'CV';
$lang->project->pvTitle = '计划完成';
$lang->project->evTitle = '实际完成';
$lang->project->svTitle = '进度偏差';
$lang->project->acTitle = '实际花费';
$lang->project->cvTitle = '成本偏差';
$lang->project->teamCount = '人数';
$lang->project->longTime = '长期';
$lang->project->future = '待定';
module/project/lang/zh-tw.php
+7 -2
View File
@@ -82,9 +82,14 @@ $lang->project->allInput = '項目總投入';
$lang->project->weekly = '項目周報';
$lang->project->pv = 'PV';
$lang->project->ev = 'EV';
$lang->project->sv = 'SV%';
$lang->project->sv = 'SV';
$lang->project->ac = 'AC';
$lang->project->cv = 'CV%';
$lang->project->cv = 'CV';
$lang->project->pvTitle = '計劃完成';
$lang->project->evTitle = '實際完成';
$lang->project->svTitle = '進度偏差';
$lang->project->acTitle = '實際花費';
$lang->project->cvTitle = '成本偏差';
$lang->project->PRJTeamCount = '項目成員';
$lang->project->PRJLongTime = '長期';
$lang->project->future = '待定';
module/upgrade/model.php
+2 -2
View File
@@ -4232,8 +4232,8 @@ class upgradeModel extends model
public function processMergedData($programID, $projectID, $lineID, $productIdList = array(), $sprintIdList = array())
{
/* Product linked objects. */
$this->dao->update(TABLE_STORY)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
$this->dao->update(TABLE_RELEASE)->set('project')->eq($programID)->where('product')->in($productIdList)->exec();
$this->dao->update(TABLE_STORY)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
$this->dao->update(TABLE_RELEASE)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec();
/* Compute product acl. */
$products = $this->dao->select('id,program,acl')->from(TABLE_PRODUCT)->where('id')->in($productIdList)->fetchAll();