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

* Merge module-block to Merge184.

Browse Source
This commit is contained in:
chaideqing
2023-11-14 15:26:45 +08:00
parent d2ec1b5568
commit ff3ef94e32
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/js/dashboard.js
+4 -2
View File
@@ -64,8 +64,10 @@ function resizeBlock(blockID, width, callback)
function refreshBlock($panel, afterRefresh)
{
var url = $panel.data('url');
var headers = {};
if(forceRefresh) headers['X-Zt-Refresh'] = forceRefresh;
$panel.addClass('load-indicator loading');
$.ajax({url: url, dataType: 'html'}).done(function(data)
$.ajax({url: url, dataType: 'html', headers: headers}).done(function(data)
{
var $data = $(data);
if($data.hasClass('panel')) $panel.empty().append($data.children());
@@ -284,7 +286,7 @@ $(function()
always: function(){sortMessager.isShow && sortMessager.hide();}
}).on('click', '.refresh-panel', function()
{
refreshBlock($(this).closest('.panel'));
refreshBlock($(this).closest('.panel'), null, 1);
});
});
module/block/view/executionblock.html.php
+4 -4
View File
@@ -56,12 +56,12 @@
<span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
<?php endif;?>
</td>
<td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->estimate . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->left . ' ' . $lang->execution->workHour;?>"><?php echo $execution->left . $lang->execution->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->progress);?></div>
</div>
</td>
<?php if($longBlock):?>
module/block/view/productblock.html.php
+4 -4
View File
@@ -42,10 +42,10 @@
<?php $executionName = zget($executions, $product->id, '');?>
<td class='c-name c-execution text-left' title='<?php echo $executionName;?>'><?php echo $executionName;?></td>
<?php endif;?>
<td class="c-num"><?php echo $product->plans?></td>
<td class="c-num"><?php echo $product->releases?></td>
<td class="c-num"><?php echo $product->stories['active']?></td>
<td class="c-num"><?php echo $product->unResolved?></td>
<td class="c-num"><?php echo $product->plans;?></td>
<td class="c-num"><?php echo $product->releases;?></td>
<td class="c-num"><?php echo $product->activeStories;?></td>
<td class="c-num"><?php echo $product->unresolvedBugs;?></td>
</tr>
<?php endforeach;?>
</tbody>
module/block/view/recentprojectblock.html.php
+1 -1
View File
@@ -102,7 +102,7 @@
<div class='col-xs-7'>
<div class="progress progress-text-left">
<div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="<?php echo $project->hours->progress;?>" aria-valuemin="0" aria-valuemax="100" style="width: <?php echo $project->hours->progress;?>%">
<span class="progress-text"><?php echo $project->hours->progress;?>%</span>
<span class="progress-text"><?php echo $project->progress;?>%</span>
</div>
</div>
</div>
module/block/view/scrumlistblock.html.php
+5 -5
View File
@@ -56,13 +56,13 @@
<span class="status-project status-<?php echo $execution->status?>" title='<?php echo $statusName;?>'><?php echo $statusName;?></span>
<?php endif;?>
</td>
<td class="c-hours" title="<?php echo $execution->hours->totalEstimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalEstimate . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalConsumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalConsumed . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->hours->totalLeft . ' ' . $lang->execution->workHour;?>"><?php echo $execution->hours->totalLeft . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->estimate . ' ' . $lang->execution->workHour;?>"><?php echo $execution->estimate . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->consumed . ' ' . $lang->execution->workHour;?>"><?php echo $execution->consumed . $lang->execution->workHourUnit;?></td>
<td class="c-hours" title="<?php echo $execution->left . ' ' . $lang->execution->workHour;?>"><?php echo $execution->left . $lang->execution->workHourUnit;?></td>
<?php endif;?>
<td class="c-progress">
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->hours->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->hours->progress);?></div>
<div class='progress-pie' data-doughnut-size='90' data-color='#3CB371' data-value='<?php echo round($execution->progress);?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
<div class='progress-info'><?php echo round($execution->progress);?></div>
</div>
</td>
<?php if($longBlock):?>