EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
raja.blaze 2019-09-06 16:10:26 +05:30
commit 19585e2cb1
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/controllers/BlockchainKernel.ts
View File

@ -658,8 +658,8 @@ export class BlockchainKernelController {
}
const TransactionFeeQuery = await getConnection(Global.network)
.query(
"select 1 as hash, date(DATE_TRUNC('day', timestamp)) as date, sum(fee)/1000000 as fee \
from blockchain_block t1 join blockchain_kernel t2 on t2.block_id=t1.hash where " +
"select 1 as hash, date(DATE_TRUNC('day', timestamp)) as date, avg(fee)/1000000000 as fee \
from blockchain_block t1 join blockchain_kernel t2 on t2.block_id=t1.hash where fee > 0 and " +
timeIntervalQry +
"group by DATE_TRUNC('day', timestamp) order by date",
)
@ -670,7 +670,7 @@ export class BlockchainKernelController {
Fee = [];
TransactionFeeQuery.forEach(e => {
date.push(moment(e.date).format('YYYY-MM-DD'));
Fee.push(parseInt(e.fee));
Fee.push(e.fee);
});
if(date.length == 0){

6
server/i18n/de.json
View File

@ -3,7 +3,7 @@
"transactions-over-time" : "Transaktionen im Zeitverlauf",
"blocks-by-algorithm" : "Blöcke nach Algorithmus",
"blocks" : "Blöcke",
"transaction-fees" : "Transkationsgebühren",
"transaction-fees" : "durchschnittliche Transaktionsgebühr",
"supply-growth" : "Angebotswachstum",
"blocks-mined" : "Blöcke abgebaut",
"hashrate-growth-chart" : "HashRate-Wachstumstabelle",
@ -47,13 +47,13 @@
"BLOCKSINTERVAL" : "Sperrintervall",
"SUPPLY_GROWTH_HOVER" : "Aktuelle Blockbelohnung",
"BOCKS_COUNT_HOVER" : "Anzahl der letzten 24h Blöcke",
"TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt",
"TRANSACTION_FEE_HOVER" : "24h Durchschnittsgebühr",
"BLOCK_INTERVAL_HOVER" : "Heute Blockintervall in Sekunden",
"TRANSACTION_LINECHAT_HOVER" : "Heute Gesamtzahl der Transaktionen",
"BLOCK_INTERVAL_BW_BLOCKS_HOVER" : "Letztes Blockintervall in Sekunden",
"BLOCK" : "Block",
"BLOCKS_MINED" : "Blöcke abgebaut",
"TRANSACTION_FEES" : "Transkationsgebühren",
"TRANSACTION_FEES" : "durchschnittliche Transaktionsgebühr",
"SUPPLY_GROWTH" : "Angebotswachstum",
"HASHRATE_GROWTH_CHART" : "HashRate-Wachstumstabelle",
"BLOCK_INTERVAL" : "Durchschnittliches Sperrintervall",

6
server/i18n/en.json
View File

@ -3,7 +3,7 @@
"transactions-over-time" : "Transactions over time",
"blocks-by-algorithm" : "Blocks by Algorithm",
"blocks" : "Blocks",
"transaction-fees" : "Transaction Fees",
"transaction-fees" : "Average Transaction Fee",
"supply-growth" : "Supply Growth",
"blocks-mined" : "Blocks Mined",
"hashrate-growth-chart" : "HashRate Growth Chart",
@ -47,13 +47,13 @@
"BLOCKSINTERVAL" : "Block Interval",
"SUPPLY_GROWTH_HOVER" : "Current Block Reward",
"BOCKS_COUNT_HOVER" : "Last 24h Blocks Count",
"TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees",
"TRANSACTION_FEE_HOVER" : "24h Avg Fee",
"BLOCK_INTERVAL_HOVER" : "Today Block Interval in Secs",
"TRANSACTION_LINECHAT_HOVER" : "Today Total Transaction Count",
"BLOCK_INTERVAL_BW_BLOCKS_HOVER" : "Last Block Interval in Secs",
"BLOCK" : "Block",
"BLOCKS_MINED" : "Blocks Mined",
"TRANSACTION_FEES" : "Transaction Fees",
"TRANSACTION_FEES" : "Average Transaction Fee",
"SUPPLY_GROWTH" : "Supply Growth",
"HASHRATE_GROWTH_CHART" : "HashRate Growth Chart",
"BLOCK_INTERVAL" : "Avg Block Interval",

2
src/app/view/home/graph-list/graph-list.component.ts
View File

@ -940,7 +940,7 @@ export class GraphListComponent implements OnInit {
{
x: gDate,
y: gaddedreward,
// type: 'scatter',
// type: 'line',
//mode: 'lines',
//fill: 'tozeroy',
type: 'line',