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

* Finish task #36438.

Browse Source
This commit is contained in:
tianshujie98
2021-03-11 15:27:21 +08:00
parent c46a398cd7
commit ec01a855f3
7 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/css/grouptask.css
+1 -1
View File
@@ -24,4 +24,4 @@
.is-firefox .group-header:before {content: ' '; position: absolute; top: 0; right: 0; left: 0; bottom: 0; background: #fff; z-index: 0;}
.is-firefox .group-header > a,
.is-firefox .group-header > .groupSummary {position: relative; z-index: 1;}
.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
.c-hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
module/execution/view/all.html.php
+10 -9
View File
@@ -22,6 +22,7 @@
.table td.has-child > .plan-toggle > .icon:before {text-align: left;}
.table td.has-child > .plan-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
.hours {text-align: right;}
@-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
</style>
<div id='mainMenu' class='clearfix'>
@@ -75,9 +76,9 @@
<th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->PM);?></th>
<th class='w-90px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
<th class='w-90px'><?php common::printOrderLink('status', $orderBy, $vars, $lang->execution->status);?></th>
<th class='w-70px'><?php echo $lang->execution->totalEstimate;?></th>
<th class='w-70px'><?php echo $lang->execution->totalConsumed;?></th>
<th class='w-70px'><?php echo $lang->execution->totalLeft;?></th>
<th class='w-70px hours'><?php echo $lang->execution->totalEstimate;?></th>
<th class='w-70px hours'><?php echo $lang->execution->totalConsumed;?></th>
<th class='w-70px hours'><?php echo $lang->execution->totalLeft;?></th>
<th class='w-150px'><?php echo $lang->execution->progress;?></th>
<th class='w-100px'><?php echo $lang->execution->burn;?></th>
<?php if($canOrder):?>
@@ -113,9 +114,9 @@
<td class='c-status' title='<?php echo $executionStatus;?>'>
<span class="status-execution status-<?php echo $execution->status?>"><?php echo $executionStatus;?></span>
</td>
<td><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
<td><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
<td><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
<td class='hours'><?php echo $execution->hours->totalEstimate . ' ' . $config->hourUnit;?></td>
<td class='hours'><?php echo $execution->hours->totalConsumed . ' ' . $config->hourUnit;?></td>
<td class='hours'><?php echo $execution->hours->totalLeft . ' ' . $config->hourUnit;?></td>
<td class="c-progress">
<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;?>%">
@@ -157,9 +158,9 @@
<td class='c-status' title='<?php echo $executionStatus;?>'>
<span class="status-execution status-<?php echo $child->status?>"><?php echo $executionStatus;?></span>
</td>
<td><?php echo $child->hours->totalEstimate;?></td>
<td><?php echo $child->hours->totalConsumed;?></td>
<td><?php echo $child->hours->totalLeft;?></td>
<td class='hours'><?php echo $child->hours->totalEstimate;?></td>
<td class='hours'><?php echo $child->hours->totalConsumed;?></td>
<td class='hours'><?php echo $child->hours->totalLeft;?></td>
<td class="c-progress">
<div class="progress progress-text-left">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $child->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $child->hours->progress;?>%">
module/execution/view/grouptask.html.php
+5 -5
View File
@@ -90,7 +90,7 @@
</p>
</div>
<?php else:?>
<table class="table table-grouped text-center">
<table class="table table-grouped">
<thead>
<tr class="<?php if($allCount) echo 'divider';?>">
<th class="c-side text-left has-btn group-menu">
@@ -117,9 +117,9 @@
<th class="c-status"><?php echo $lang->task->status;?></th>
<th class="text-left w-60px"><?php echo $lang->task->assignedTo;?></th>
<th class="w-90px"><?php echo $lang->task->finishedBy;?></th>
<th class="w-60px text-right"><?php echo $lang->task->estimateAB;?></th>
<th class="w-50px"><?php echo $lang->task->consumedAB;?></th>
<th class="w-50px"><?php echo $lang->task->leftAB;?></th>
<th class="w-60px c-hours"><?php echo $lang->task->estimateAB;?></th>
<th class="w-50px c-hours"><?php echo $lang->task->consumedAB;?></th>
<th class="w-50px c-hours"><?php echo $lang->task->leftAB;?></th>
<th class="w-50px" title='<?php echo $lang->task->progress;?>'><?php echo $lang->task->progressAB;?></th>
<th class="c-type"><?php echo $lang->typeAB;?></th>
<th class="c-date"><?php echo $lang->task->deadlineAB;?></th>
@@ -202,7 +202,7 @@
<td class="c-status"><span class='status-task status-<?php echo $task->status;?>'> <?php echo $this->processStatus('task', $task);?></span></td>
<td class="c-assign text-left"><?php echo "<span class='$assignedToClass'>" . $task->assignedToRealName . "</span>";?></td>
<td class='c-user'><?php echo zget($users, $task->finishedBy);?></td>
<td class="c-hours em text-right" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
<td class="c-hours em" title="<?php echo $task->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $task->estimate . ' ' . $lang->execution->workHourUnit;?></td>
<td class="c-hours em" title="<?php echo $task->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $task->consumed . ' ' . $lang->execution->workHourUnit;?></td>
<td class="c-hours em" title="<?php echo $task->left . ' ' . $lang->execution->workHour;?>"><?php echo $task->left . ' ' . $lang->execution->workHourUnit;?></td>
<td class="c-num em"><?php echo $task->progress . '%';?></td>
module/story/view/view.html.php
+1 -1
View File
@@ -141,7 +141,7 @@
<th class='w-40px'> <?php echo $lang->priAB;?></th>
<th> <?php echo $lang->story->title;?></th>
<th class='w-100px'><?php echo $lang->story->assignedTo;?></th>
<th class='w-80px'> <?php echo $lang->story->estimate;?></th>
<th class='w-90px'> <?php echo $lang->story->estimate;?></th>
<th class='w-80px'> <?php echo $lang->story->status;?></th>
<th class='w-200px'><?php echo $lang->actions;?></th>
</tr>
module/user/css/task.css
+1 -1
View File
@@ -1,2 +1,2 @@
td.delayed {color: #fff; background: #e84e0f !important;}
.hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
.hours {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; text-align: right;}
module/user/view/story.html.php
+9 -9
View File
@@ -37,15 +37,15 @@
<table class='table has-sort-head tablesorter'>
<thead>
<tr class='colhead'>
<th class='w-id'> <?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-200px'> <?php echo $lang->story->product;?></th>
<th> <?php echo $lang->story->title;?></th>
<th class='w-150px'> <?php echo $lang->story->plan;?></th>
<th class='w-90px'> <?php echo $lang->openedByAB;?></th>
<th class='w-80px'> <?php echo $lang->story->estimateAB;?></th>
<th class='w-id'><?php echo $lang->idAB;?></th>
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th class='w-200px'><?php echo $lang->story->product;?></th>
<th><?php echo $lang->story->title;?></th>
<th class='w-150px'><?php echo $lang->story->plan;?></th>
<th class='w-90px'><?php echo $lang->openedByAB;?></th>
<th class='w-80px text-right'><?php echo $lang->story->estimateAB;?></th>
<th class='w-status'><?php echo $lang->statusAB;?></th>
<th class='w-100px'> <?php echo $lang->story->stageAB;?></th>
<th class='w-100px'><?php echo $lang->story->stageAB;?></th>
</tr>
</thead>
<tbody>
@@ -58,7 +58,7 @@
<td class='text-left nobr'><?php echo html::a($storyLink, $story->title);?></td>
<td title='<?php echo $story->planTitle;?>'><?php echo $story->planTitle;?></td>
<td><?php echo zget($users, $story->openedBy);?></td>
<td><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . ' ' . $config->hourUnit;?></td>
<td class='story-<?php echo $story->status;?>'><?php echo $this->processStatus('story', $story);?></td>
<td><?php echo $lang->story->stageList[$story->stage];?></td>
</tr>
module/user/view/task.html.php
+3 -3
View File
@@ -44,9 +44,9 @@
<th class='w-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->task->execution;?></th>
<th><?php echo $lang->task->name;?></th>
<th class='w-70px'><?php echo $lang->task->estimateAB;?></th>
<th class='w-70px'><?php echo $lang->task->consumedAB;?></th>
<th class='w-hour'><?php echo $lang->task->leftAB;?></th>
<th class='w-70px hours'><?php echo $lang->task->estimateAB;?></th>
<th class='w-70px hours'><?php echo $lang->task->consumedAB;?></th>
<th class='w-hour hours'><?php echo $lang->task->leftAB;?></th>
<th class='w-date'><?php echo $lang->task->deadlineAB;?></th>
<th class='w-70px'><?php echo $lang->statusAB;?></th>
</tr>