diff --git a/public/include/pages/api/getdashboarddata.inc.php b/public/include/pages/api/getdashboarddata.inc.php index 7cca5770..1f8bdcbb 100644 --- a/public/include/pages/api/getdashboarddata.inc.php +++ b/public/include/pages/api/getdashboarddata.inc.php @@ -61,14 +61,9 @@ if ($config['payout_system'] != 'pps') { $aEstimates = $statistics->getUserEstimates($dPersonalSharerate, $dPersonalShareDifficulty, $user->getUserDonatePercent($user_id), $user->getUserNoFee($user_id), $statistics->getPPSValue()); } -$iTotalRoundShares = $aRoundShares['valid'] + $aRoundShares['invalid']; -if ($iTotalRoundShares > 0) { - $dUserInvalidPercent = round($aUserRoundShares['invalid'] / $iTotalRoundShares * 100, 2); - $dPoolInvalidPercent = round($aRoundShares['invalid'] / $iTotalRoundShares * 100, 2); -} else { - $dUserInvalidPercent = 0; - $dPoolInvalidPercent = 0; -} +// Round/user percentages +$aRoundShares['valid'] + $aRoundShares['invalid'] > 0 ? $dPoolInvalidPercent = round($aRoundShares['invalid'] / ($aRoundShares['valid'] + $aRoundShares['invalid']) * 100, 2) : $dPoolInvalidPercent = 0; +$aUserRoundShares['valid'] + $aUserRoundShares['valid'] > 0 ? $dUserInvalidPercent = round($aUserRoundShares['invalid'] / ($aUserRoundShares['valid'] + $aUserRoundShares['valid']) * 100, 2) : $dUserInvalidPercent = 0; // Apply pool modifiers $dPersonalHashrateAdjusted = $dPersonalHashrate * $dPersonalHashrateModifier; @@ -80,12 +75,9 @@ $aPrice = $setting->getValue('price'); // Round progress $iEstShares = $statistics->getEstimatedShares($dDifficulty); -if ($iEstShares > 0 && $aRoundShares['valid'] > 0) { - $dEstPercent = round(100 / $iEstShares * $aRoundShares['valid'], 2); -} else { - $dEstPercent = 0; -} +$iEstShares > 0 && $aRoundShares['valid'] > 0 ? $dEstPercent = round(100 / $iEstShares * $aRoundShares['valid'], 2) : $dEstPercent = 0; +// Some estimates $dExpectedTimePerBlock = $statistics->getNetworkExpectedTimePerBlock(); $dEstNextDifficulty = $statistics->getExpectedNextDifficulty(); $iBlocksUntilDiffChange = $statistics->getBlocksUntilDiffChange(); diff --git a/public/templates/mpos/dashboard/js_api.tpl b/public/templates/mpos/dashboard/js_api.tpl index 316dc3db..56897e58 100644 --- a/public/templates/mpos/dashboard/js_api.tpl +++ b/public/templates/mpos/dashboard/js_api.tpl @@ -135,12 +135,14 @@ $(document).ready(function(){ $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2))); $('#b-sharerate').html((parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2))); $('#b-yvalid').html(number_format(data.getdashboarddata.data.personal.shares.valid)); - $('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid) + " (" + data.getdashboarddata.data.personal.shares.invalid_percent + "%)" ); + $('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid) + " (" + number_format(data.getdashboarddata.data.personal.shares.invalid_percent, 2) + "%)" ); $('#b-pvalid').html(number_format(data.getdashboarddata.data.pool.shares.valid)); - $('#b-pivalid').html(number_format(data.getdashboarddata.data.pool.shares.invalid) + " (" + data.getdashboarddata.data.pool.shares.invalid_percent + "%)" ); + $('#b-pivalid').html(number_format(data.getdashboarddata.data.pool.shares.invalid) + " (" + number_format(data.getdashboarddata.data.pool.shares.invalid_percent, 2) + "%)" ); $('#b-diff').html(number_format(data.getdashboarddata.data.network.difficulty, 8)); $('#b-nextdiff').html(number_format(data.getdashboarddata.data.network.nextdifficulty, 8) + " (Change in " + data.getdashboarddata.data.network.blocksuntildiffchange + " Blocks)"); - $('#b-esttimeperblock').html(data.getdashboarddata.data.network.esttimeperblock + " seconds"); // <- this needs some nicer format + var minutes = Math.floor(data.getdashboarddata.data.network.esttimeperblock / 60); + var seconds = Math.floor(data.getdashboarddata.data.network.esttimeperblock - minutes * 60); + $('#b-esttimeperblock').html(minutes + " minutes " + seconds + " seconds"); // <- this needs some nicer format $('#b-nblock').html(data.getdashboarddata.data.network.block); $('#b-target').html(number_format(data.getdashboarddata.data.pool.shares.estimated) + " (done: " + data.getdashboarddata.data.pool.shares.progress + "%)" ); {/literal}{if $GLOBAL.config.payout_system != 'pps'}{literal } diff --git a/public/templates/mpos/dashboard/overview.tpl b/public/templates/mpos/dashboard/overview.tpl index 779b1db7..0aae5c56 100644 --- a/public/templates/mpos/dashboard/overview.tpl +++ b/public/templates/mpos/dashboard/overview.tpl @@ -1,5 +1,5 @@
-

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price}{/if} / Pool Workers: {$GLOBAL.workers}

