[UPDATE] Number formatting

This commit is contained in:
Sebastian Grewe 2014-03-02 10:43:32 +01:00
parent 5e6bf2e765
commit 14c9f00d8c
2 changed files with 11 additions and 5 deletions

View File

@ -8,9 +8,12 @@ $(document).ready(function(){
var url_worker = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getuserworkers&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}";
var url_balance = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getuserbalance&api_key={$GLOBAL.userdata.api_key}&id={$GLOBAL.userdata.id}{literal}";
var storedPersonalHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate}{literal} ];
var storedPoolHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate}{literal} ];
// Load initial sparkline values
var storedPersonalHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"2"}{literal} ];
var storedPoolHashrate = [ 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ];
var storedPoolWorkers = [ 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{literal} ];
// Sparkline options applied to all graphs
var sparklineOptions = {
type: 'bar',
barColor: 'green',
@ -18,8 +21,10 @@ $(document).ready(function(){
width: '150px',
barWidth: 10
};
// Draw our sparkline graphs
$('.personal-hashrate-bar').sparkline(storedPersonalHashrate, sparklineOptions);
$('.pool-hasrate-bar').sparkline(storedPoolHashrate, sparklineOptions);
$('.pool-hashrate-bar').sparkline(storedPoolHashrate, sparklineOptions);
$('.pool-workers-bar').sparkline(storedPoolWorkers, sparklineOptions);
function refreshInformation(data) {
@ -39,6 +44,7 @@ $(document).ready(function(){
$('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8)));
$('#b-dworkers').html(data.getdashboarddata.data.pool.workers);
$('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2)));
$('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.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) + " (" + number_format(data.getdashboarddata.data.personal.shares.invalid_percent, 2) + "%)" );

View File

@ -4,9 +4,9 @@
<h4 class="panel-title">Overview {if $GLOBAL.config.price.currency}{$GLOBAL.config.currency}/{$GLOBAL.config.price.currency}: <span id="b-price">{$GLOBAL.price|number_format:"8"|default:"0"}</span>{/if} / Pool Workers: <span id="b-dworkers">{$GLOBAL.workers}</span></h4>
</div>
<div class="panel-body">
<div>My Hashrate <span id="b-hashrate">{$GLOBAL.userdata.hashrate}</span></span>&nbsp;&nbsp;<span class="personal-hashrate-bar"></div>
<div>My Hashrate <span id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</span></span>&nbsp;&nbsp;<span class="personal-hashrate-bar"></div>
<br>
<div><span>Pool Hashrate <span id="b-poolhashrate">{$GLOBAL.hashrate}</span></span>&nbsp;&nbsp;<span class="pool-hashrate-bar"></div>
<div><span>Pool Hashrate <span id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</span></span>&nbsp;&nbsp;<span class="pool-hashrate-bar"></div>
<br>
<div><span>Pool Workers <span id="b-poolworkers">{$GLOBAL.workers}</span></span>&nbsp;&nbsp;<span class="pool-workers-bar"></div>
</div>