report button fix / hide pplns stats

This commit is contained in:
obigal 2013-10-28 23:43:24 -04:00
parent 1aff62f636
commit 728b7c4f98
3 changed files with 17 additions and 6 deletions

View File

@ -8,12 +8,14 @@
<th class="right">Invalid</th>
<th class="right">Invalid %</th>
<th class="right">Round %</th>
{if $GLOBAL.config.payout_system == 'pplns'}
<th class="right">PPLNS Shares</th>
<th class="right">PPLNS Valid</th>
<th class="right">Invalid</th>
<th class="right">Invalid %</th>
<th class="right">PPLNS %</th>
<th class="right">Variance</th>
{/if}
<th class="right">Amount</th>
</tr>
</thead>
@ -52,6 +54,7 @@
<td class="right">{$REPORTDATA[txs]['user'].invalid|number_format|default:"0"}</td>
<td class="right">{if $REPORTDATA[txs]['user'].invalid > 0 }{($REPORTDATA[txs]['user'].invalid / $REPORTDATA[txs]['user'].valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td class="right">{if $REPORTDATA[txs]['user'].valid > 0 }{(( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid)|number_format:"2"}{else}0.00{/if}</td>
{if $GLOBAL.config.payout_system == 'pplns'}
<td class="right">{$REPORTDATA[txs].pplns_shares|number_format|default:"0"}</td>
<td class="right">{$REPORTDATA[txs]['user'].pplns_valid|number_format|default:"0"}</td>
<td class="right">{$REPORTDATA[txs]['user'].pplns_invalid|number_format|default:"0"}</td>
@ -59,6 +62,7 @@
<td class="right">{if $REPORTDATA[txs].shares > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{(( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td class="right">{if $REPORTDATA[txs]['user'].valid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{math assign="percentage1" equation=(100 / ((( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid) / (( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)))}{else if $REPORTDATA[txs]['user'].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if}
<font color="{if ($percentage1 >= 100)}green{else}red{/if}">{$percentage1|number_format:"2"|default:"0"}</font></b></td>
{/if}
<td class="right">{$REPORTDATA[txs].user_credit|default:"0"|number_format:"8"}</td>
{assign var=percentage1 value=0}
</tr>
@ -70,6 +74,7 @@
<td class="right">{$totalinvalid|number_format}</td>
<td class="right">{if $totalinvalid > 0 && $totalvalid > 0 }{($totalinvalid / $totalvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td class="right">{if $usertotalshares > 0 && $totalvalid > 0}{(( 100 / $usertotalshares) * $totalvalid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
{if $GLOBAL.config.payout_system == 'pplns'}
<td class="right">{$pplnsshares|number_format}</td>
<td class="right">{$pplnsvalid|number_format}</td>
<td class="right">{$pplnsinvalid|number_format}</td>
@ -77,6 +82,7 @@
<td class="right">{if $userpplnsshares > 0 && $pplnsvalid > 0}{(( 100 / $userpplnsshares) * $pplnsvalid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td class="right">{if $totalvalid > 0 && $pplnsvalid > 0}{math assign="percentage2" equation=(100 / ((( 100 / $usertotalshares) * $totalvalid) / (( 100 / $userpplnsshares) * $pplnsvalid)))}{else if $pplnsvalid == 0}{assign var=percentage2 value=0}{else}{assign var=percentage2 value=100}{/if}
<font color="{if ($percentage2 >= 100)}green{else}red{/if}">{$percentage2|number_format:"2"|default:"0"}</font></b></td>
{/if}
<td class="right">{$amount|default:"0"|number_format:"8"}</td>
{assign var=percentage2 value=0}
</tr>

View File

@ -35,15 +35,14 @@
<input type="text" class="pin" name="search" value="{$HEIGHT|default:"%"}">
</fieldset>
</td>
<td align="center"><b>SHOW EMPTY ROUNDS</b><br><br>
<span class="toggle">
<label for="Show empty rounds">
<td align="center"><b>SHOW EMPTY ROUNDS</b><br><br>
<span class="toggle">
<label for="filter">
<input type="checkbox" class="ios-switch" name="filter" value="1" id="filter" {if $FILTER}checked{/if} />
<div class="switch"></div>
</label>
</span>
</td>
</span>
</td>
</tbody>
</table>
<footer>

View File

@ -9,12 +9,14 @@
<th align="right">Invalid</th>
<th align="right">Invalid %</th>
<th align="right">Round %</th>
{if $GLOBAL.config.payout_system == 'pplns'}
<th align="right">PPLNS Shares</th>
<th align="right">PPLNS Valid</th>
<th align="right">Invalid</th>
<th align="right">Invalid %</th>
<th align="right">PPLNS %</th>
<th align="right">Variance</th>
{/if}
<th align="right" style="padding-right: 25px;">Amount</th>
</tr>
</thead>
@ -53,6 +55,7 @@
<td align="right">{$REPORTDATA[txs]['user'].invalid|number_format|default:"0"}</td>
<td align="right">{if $REPORTDATA[txs]['user'].invalid > 0 }{($REPORTDATA[txs]['user'].invalid / $REPORTDATA[txs]['user'].valid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td align="right">{if $REPORTDATA[txs]['user'].valid > 0 }{(( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid)|number_format:"2"}{else}0.00{/if}</td>
{if $GLOBAL.config.payout_system == 'pplns'}
<td align="right">{$REPORTDATA[txs].pplns_shares|number_format|default:"0"}</td>
<td align="right">{$REPORTDATA[txs]['user'].pplns_valid|number_format|default:"0"}</td>
<td align="right">{$REPORTDATA[txs]['user'].pplns_invalid|number_format|default:"0"}</td>
@ -60,6 +63,7 @@
<td align="right">{if $REPORTDATA[txs].shares > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{(( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td align="right">{if $REPORTDATA[txs]['user'].valid > 0 && $REPORTDATA[txs]['user'].pplns_valid > 0}{math assign="percentage1" equation=(100 / ((( 100 / $REPORTDATA[txs].shares) * $REPORTDATA[txs]['user'].valid) / (( 100 / $REPORTDATA[txs].pplns_shares) * $REPORTDATA[txs]['user'].pplns_valid)))}{else if $REPORTDATA[txs]['user'].pplns_valid == 0}{assign var=percentage1 value=0}{else}{assign var=percentage1 value=100}{/if}
<font color="{if ($percentage1 >= 100)}green{else}red{/if}">{$percentage1|number_format:"2"|default:"0"}</font></b></td>
{/if}
<td align="right" style="padding-right: 25px;">{$REPORTDATA[txs].user_credit|default:"0"|number_format:"8"}</td>
{assign var=percentage1 value=0}
</tr>
@ -71,6 +75,7 @@
<td align="right">{$totalinvalid|number_format}</td>
<td align="right">{if $totalinvalid > 0 && $totalvalid > 0 }{($totalinvalid / $totalvalid * 100)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td align="right">{if $usertotalshares > 0 && $totalvalid > 0}{(( 100 / $usertotalshares) * $totalvalid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
{if $GLOBAL.config.payout_system == 'pplns'}
<td align="right">{$pplnsshares|number_format}</td>
<td align="right">{$pplnsvalid|number_format}</td>
<td align="right">{$pplnsinvalid|number_format}</td>
@ -78,6 +83,7 @@
<td align="right">{if $userpplnsshares > 0 && $pplnsvalid > 0}{(( 100 / $userpplnsshares) * $pplnsvalid)|number_format:"2"|default:"0"}{else}0.00{/if}</td>
<td align="right">{if $totalvalid > 0 && $pplnsvalid > 0}{math assign="percentage2" equation=(100 / ((( 100 / $usertotalshares) * $totalvalid) / (( 100 / $userpplnsshares) * $pplnsvalid)))}{else if $pplnsvalid == 0}{assign var=percentage2 value=0}{else}{assign var=percentage2 value=100}{/if}
<font color="{if ($percentage2 >= 100)}green{else}red{/if}">{$percentage2|number_format:"2"|default:"0"}</font></b></td>
{/if}
<td align="right" style="padding-right: 25px;">{$amount|default:"0"|number_format:"8"}</td>
{assign var=percentage2 value=0}
</tr>