mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-22 01:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #457 from bergware/master

Browse Source 
Parity use 'sbSynced' instead of 'sbUpdated'
This commit is contained in:
tom mortensen
2019-02-07 13:43:41 -08:00
committed by GitHub
parent 4eeca26962 e03f457584
commit f59af80b13
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/dynamix/DashStats.page
View File

@@ -151,6 +151,7 @@ if ($low) $memory_maximum = pow(2,ceil(log($memory_installed)/log(2)));
span.outer{float:left}
span.inner{width:134px}
span.ups{width:124px;display:inline-block}
i.heat{margin-left:8px}
</style>
<script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
<script src="<?autov('/plugins/dynamix.docker.manager/javascript/docker.js')?>"></script>

2
plugins/dynamix/include/DeviceList.php
View File

@@ -427,7 +427,7 @@ case 'parity':
$data = [];
if ($var['mdResyncPos']) {
$data[] = my_scale($var['mdResyncSize']*1024,$unit,-1)." $unit";
$data[] = my_clock(floor((time()-$var['sbUpdated'])/60)).($var['mdResyncDt'] ? '' : ' (paused)');
$data[] = my_clock(floor((time()-$var['sbSynced'])/60)).($var['mdResyncDt'] ? '' : ' (paused)');
$data[] = my_scale($var['mdResyncPos']*1024,$unit)." $unit (".number_format(($var['mdResyncPos']/($var['mdResyncSize']/100+1)),1,$display['number'][0],'')." %)";
$data[] = $var['mdResyncDt'] ? my_scale($var['mdResyncDb']*1024/$var['mdResyncDt'],$unit, 1)." $unit/sec" : '---';
$data[] = $var['mdResyncDb'] ? my_clock(round(((($var['mdResyncDt']*(($var['mdResyncSize']-$var['mdResyncPos'])/($var['mdResyncDb']/100+1)))/100)/60),0)) : 'Unknown';