LBRYFoundation/pool
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/pool.git synced 2025-09-29 23:00:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

workers: hashrate sort + gift fix

Browse source
This commit is contained in:
Tanguy Pruvot 2016-05-18 22:56:15 +02:00
parent f816169c04
commit cf3779dc5b
1 changed files with 20 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
web/yaamp/modules/site/worker_results.php
View file

@ -19,20 +19,8 @@ end;
showTableSorter('maintable', "{ showTableSorter('maintable', "{
tableClass: 'dataGrid', tableClass: 'dataGrid',
headers: { textExtraction: {
0:{sorter:'metadata'}, 6: function(node, table, n) { return $(node).attr('data'); }
1:{sorter:'text'},
2:{sorter:'text'},
3:{sorter:'text'},
4:{sorter:'text'},
5:{sorter:'text'},
6:{sorter:'metadata'},
7:{sorter:'numeric'},
8:{sorter:'numeric'},
9:{sorter:'numeric'},
10:{sorter:'numeric'},
11:{sorter:'numeric'},
12:{sorter:'text'}
}, },
widgets: ['zebra','filter','Storage','saveSort'], widgets: ['zebra','filter','Storage','saveSort'],
widgetOptions: { widgetOptions: {
@ -48,20 +36,20 @@ showTableSorter('maintable', "{
echo <<<end echo <<<end
<thead> <thead>
<tr> <tr>
<th width="20"></th> <th data-sorter="" width="20"></th>
<th>Coin</th> <th data-sorter="text">Coin</th>
<th>Address</th> <th data-sorter="text">Address</th>
<th>Pass</th> <th data-sorter="text">Pass</th>
<th>Client</th> <th data-sorter="text">Client</th>
<th>Version</th> <th data-sorter="text">Version</th>
<th>Hashrate</th> <th data-sorter="numeric">Hashrate</th>
<th>Diff</th> <th data-sorter="numeric">Diff</th>
<th>Shares</th> <th data-sorter="numeric">Shares</th>
<th>Bad</th> <th data-sorter="numeric">Bad</th>
<th>%</th> <th data-sorter="numeric">%</th>
<th>Found</th> <th data-sorter="numeric">Found</th>
<th></th> <th data-sorter="text" width="30">Name</th>
<th></th> <th data-sorter="text"></th>
</tr> </tr>
</thead><tbody> </thead><tbody>
end; end;
@ -81,7 +69,7 @@ foreach($workers as $worker)
if ($total_rate) $percent = (100.0 * $user_rate) / $total_rate; if ($total_rate) $percent = (100.0 * $user_rate) / $total_rate;
$user_bad = yaamp_worker_rate_bad($worker->id); $user_bad = yaamp_worker_rate_bad($worker->id);
$pct_bad = ($user_rate+$user_bad)? round($user_bad*100/($user_rate+$user_bad), 3): 0; $pct_bad = ($user_rate+$user_bad)? round($user_bad*100/($user_rate+$user_bad), 3): 0;
$user_rate = Itoa2($user_rate).'h/s'; $user_rate_h = $user_rate ? Itoa2($user_rate).'H' : '-';
$name = $worker->worker; $name = $worker->worker;
$user = $coin = NULL; $user = $coin = NULL;
@ -104,12 +92,12 @@ foreach($workers as $worker)
echo "<tr class='ssrow'>"; echo "<tr class='ssrow'>";
echo '<td width="20">'.$coinimg.'</td>'; echo '<td width="20">'.$coinimg.'</td>';
echo '<td><b>'.$coinlink.'</b>&nbsp;('.$coinsym.')</td>'; echo '<td><b>'.$coinlink.'</b>'.($coinsym ? '&nbsp;('.$coinsym.')':'-').'</td>';
echo "<td><a href='/?address=$worker->name'><b>$worker->name</b></a></td>"; echo "<td><a href='/?address=$worker->name'><b>$worker->name</b></a></td>";
echo "<td>$worker->password</td>"; echo "<td>$worker->password</td>";
echo "<td title='$worker->ip'>$dns</td>"; echo "<td title='$worker->ip'>$dns</td>";
echo "<td>$worker->version</td>"; echo "<td>$worker->version</td>";
echo "<td>$user_rate</td>"; echo "<td data=\"$user_rate\">$user_rate_h</td>";
echo "<td>$worker->difficulty</td>"; echo "<td>$worker->difficulty</td>";
$shares = dboscalar("SELECT COUNT(id) as shares FROM shares WHERE workerid=:worker AND algo=:algo", array( $shares = dboscalar("SELECT COUNT(id) as shares FROM shares WHERE workerid=:worker AND algo=:algo", array(
@ -140,7 +128,7 @@ foreach($workers as $worker)
echo '<td>'.$worker_blocs.' / '.$user_blocs.'</td>'; echo '<td>'.$worker_blocs.' / '.$user_blocs.'</td>';
echo '<td>'.$name.'</td>'; echo '<td>'.$name.'</td>';
echo '<td>'.($gift ? "$gift&nbsp;%" : '').'</td>'; echo '<td>'.(isset($gift) && $gift ? "$gift&nbsp;%" : '').'</td>';
echo '</tr>'; echo '</tr>';
} }