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

* Fix bug #29442#29695

Browse Source
This commit is contained in:
lanzongjun
2022-11-18 15:18:57 +08:00
parent 35fd254797
commit 0b2bb1a273
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+2 -2
View File
@@ -4712,7 +4712,7 @@ class executionModel extends model
echo "<span class='project-type-label label label-outline $spanClass'>{$this->lang->execution->typeList[$execution->type]}</span> ";
if(empty($execution->children))
{
echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', 'class="text-ellipsis"');
echo html::a(helper::createLink('execution', 'view', "executionID=$execution->id"), $execution->name, '', "class='text-ellipsis' title='{$execution->name}'");
if(!helper::isZeroDate($execution->end))
{
if($execution->status != 'closed')
@@ -4742,7 +4742,7 @@ class executionModel extends model
echo "<td class='hours text-right' title='{$execution->hours->totalLeft}{$this->lang->execution->workHour}'>" . $execution->hours->totalLeft . $this->lang->execution->workHourUnit . '</td>';
echo '<td>' . html::ring($execution->hours->progress) . '</td>';
echo "<td id='spark-{$execution->id}' class='sparkline text-left no-padding' values='$burns'></td>";
echo '<td class="c-actions">';
echo '<td class="c-actions text-center">';
common::printIcon('execution', 'start', "executionID={$execution->id}", $execution, 'list', '', '', 'iframe', true);
$class = !empty($execution->children) ? 'disabled' : '';
common::printIcon('task', 'create', "executionID={$execution->id}", '', 'list', '', '', $class, false, "data-app='execution'");
module/project/js/execution.js
+5
View File
@@ -116,6 +116,11 @@ $(function()
return (checkedTotal ? checkedSummary : pageSummary).replace('%total%', $rows.length).replace('%wait%', checkedWait).replace('%doing%', checkedDoing);
}
})
if(project.division && project.hasProduct && $('#executionList thead th.table-nest-title').width() < 240)
{
$('#executionList thead th.table-nest-title').width(240)
}
})
window.addEventListener('scroll', this.handleScroll)
module/project/view/execution.html.php
+7 -6
View File
@@ -1,5 +1,6 @@
<?php include '../../common/view/header.html.php';?>
<?php js::set('projectID', $projectID);?>
<?php js::set('project', $project);?>
<?php js::set('edit', $lang->edit);?>
<?php js::set('selectAll', $lang->selectAll);?>
<?php js::set('checkedExecutions', $lang->execution->checkedExecutions);?>
@@ -87,15 +88,15 @@
<?php endif;?>
</div>
</th>
<?php if($project->division and $project->hasProduct) echo "<th class='text-left c-product'>{$lang->project->product}</th>";?>
<?php if($project->division and $project->hasProduct) echo "<th class='text-left w-100px'>{$lang->project->product}</th>";?>
<th class='c-status text-center'><?php echo $lang->project->status;?></th>
<th class='c-user'><?php echo $lang->execution->owner;?></th>
<th class='w-50px'><?php echo $lang->execution->owner;?></th>
<th class='c-date'><?php echo $lang->programplan->begin;?></th>
<th class='c-date'><?php echo $lang->programplan->end;?></th>
<th class='c-hours text-right'><?php echo $lang->task->estimateAB;?></th>
<th class='c-hours text-right'><?php echo $lang->task->consumedAB;?></th>
<th class='c-hours text-right'><?php echo $lang->task->leftAB;?> </th>
<th class='c-hours'><?php echo $lang->project->progress;?></th>
<th class='w-40px text-right'><?php echo $lang->task->estimateAB;?></th>
<th class='w-40px text-right'><?php echo $lang->task->consumedAB;?></th>
<th class='w-40px text-right'><?php echo $lang->task->leftAB;?> </th>
<th class='w-50px'><?php echo $lang->project->progress;?></th>
<th class='c-progress'><?php echo $lang->execution->burn;?> </th>
<th class='text-center c-actions-6'><?php echo $lang->actions;?></th>
</tr>