diff --git a/public/css/style.scss b/public/css/style.scss index 0940658..d20531f 100644 --- a/public/css/style.scss +++ b/public/css/style.scss @@ -595,7 +595,7 @@ tr { margin-left: 10px; } -.header-panel span { +.header-panel span:not(.decimal) { margin: 0 5px 0 5px; top: 0; } diff --git a/views/address.pug b/views/address.pug index ce2f852..ca253dc 100644 --- a/views/address.pug +++ b/views/address.pug @@ -1,11 +1,11 @@ extends layout block content - - var balance = ((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var balance = Number((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var balanceParts = balance.split('.'); - - var sent = (address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var sent = Number(address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var sentParts = sent.split('.'); - - var received = (address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var received = Number(address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var receivedParts = received.split('.'); if address.a_id !== 'coinbase' || settings.show_sent_received == true script. diff --git a/views/block.pug b/views/block.pug index 80731a5..6949c78 100644 --- a/views/block.pug +++ b/views/block.pug @@ -51,40 +51,47 @@ block content th.text-center #{settings.locale.nonce} th.text-center #{settings.locale.timestamp} tbody + - var difficulty = Number(block.difficulty).toLocaleString('en',{'minimumFractionDigits':4,'maximumFractionDigits':4,'useGrouping':true}); + - var splitDifficulty = difficulty.split('.'); + - var block_size = Number(block.size/1024).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':true}); + - var splitBlockSize = block_size.split('.'); if block.confirmations >= confirmations tr.bg-success.text-dark - - var block_size = block.size/1024 td.text-center=block.height - td.text-center=Number(block.difficulty).toFixed(4) + td.text-center #{splitDifficulty[0]}. + span.decimal #{splitDifficulty[1]} td.text-center=block.confirmations if settings.heavy == true td.text-center=block.vote - td.text-center=block_size.toFixed(2) + td.text-center #{splitBlockSize[0]}. + span.decimal #{splitBlockSize[1]} td.text-center=block.bits td.text-center=block.nonce td.text-center=time else if block.confirmations < (confirmations / 2) tr.bg-danger - - var block_size = block.size/1024 td.text-center=block.height - td.text-center=Number(block.difficulty).toFixed(4) + td.text-center #{splitDifficulty[0]}. + span.decimal #{splitDifficulty[1]} td.text-center=block.confirmations if settings.heavy == true td.text-center=block.vote - td.text-center=block_size.toFixed(2) + td.text-center #{splitBlockSize[0]}. + span.decimal #{splitBlockSize[1]} td.text-center=block.bits td.text-center=block.nonce td.text-center=time else tr.table-warning - - var block_size = block.size/1024 td.text-center=block.height - td.text-center=Number(block.difficulty).toFixed(4) + td.text-center #{splitDifficulty[0]}. + span.decimal #{splitDifficulty[1]} td.text-center=block.confirmations if settings.heavy == true td.text-center=block.vote - td.text-center=block_size.toFixed(2) + td.text-center #{splitBlockSize[0]}. + span.decimal #{splitBlockSize[1]} td.text-center=block.bits td.text-center=block.nonce td.text-center=time @@ -113,12 +120,12 @@ block content a.breakWord(href='/tx/' + txn.txid) #{txn.txid} td.text-center #{txn.vout.length} if txn.vout.length > 0 - - var total = (txn.total / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(txn.total / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split('.'); td.text-center #{totalParts[0]}. span.decimal #{totalParts[1]} else - - var total = (txn.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(txn.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split('.'); td.text-center #{totalParts[0]}. span.decimal #{totalParts[1]} \ No newline at end of file diff --git a/views/claim_address.pug b/views/claim_address.pug index 98bd7f6..c49b353 100644 --- a/views/claim_address.pug +++ b/views/claim_address.pug @@ -38,11 +38,11 @@ block content } }); }); - - var balance = ((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var balance = Number((address.received - address.sent) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var balanceParts = balance.split('.'); - - var sent = (address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var sent = Number(address.sent /100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var sentParts = sent.split('.'); - - var received = (address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var received = Number(address.received / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var receivedParts = received.split('.'); if address.a_id !== 'coinbase' || settings.show_sent_received == true script. diff --git a/views/includes/address_history.pug b/views/includes/address_history.pug index 372dc6e..b190317 100644 --- a/views/includes/address_history.pug +++ b/views/includes/address_history.pug @@ -45,7 +45,7 @@ script. var txhash = data[1]; //variables for better readability var out = data[2]; //variables for better readability var vin = data[3]; //variables for better readability - var balance = (data[4] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability + var balance = Number(data[4] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability var balanceParts = balance.split('.'); $("td:eq(0)", row).html('').addClass('text-center d-table-cell d-md-none'); $("td:eq(1)", row).html('' + txhash + '').addClass('breakWord d-none d-md-table-cell'); @@ -54,9 +54,9 @@ script. var rowclass = 'info'; if (out > 0 && vin > 0) { - amount = (out - vin) / 100000000; + amount = Number((out - vin) / 100000000); if (amount < 0) { - amount = (amount * -1).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + amount = Number(amount * -1).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); updown = '-'; } else if (amount > 0) { amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); @@ -65,11 +65,11 @@ script. amount = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); } } else if (out > 0) { - amount = (out / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + amount = Number(out / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); updown = '+'; rowclass = 'bg-success'; } else { - amount = (vin / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + amount = Number(vin / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); updown = '-'; rowclass = 'bg-danger'; } diff --git a/views/includes/rl_balance.pug b/views/includes/rl_balance.pug index 389b731..9467e77 100644 --- a/views/includes/rl_balance.pug +++ b/views/includes/rl_balance.pug @@ -16,8 +16,9 @@ each address in balance - count = count + 1; - var itemFixed = (parseInt(address.balance) / 100000000); - - var itemFixedParts = itemFixed.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split("."); - - var percentage = (itemFixed / stats.supply) * 100; + - var itemFixedParts = Number(itemFixed).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split("."); + - var percent = Number((itemFixed / stats.supply) * 100).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); tr td.text-center =count @@ -29,5 +30,5 @@ include ./rl_labels.pug td.text-center #{itemFixedParts[0]}. span.decimal #{itemFixedParts[1]} - td.text-center - =percentage.toFixed(2) \ No newline at end of file + td.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} \ No newline at end of file diff --git a/views/includes/rl_received.pug b/views/includes/rl_received.pug index acd8e17..baf96a0 100644 --- a/views/includes/rl_received.pug +++ b/views/includes/rl_received.pug @@ -14,7 +14,7 @@ - var count = 0; each address in received - count = count + 1; - - var itemFixed = (parseInt(address.received) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var itemFixed = Number(parseInt(address.received) / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var itemFixedParts = itemFixed.split("."); tr td.text-center diff --git a/views/index.pug b/views/index.pug index a443c75..a8686d6 100644 --- a/views/index.pug +++ b/views/index.pug @@ -47,7 +47,7 @@ block content var blockhash = data[1]; //variables for better readability var txhash = data[2]; //variables for better readability var outputs = data[3]; //variables for better readability - var amount = (data[4] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability + var amount = Number(data[4] / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); //variables for better readability var amountParts = amount.split('.'); var amount = amountParts[0] + '.' + amountParts[1] + ''; var timestamp = data[5]; diff --git a/views/layout.pug b/views/layout.pug index e3021cb..2de54aa 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -127,24 +127,44 @@ html(lang='en') var supplyString = json.data[0].supply; var diffString = json.data[0].difficulty; var hashrateString = json.data[0].hashrate; + var splitValue, splitParts; if (!isNaN(json.data[0].difficulty)) - diffString = parseFloat(json.data[0].difficulty).toFixed(2); + diffString = Number(json.data[0].difficulty).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':true}); if (!isNaN(json.data[0].supply)) supplyString = parseInt(parseFloat(json.data[0].supply).toFixed(0)).toLocaleString('en'); if (!isNaN(json.data[0].hashrate)) - hashrateString = parseFloat(json.data[0].hashrate).toLocaleString('en'); + hashrateString = Number(json.data[0].hashrate).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); $("#lblX1").text(' '); + $("#supply").text(supplyString); - $("#marketCap").html((parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en') + '' + '#{settings.markets.exchange}'.toUpperCase() + ''); + + splitValue = Number(parseFloat(json.data[0].lastPrice).toFixed(8) * parseInt(parseFloat(json.data[0].supply).toFixed(0))).toLocaleString('en'); + splitParts = splitValue.split('.'); + $("#marketCap").html(splitParts[0] + '.' + splitParts[1] + '' + '#{settings.markets.exchange}'.toUpperCase() + ''); showTopPanelData('supplypanel', 'supplyPanelLoading'); - $("#difficulty").text(diffString); - $("#difficultyHybrid").text(json.data[0].difficultyHybrid); + + splitParts = diffString.split('.'); + $("#difficulty").html(splitParts[0] + '.' + splitParts[1] + ''); + + if (json.data[0].difficultyHybrid == null || json.data[0].difficultyHybrid == '') { + $("#difficultyHybrid").html('0.00'); + } else { + splitValue = Number(json.data[0].difficultyHybrid).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + splitParts = splitValue.split('.'); + $("#difficultyHybrid").html(splitParts[0] + '.' + splitParts[1] + ''); + } + showTopPanelData('difficultypanel', 'difficultyPanelLoading'); - $("#hashrate").text(hashrateString); + + splitParts = hashrateString.split('.'); + $("#hashrate").html(splitParts[0] + '.' + splitParts[1] + ''); showTopPanelData('hashratepanel', 'hashratePanelLoading'); - $("#lastPrice").text(parseFloat(json.data[0].lastPrice).toFixed(8)); + + splitValue = Number(json.data[0].lastPrice).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + splitParts = splitValue.split('.'); + $("#lastPrice").html(splitParts[0] + '.' + splitParts[1] + ''); showTopPanelData('pricepanel', 'pricePanelLoading'); $("#lblConnections").text(json.data[0].connections + ' connections'); diff --git a/views/market.pug b/views/market.pug index 63aec0f..b53790d 100644 --- a/views/market.pug +++ b/views/market.pug @@ -150,33 +150,68 @@ block content tbody tr if marketdata.data.summary.high != null - td.text-center #{parseFloat(marketdata.data.summary.high).toFixed(8)} + - var highValue = Number(marketdata.data.summary.high).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitHigh = highValue.split("."); + td.text-center #{splitHigh[0]}. + span.decimal #{splitHigh[1]} if marketdata.data.summary.low != null - td.text-center #{parseFloat(marketdata.data.summary.low).toFixed(8)} + - var lowValue = Number(marketdata.data.summary.low).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitLow = lowValue.split("."); + td.text-center #{splitLow[0]}. + span.decimal #{splitLow[1]} if marketdata.data.summary.volume != null - td.text-center #{parseFloat(marketdata.data.summary.volume).toFixed(8)} + - var volumeValue = Number(marketdata.data.summary.volume).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitVolume = volumeValue.split("."); + td.text-center #{splitVolume[0]}. + span.decimal #{splitVolume[1]} if marketdata.data.summary.volume_btc != null - td.text-center #{parseFloat(marketdata.data.summary.volume_btc).toFixed(8)} + - var volumeBTCValue = Number(marketdata.data.summary.volume_btc).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitVolumeBTC = volumeBTCValue.split("."); + td.text-center #{splitVolumeBTC[0]}. + span.decimal #{splitVolumeBTC[1]} if marketdata.data.summary.bid != null - td.text-center #{parseFloat(marketdata.data.summary.bid).toFixed(8)} + - var bidValue = Number(marketdata.data.summary.bid).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitBid = bidValue.split("."); + td.text-center #{splitBid[0]}. + span.decimal #{splitBid[1]} if marketdata.data.summary.ask != null - td.text-center #{parseFloat(marketdata.data.summary.ask).toFixed(8)} + - var askValue = Number(marketdata.data.summary.ask).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitAsk = askValue.split("."); + td.text-center #{splitAsk[0]}. + span.decimal #{splitAsk[1]} if marketdata.data.summary.last != null - td.text-center #{parseFloat(marketdata.data.summary.last).toFixed(8)} + - var lastValue = Number(marketdata.data.summary.last).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitLast = lastValue.split("."); + td.text-center #{splitLast[0]}. + span.decimal #{splitLast[1]} if marketdata.data.summary.prev != null - td.text-center #{parseFloat(marketdata.data.summary.prev).toFixed(8)} + - var prevValue = Number(marketdata.data.summary.prev).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitPrev = prevValue.split("."); + td.text-center #{splitPrev[0]}. + span.decimal #{splitPrev[1]} if marketdata.data.summary.change != null || (marketdata.data.summary.last != null && marketdata.data.summary.prev != null) if marketdata.data.summary.change != null if marketdata.data.summary.change == '' || marketdata.data.summary.change == '-' - td.text-center.font-weight-bold 0.00 % + td.text-center.font-weight-bold 0. + span.decimal 00 + span % else - - var price_change = parseFloat(marketdata.data.summary.change).toFixed(2); + - var price_change = Number(marketdata.data.summary.change).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':true}); else - - var price_change = (100 - ((parseFloat(marketdata.data.summary.prev) / parseFloat(marketdata.data.summary.last)) * 100)).toFixed(2); - if price_change >= 0 - td.text-center.text-success.font-weight-bold +#{price_change} % + - var price_change = Number((100 - ((parseFloat(marketdata.data.summary.prev) / parseFloat(marketdata.data.summary.last)) * 100))).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':true}); + - var splitChange = price_change.split("."); + if price_change > 0 + td.text-center.text-success.font-weight-bold +#{splitChange[0]}. + span.decimal #{splitChange[1]} + span % + else if price_change < 0 + td.text-center.text-danger.font-weight-bold -#{splitChange[0]}. + span.decimal #{splitChange[1]} + span % else - td.text-center.text-danger.font-weight-bold #{price_change} % + td.text-center.font-weight-bold #{splitChange[0]}. + span.decimal #{splitChange[1]} + span % if marketdata.data.chartdata != 'null' && marketdata.data.chartdata != '' && marketdata.data.chartdata != '[]' #marketChart.row .col-md-12.cardSpacer @@ -201,16 +236,22 @@ block content span.small (#{marketdata.exchange}) tbody each buy in marketdata.data.buys + - var price = Number(buy.price).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitPrice = price.split("."); + - var quantity = Number(buy.quantity).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitQuantity = quantity.split("."); + if buy.total != null + - var total = Number(buy.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + else + - var total = Number(parseFloat(buy.price).toFixed(8) * parseFloat(buy.quantity).toFixed(8)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitTotal = total.split("."); tr - td.text-center.text-success.font-weight-bold - =parseFloat(buy.price).toFixed(8) - td.text-center - =parseFloat(buy.quantity).toFixed(8) - td.text-center - if buy.total != null - =parseFloat(buy.total).toFixed(8) - else - =parseFloat(parseFloat(buy.price).toFixed(8) * parseFloat(buy.quantity).toFixed(8)).toFixed(8) + td.text-center.text-success.font-weight-bold #{splitPrice[0]}. + span.decimal #{splitPrice[1]} + td.text-center #{splitQuantity[0]}. + span.decimal #{splitQuantity[1]} + td.text-center #{splitTotal[0]}. + span.decimal #{splitTotal[1]} .col-md-6.col-xs-12.cardSpacer .card.card-default.border-0.wrapper-border-0(class=theadClasses) .card-header(style='border-bottom-width:1px;') @@ -226,16 +267,22 @@ block content span.small (#{marketdata.exchange}) tbody each sell in marketdata.data.sells + - var price = Number(sell.price).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitPrice = price.split("."); + - var quantity = Number(sell.quantity).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitQuantity = quantity.split("."); + if sell.total != null + - var total = Number(sell.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + else + - var total = Number(parseFloat(sell.price).toFixed(8) * parseFloat(sell.quantity).toFixed(8)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitTotal = total.split("."); tr - td.text-center.text-danger.font-weight-bold - =parseFloat(sell.price).toFixed(8) - td.text-center - =parseFloat(sell.quantity).toFixed(8) - td.text-center - if sell.total != null - =parseFloat(sell.total).toFixed(8) - else - =parseFloat(parseFloat(sell.price).toFixed(8) * parseFloat(sell.quantity).toFixed(8)).toFixed(8) + td.text-center.text-danger.font-weight-bold #{splitPrice[0]}. + span.decimal #{splitPrice[1]} + td.text-center #{splitQuantity[0]}. + span.decimal #{splitQuantity[1]} + td.text-center #{splitTotal[0]}. + span.decimal #{splitTotal[1]} .row .col-md-12 .card.card-default.border-0 @@ -254,29 +301,32 @@ block content tbody each order in marketdata.data.history if order.ordertype != null + - var price = Number(order.price).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitPrice = price.split("."); + - var quantity = Number(order.quantity).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitQuantity = quantity.split("."); + if order.total != null + - var total = Number(order.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + else + - var total = Number(parseFloat(order.price).toFixed(8) * parseFloat(order.quantity).toFixed(8)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitTotal = total.split("."); if order.ordertype.toUpperCase() == 'BUY' tr - td.text-center.text-success.font-weight-bold - =parseFloat(order.price).toFixed(8) - td.text-center - =parseFloat(order.quantity).toFixed(8) - td.text-center - if order.total != null - =parseFloat(order.total).toFixed(8) - else - =parseFloat(parseFloat(order.price).toFixed(8) * parseFloat(order.quantity).toFixed(8)).toFixed(8) + td.text-center.text-success.font-weight-bold #{splitPrice[0]}. + span.decimal #{splitPrice[1]} + td.text-center #{splitQuantity[0]}. + span.decimal #{splitQuantity[1]} + td.text-center #{splitTotal[0]}. + span.decimal #{splitTotal[1]} td.text-center =format_unixtime(new Date(order.timestamp), true) else tr - td.text-center.text-danger.font-weight-bold - =parseFloat(order.price).toFixed(8) - td.text-center - =parseFloat(order.quantity).toFixed(8) - td.text-center - if order.total != null - =parseFloat(order.total).toFixed(8) - else - =parseFloat(parseFloat(order.price).toFixed(8) * parseFloat(order.quantity).toFixed(8)).toFixed(8) + td.text-center.text-danger.font-weight-bold #{splitPrice[0]}. + span.decimal #{splitPrice[1]} + td.text-center #{splitQuantity[0]}. + span.decimal #{splitQuantity[1]} + td.text-center #{splitTotal[0]}. + span.decimal #{splitTotal[1]} td.text-center =format_unixtime(new Date(order.timestamp), true) \ No newline at end of file diff --git a/views/movement.pug b/views/movement.pug index 6f2bf7b..5f5e191 100644 --- a/views/movement.pug +++ b/views/movement.pug @@ -49,7 +49,7 @@ block content var txhash = data[2]; //variables for better readability var outputs = data[3]; //variables for better readability var amount = (data[4] / 100000000); //variables for better readability - var amountParts = amount.toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split('.'); + var amountParts = Number(amount).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}).split('.'); var amountStr = amountParts[0] + '.' + amountParts[1] + ''; var timestamp = data[5]; //variables for better readability if (amount > '#{flagb}') { diff --git a/views/reward.pug b/views/reward.pug index d344849..434a566 100644 --- a/views/reward.pug +++ b/views/reward.pug @@ -36,19 +36,27 @@ block content th.text-center #{settings.locale.heavy_reward} th.text-center #{settings.locale.heavy_estnext} tbody + - var supplyValue = Number(heavy.supply).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitSupply = supplyValue.split('.'); + - var capValue = Number(heavy.cap).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitCap = capValue.split('.'); + - var rewardValue = Number(heavy.reward).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitReward = rewardValue.split('.'); + - var nextValue = Number(heavy.estnext).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var splitNext = nextValue.split('.'); tr - td.text-center - =heavy.supply - td.text-center - =heavy.cap + td.text-center #{splitSupply[0]}. + span.decimal #{splitSupply[1]} + td.text-center #{splitCap[0]}. + span.decimal #{splitCap[1]} td.text-center =heavy.phase td.text-center =heavy.maxvote - td.text-center - =heavy.reward - td.text-center - =heavy.estnext + td.text-center #{splitReward[0]}. + span.decimal #{splitReward[1]} + td.text-center #{splitNext[0]}. + span.decimal #{splitNext[1]} .row(style='margin-left:0;margin-right:0;') .col-md-3 .card.card-default.border-0 diff --git a/views/richlist.pug b/views/richlist.pug index 502a54f..9e65214 100644 --- a/views/richlist.pug +++ b/views/richlist.pug @@ -64,44 +64,59 @@ block content td.font-weight-bold div.float-left(style='background-color:#d9534f;width:20px;height:20px;margin-right:6px;') span #{settings.locale.rl_top25} - - var total = parseFloat(dista.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(dista.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split("."); + - var percent = parseFloat(dista.percent).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); td.text-center.breakWord #{totalParts[0]}. span.decimal.breakWord #{totalParts[1]} - td.text-center #{parseFloat(dista.percent).toFixed(2)} + td.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} tr td.font-weight-bold div.float-left(style='background-color:#5cb85c;width:20px;height:20px;margin-right:6px;') span #{settings.locale.rl_top50} - - var total = parseFloat(distb.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(distb.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split("."); + - var percent = parseFloat(distb.percent).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); td.text-center.breakWord #{totalParts[0]}. span.decimal.breakWord #{totalParts[1]} - td.text-center #{parseFloat(distb.percent).toFixed(2)} + td.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} tr td.font-weight-bold div.float-left(style='background-color:#428bca;width:20px;height:20px;margin-right:6px;') span #{settings.locale.rl_top75} - - var total = parseFloat(distc.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(distc.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split("."); + - var percent = parseFloat(distc.percent).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); td.text-center.breakWord #{totalParts[0]}. span.decimal.breakWord #{totalParts[1]} - td.text-center #{parseFloat(distc.percent).toFixed(2)} + td.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} tr td.font-weight-bold div.float-left(style='background-color:#222;width:20px;height:20px;margin-right:6px;') span #{settings.locale.rl_top100} - - var total = parseFloat(distd.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(distd.total).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split("."); + - var percent = parseFloat(distd.percent).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); td.text-center.breakWord #{totalParts[0]}. span.decimal.breakWord #{totalParts[1]} - td.text-center #{parseFloat(distd.percent).toFixed(2)} + td.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} tr td.font-weight-bold span #{settings.locale.total} - - var total = (parseFloat(dista.total) + parseFloat(distb.total) + parseFloat(distc.total) + parseFloat(distd.total)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var total = Number(parseFloat(dista.total) + parseFloat(distb.total) + parseFloat(distc.total) + parseFloat(distd.total)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var totalParts = total.split("."); + - var percent = (parseFloat(dista.percent)+parseFloat(distb.percent)+parseFloat(distc.percent)+parseFloat(distd.percent)).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':2,'useGrouping':false}); + - var percentParts = percent.split("."); td.text-center.font-weight-bold.breakWord #{totalParts[0]}. span.decimal.breakWord #{totalParts[1]} - td.font-weight-bold.text-center #{(parseFloat(dista.percent)+parseFloat(distb.percent)+parseFloat(distc.percent)+parseFloat(distd.percent)).toFixed(2)} - div#pieChart(style="width:300px;height:305px;margin: 0 auto;") \ No newline at end of file + td.font-weight-bold.text-center #{percentParts[0]}. + span.decimal #{percentParts[1]} + div#pieChart(style="width:300px;height:305px;margin:0 auto;") \ No newline at end of file diff --git a/views/tx.pug b/views/tx.pug index 17f7935..42aa784 100644 --- a/views/tx.pug +++ b/views/tx.pug @@ -74,7 +74,7 @@ block content tr.table-info.text-center td #{settings.locale.new_coins} else - - var ramount = (address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var ramount = Number(address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var ramountParts = ramount.split('.'); tr td @@ -105,7 +105,7 @@ block content tbody each address in tx.vout if tx.vout.length > 0 - - var ramount = (address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var ramount = Number(address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var ramountParts = ramount.split('.'); tr if address.addresses != 'private_tx' @@ -127,7 +127,7 @@ block content td(colspan='2') =settings.locale.hidden_recipient else - - var ramount = (address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); + - var ramount = Number(address.amount / 100000000).toLocaleString('en',{'minimumFractionDigits':2,'maximumFractionDigits':8,'useGrouping':true}); - var ramountParts = ramount.split('.'); tr td