+

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"}{/if} / Pool Workers: {$GLOBAL.workers}

diff --git a/public/templates/mpos/dashboard/payout_estimates.tpl b/public/templates/mpos/dashboard/payout_estimates.tpl index fa21b018..d103ca0e 100644 --- a/public/templates/mpos/dashboard/payout_estimates.tpl +++ b/public/templates/mpos/dashboard/payout_estimates.tpl @@ -5,39 +5,39 @@ {if $GLOBAL.config.payout_system != 'pps'} Block - {$GLOBAL.userdata.estimates.block} + {$GLOBAL.userdata.estimates.block|number_format:"8"} Fees - {$GLOBAL.userdata.estimates.fee} + {$GLOBAL.userdata.estimates.fee|number_format:"8"} Donation - {$GLOBAL.userdata.estimates.donation} + {$GLOBAL.userdata.estimates.donation|number_format:"8"} Payout - {$GLOBAL.userdata.estimates.payout} + {$GLOBAL.userdata.estimates.payout|number_format:"8"} {else} in 1 hour - {$GLOBAL.userdata.estimates.hours1|round:"8"} + {$GLOBAL.userdata.estimates.hours1|number_format:"8"} in 24 hours - {($GLOBAL.userdata.estimates.hours24)|round:"8"} + {($GLOBAL.userdata.estimates.hours24)|number_format:"8"} in 7 days - {($GLOBAL.userdata.estimates.days7)|round:"8"} + {($GLOBAL.userdata.estimates.days7)|number_format:"8"} in 14 days - {($GLOBAL.userdata.estimates.days14)|round:"8"} + {($GLOBAL.userdata.estimates.days14)|number_format:"8"} in 30 days - {($GLOBAL.userdata.estimates.days30)|round:"8"} + {($GLOBAL.userdata.estimates.days30)|number_format:"8"} {/if} diff --git a/public/templates/mpos/dashboard/round_shares.tpl b/public/templates/mpos/dashboard/round_shares.tpl index 89180073..8386345d 100644 --- a/public/templates/mpos/dashboard/round_shares.tpl +++ b/public/templates/mpos/dashboard/round_shares.tpl @@ -3,21 +3,21 @@ Est. Shares - {$ESTIMATES.shares} (done: {$ESTIMATES.percent}%) + {$ESTIMATES.shares|number_format} (done: {$ESTIMATES.percent}%) Pool Valid - {$GLOBAL.roundshares.valid} + {$GLOBAL.roundshares.valid|number_format} Your Valid - {$GLOBAL.userdata.shares.valid} + {$GLOBAL.userdata.shares.valid|number_format} Pool Invalid - {$GLOBAL.roundshares.invalid} + {$GLOBAL.roundshares.invalid|number_format} {if $GLOBAL.roundshares.valid > 0}({($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if} Your Invalid - {$GLOBAL.userdata.shares.invalid} + {$GLOBAL.userdata.shares.invalid|number_format} {if $GLOBAL.userdata.shares.valid > 0}({($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100)|number_format:"2"}%){else}(0.00%){/if}