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

* Code for task #37108.

Browse Source
This commit is contained in:
Yagami
2021-04-08 11:29:17 +08:00
parent 8a114befb5
commit 94e2d9d56a
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1
View File
@@ -84,6 +84,7 @@ class product extends control
/* Get PM id list. */
$accounts = array();
$projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved);
foreach($projectStats as $project)
{
if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM;
module/product/css/project.css
+1
View File
@@ -1,3 +1,4 @@
.checkbox-primary {margin-top: 6px;}
.tip {display: inline-block; vertical-align: middle; margin-top: 6px;}
#mainMenu .icon.icon-help {margin-left: 5px;}
td.padding-right {padding-right: 20px !important}
module/product/model.php
+5 -1
View File
@@ -851,7 +851,11 @@ class productModel extends model
/* Determine how to display the name of the program. */
$programList = $this->loadModel('program')->getParentPairs('', 'noclosed');
foreach($projectList as $id => $project) $projectList[$id]->programName = $programList[$project->parent];
foreach($projectList as $id => $project)
{
$projectList[$id]->programName = $project->parent ? $programList[$project->parent] : '';
$projectList[$id]->programName = preg_replace('/\//', '', $projectList[$id]->programName, 1);
}
return $projectList;
}
module/product/view/project.html.php
+13 -13
View File
@@ -34,16 +34,16 @@
<th class='c-id w-50px'><?php echo $lang->idAB;?></th>
<th><?php echo $lang->project->name;?></th>
<?php if($config->systemMode == 'new'):?>
<th class='w-150px'><?php echo $lang->project->common;?></th>
<th class='w-150px'><?php echo $lang->program->common;?></th>
<?php endif;?>
<th class='w-100px'><?php echo $lang->project->PM;?></th>
<th class='w-80px text-left'><?php echo $lang->project->PM;?></th>
<th class='w-80px'><?php echo $lang->project->begin;?></th>
<th class='w-80px'><?php echo $lang->project->end;?></th>
<th class='w-70px'><?php echo $lang->project->status;?></th>
<th class='w-90px'><?php echo $lang->project->budget;?></th>
<th class='w-60px text-right'><?php echo $lang->project->estimate;?></th>
<th class='w-60px text-right'><?php echo $lang->project->consume;?></th>
<th class='w-60px'><?php echo $lang->project->progress;?></th>
<th class="w-70px"><?php echo $lang->project->budget;?></th>
<th class="w-60px text-center"><?php echo $lang->project->estimate;?></th>
<th class="w-60px text-center"><?php echo $lang->project->consume;?></th>
<th class='w-50px'><?php echo $lang->project->progress;?></th>
</tr>
</thead>
<tbody>
@@ -66,22 +66,22 @@
<?php if($config->systemMode == 'new'):?>
<td title='<?php echo $project->programName;?>' class='text-ellipsis'><?php echo $project->programName;?></td>
<?php endif;?>
<td>
<td class='padding-right'>
<?php $userID = isset($PMList[$project->PM]) ? $PMList[$project->PM]->id : ''?>
<?php if(!empty($project->PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $project->PM), '', "data-toggle='modal' data-type='iframe' data-width='800'");?>
</td>
<td><?php echo $project->begin;?></td>
<td><?php echo $project->end;?></td>
<td class='padding-right text-left'><?php echo $project->begin;?></td>
<td class='padding-right text-left'><?php echo $project->end;?></td>
<?php $status = $this->processStatus('project', $project);?>
<td class='c-status' title='<?php echo $status;?>'>
<span class="status-project status-<?php echo $project->status?>"><?php echo $status;?></span>
</td>
<?php $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);?>
<?php $budgetTitle = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;?>
<td title='<?php echo $budgetTitle;?>' class='text-ellipsis'><?php echo $budgetTitle;?></td>
<td class="text-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
<td class="text-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->project->workHour;?>"><?php echo $project->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
<td>
<td title='<?php echo $budgetTitle;?>' class='text-ellipsis text-right padding-right'><?php echo $budgetTitle;?></td>
<td class="text-right padding-right" title="<?php echo $project->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
<td class="text-right padding-right" title="<?php echo $project->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $project->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
<td class='padding-right text-center'>
<div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $project->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo $project->hours->progress;?></div>
</div>