diff --git a/public/templates/bootstrap/dashboard/default.tpl b/public/templates/bootstrap/dashboard/default.tpl index d67039a4..866a031c 100644 --- a/public/templates/bootstrap/dashboard/default.tpl +++ b/public/templates/bootstrap/dashboard/default.tpl @@ -1,7 +1,7 @@ {if $smarty.session.AUTHENTICATED|default}
{include file="dashboard/overview.tpl"} - {include file="dashboard/system_stats.tpl"} + {include file="dashboard/round_stats.tpl"} {include file="dashboard/account_data.tpl"}
{if !$DISABLED_DASHBOARD and !$DISABLED_DASHBOARD_API} diff --git a/public/templates/bootstrap/dashboard/js_api.tpl b/public/templates/bootstrap/dashboard/js_api.tpl index bc9f17e9..39c27bca 100644 --- a/public/templates/bootstrap/dashboard/js_api.tpl +++ b/public/templates/bootstrap/dashboard/js_api.tpl @@ -13,22 +13,31 @@ $(document).ready(function(){ var storedPersonalSharerate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ]; var storedPoolHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"0"}{literal} ]; var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ]; + var storedCoinPrice = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.price}{literal} ]; // Sparkline options applied to all graphs - var sparklineOptions = { + var sparklineBarOptions = { type: 'bar', - barColor: 'green', height: '35', barWidth: 6, barSpacing: 2, chartRangeMin: 0 }; + // Sparkline options applied to line graphs + var sparklineLineOptions = { + height: '35', + chartRangeMin: 0, + composite: false, + lineColor: 'black' + }; + // Draw our sparkline graphs with our current static content - $('.personal-hashrate-bar').sparkline(storedPersonalHashrate, sparklineOptions); - $('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineOptions); - $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineOptions); - $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineOptions); + $('.personal-hashrate-bar').sparkline(storedPersonalHashrate, sparklineBarOptions); + $('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineBarOptions); + $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions); + $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions); + $('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions); function refreshInformation(data) { // Drop one value, add the latest new one to each array @@ -39,12 +48,15 @@ $(document).ready(function(){ storedPoolHashrate.shift(); storedPoolHashrate.push(parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0)) storedPoolWorkers.shift(); - storedPoolWorkers.push(data.getdashboarddata.data.pool.workers); + storedPoolWorkers.push(parseFloat(data.getdashboarddata.data.pool.workers).toFixed(8)); + storedCoinPrice.shift(); + storedCoinPrice.push(parseFloat(data.getdashboarddata.data.pool.price).toFixed(8)); // Redraw all bar graphs - $('.personal-hashrate-bar').sparkline(storedPersonalHashrate, sparklineOptions); - $('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineOptions); - $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineOptions); - $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineOptions); + $('.personal-hashrate-bar').sparkline(storedPersonalHashrate, sparklineBarOptions); + $('.personal-sharerate-bar').sparkline(storedPersonalSharerate, sparklineBarOptions); + $('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineBarOptions); + $('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineBarOptions); + $('.coin-price-line').sparkline(storedCoinPrice, sparklineLineOptions); } // Refresh other static numbers on the template @@ -55,16 +67,18 @@ $(document).ready(function(){ $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0))); $('#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) + " (" + number_format(data.getdashboarddata.data.personal.shares.invalid_percent, 2) + "%)" ); + $('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid)); + $('#b-yefficiency').html(number_format(100 - 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) + " (" + number_format(data.getdashboarddata.data.pool.shares.invalid_percent, 2) + "%)" ); + $('#b-pivalid').html(number_format(data.getdashboarddata.data.pool.shares.invalid)); + $('#b-pefficiency').html(number_format(100 - 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)"); 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 + "%)" ); + $('#b-roundprogress').html(number_format(data.getdashboarddata.data.pool.shares.progress + "%" )); {/literal}{if $GLOBAL.config.payout_system != 'pps'}{literal } $('#b-payout').html(number_format(data.getdashboarddata.data.personal.estimates.payout, 8)); $('#b-block').html(number_format(data.getdashboarddata.data.personal.estimates.block, 8)); diff --git a/public/templates/bootstrap/dashboard/overview.tpl b/public/templates/bootstrap/dashboard/overview.tpl index 4d888949..49fb0563 100644 --- a/public/templates/bootstrap/dashboard/overview.tpl +++ b/public/templates/bootstrap/dashboard/overview.tpl @@ -1,7 +1,7 @@
-

Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: {$GLOBAL.price|number_format:"8"|default:"0"}{/if}

+

Statistics

    @@ -33,10 +33,19 @@
+ {if $GLOBAL.config.price.currency != ""} +
  • +
    + {$GLOBAL.config.currency}/{$GLOBAL.config.price.currency} +

    {$GLOBAL.price|default:"0"|number_format:"8"}

    +
    +
    +
  • + {/if}
    diff --git a/public/templates/bootstrap/dashboard/round_stats.tpl b/public/templates/bootstrap/dashboard/round_stats.tpl new file mode 100644 index 00000000..6f1a05c6 --- /dev/null +++ b/public/templates/bootstrap/dashboard/round_stats.tpl @@ -0,0 +1,56 @@ +
    +
    +
    +

    + Round statistics +

    +
    + + + + + + + + + + + + + + + + + + + + + + + +

    Round Shares

    Valid

    Invalid

    Efficiency

    My Shares

    {$GLOBAL.userdata.shares.valid|number_format}

    {$GLOBAL.userdata.shares.invalid|number_format}

    +

    {if $GLOBAL.userdata.shares.valid > 0}{(100 - ($GLOBAL.userdata.shares.invalid / ($GLOBAL.userdata.shares.valid + $GLOBAL.userdata.shares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}

    +

    Pool Shares

    {$GLOBAL.roundshares.valid|number_format}

    +

    {$GLOBAL.roundshares.invalid|number_format}

    +

    {if $GLOBAL.roundshares.valid > 0}{(100 - ($GLOBAL.roundshares.invalid / ($GLOBAL.roundshares.valid + $GLOBAL.roundshares.invalid) * 100))|number_format:"2"}%{else}0.00%{/if}

    +

    + +
    +