diff --git a/pool/page_allwork.php b/pool/page_allwork.php index e289e8ac..bb1fb3a6 100644 --- a/pool/page_allwork.php +++ b/pool/page_allwork.php @@ -6,7 +6,7 @@ function doallwork($data, $user) { $pg = '

All Workers

'; - $pg .= "\n"; + $pg .= worktable(); $totshare = 0; $totdiff = 0; diff --git a/pool/page_workers.php b/pool/page_workers.php index 78173010..b7b50c27 100644 --- a/pool/page_workers.php +++ b/pool/page_workers.php @@ -1,5 +1,16 @@ \n"; + $pg .= "function wkdet(n,i){var t=document.getElementById(n);if(i&&t){var b,cs,j,c,a;b=i.checked;cs=t.getElementsByTagName('td');for(j=0;c=cs[j];j++) +{a=c.getAttribute('data-hid');if(a){if(b){c.className=a}else{c.className='hid'}}}}}"; + $pg .= "\n"; + $pg .= "Show Details for Invalids:
"; + $pg .= "
\n"; + return $pg; +} +# function worktitle($data, $user) { addSort(); @@ -13,8 +24,12 @@ function worktitle($data, $user) $pg .= ""; $pg .= ''; $pg .= ""; - $pg .= ''; - $pg .= ""; + $pg .= ""; + $pg .= ""; + $pg .= ""; + $pg .= ""; + $pg .= ''; + $pg .= ""; $pg .= "\n"; return $pg; } @@ -66,6 +81,14 @@ function workuser($data, $user, &$offset, &$totshare, &$totdiff, 'w_shareacc' => $ans['w_shareacc:'.$i], 'w_diffacc' => $ans['w_diffacc:'.$i], 'w_diffinv' => $ans['w_diffinv:'.$i], + 'w_diffsta' => $ans['w_diffsta:'.$i], + 'w_diffdup' => $ans['w_diffdup:'.$i], + 'w_diffhi' => $ans['w_diffhi:'.$i], + 'w_diffrej' => $ans['w_diffrej:'.$i], + 'w_sharesta' => $ans['w_sharesta:'.$i], + 'w_sharedup' => $ans['w_sharedup:'.$i], + 'w_sharehi' => $ans['w_sharehi:'.$i], + 'w_sharerej' => $ans['w_sharerej:'.$i], 'w_lastdiff' => $ans['w_lastdiff:'.$i], 'w_active_diffacc' => $ans['w_active_diffacc:'.$i], 'w_active_start' => $ans['w_active_start:'.$i], @@ -143,6 +166,15 @@ function workuser($data, $user, &$offset, &$totshare, &$totdiff, $pg .= ""; + foreach(array('sta','dup','hi','rej') as $fld) + { + $shr = number_format($all[$i]['w_share'.$fld]); + $dif = $all[$i]['w_diff'.$fld]; + $ddif = number_format($dif); + $sdif = number_format($dif,0,'',''); + $pg .= ""; + } + if ($blockacc <= 0) $blkpct = ' '; else @@ -198,6 +230,7 @@ function worktotal($offset, $totshare, $totdiff, $totshrate, $totinvalid, $blkpct = ' '; else $blkpct = number_format(100.0 * $totdiff / $blockacc, 3) . '%'; + $pg .= ""; $pg .= ""; $pg .= "\n"; return $pg; @@ -207,7 +240,7 @@ function doworker($data, $user) { $title = ''; - $pg = "
<$r id=srtshrate data-sf=r5>:Share Rate«Elapsed<$r id=srtinv data-sf=r7>:InvalidBlock %<$r id=srtrate data-sf=r9>:Hash Rate<$r id=srtstale data-sf=r8>:Stale<$r id=srtdup data-sf=r9>:Duplicate<$r id=srthi data-sf=r10>:High<$r id=srtreject data-sf=r11>:RejectBlock %<$r id=srtrate data-sf=r13>:Hash Rate
$rej%$ddif/$shr $blkpct$totrate
\n"; + $pg = worktable(); $totshare = 0; $totdiff = 0;