RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] At least two decimals for hashrates

Browse Source
This commit is contained in:
Sebastian Grewe 2014-03-04 17:39:17 +01:00
parent 35bef0f00a
commit 65754183a0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/templates/bootstrap/dashboard/js_api.tpl
View File

@ -9,9 +9,9 @@ $(document).ready(function(){
var url_balance = "{/literal}{$smarty.server.SCRIPT_NAME}?page=api&action=getuserbalance&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}";
// Load initial sparkline values // Load initial sparkline values
var storedPersonalHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"0"}{literal} ]; var storedPersonalHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.hashrate|number_format:"2"}{literal} ];
var storedPersonalSharerate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.userdata.sharerate|number_format:"2"}{literal} ]; 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 storedPoolHashrate = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.hashrate|number_format:"2"}{literal} ];
var storedPoolWorkers = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {/literal}{$GLOBAL.workers}{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} ]; 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} ];
@ -42,11 +42,11 @@ $(document).ready(function(){
function refreshInformation(data) { function refreshInformation(data) {
// Drop one value, add the latest new one to each array // Drop one value, add the latest new one to each array
storedPersonalHashrate.shift(); storedPersonalHashrate.shift();
storedPersonalHashrate.push(parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(0)) storedPersonalHashrate.push(parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2))
storedPersonalSharerate.shift(); storedPersonalSharerate.shift();
storedPersonalSharerate.push(parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2)) storedPersonalSharerate.push(parseFloat(data.getdashboarddata.data.personal.sharerate).toFixed(2))
storedPoolHashrate.shift(); storedPoolHashrate.shift();
storedPoolHashrate.push(parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0)) storedPoolHashrate.push(parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2))
storedPoolWorkers.shift(); storedPoolWorkers.shift();
storedPoolWorkers.push(parseFloat(data.getdashboarddata.data.pool.workers).toFixed(8)); storedPoolWorkers.push(parseFloat(data.getdashboarddata.data.pool.workers).toFixed(8));
storedCoinPrice.shift(); storedCoinPrice.shift();
@ -63,8 +63,8 @@ $(document).ready(function(){
function refreshStaticData(data) { function refreshStaticData(data) {
$('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8))); $('#b-price').html((parseFloat(data.getdashboarddata.data.pool.price).toFixed(8)));
$('#b-poolworkers').html(data.getdashboarddata.data.pool.workers); $('#b-poolworkers').html(data.getdashboarddata.data.pool.workers);
$('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(0))) + " " + data.getdashboarddata.data.personal.modifier; $('#b-hashrate').html((parseFloat(data.getdashboarddata.data.personal.hashrate).toFixed(2)));
$('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(0))); $('#b-poolhashrate').html((parseFloat(data.getdashboarddata.data.pool.hashrate).toFixed(2)));
$('#b-sharerate').html((parseFloat(data.getdashboarddata.data.personal.sharerate).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-yvalid').html(number_format(data.getdashboarddata.data.personal.shares.valid));
$('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid)); $('#b-yivalid').html(number_format(data.getdashboarddata.data.personal.shares.invalid));

4
public/templates/bootstrap/dashboard/overview.tpl
View File

@ -8,7 +8,7 @@
<li class="bg-default"> <li class="bg-default">
<div class="sparklines-stats-showcase"> <div class="sparklines-stats-showcase">
<span>My Hashrate {$GLOBAL.hashunits.personal}</span> <span>My Hashrate {$GLOBAL.hashunits.personal}</span>
<h2 id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"0"}</h2> <h2 id="b-hashrate">{$GLOBAL.userdata.hashrate|number_format:"2"}</h2>
</div> </div>
<div class="personal-hashrate-bar chart"></div> <div class="personal-hashrate-bar chart"></div>
</li> </li>
@ -22,7 +22,7 @@
<li class="bg-default"> <li class="bg-default">
<div class="sparklines-stats-showcase"> <div class="sparklines-stats-showcase">
<span>Pool Hashrate {$GLOBAL.hashunits.pool}</span> <span>Pool Hashrate {$GLOBAL.hashunits.pool}</span>
<h2 id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"0"}</h2> <h2 id="b-poolhashrate">{$GLOBAL.hashrate|number_format:"2"}</h2>
</div> </div>
<div class="pool-hashrate-bar chart"></div> <div class="pool-hashrate-bar chart"></div>
</li> </li>