diff --git a/server/i18n/de.json b/server/i18n/de.json index 7afb9bc..66303b7 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -44,6 +44,10 @@ "TRANSACTIONS_BY_TIME" : "Transaktionen im Zeitverlauf", "BLOCKS" : "Blöcke", "BLOCKSINTERVAL" : "Intervall-S / W-Blöcke", + "SUPPLY_GROWTH_HOVER" : "Heute Angebotswachstum", + "BOCKS_COUNT_HOVER" : "Heute Block Count", + "TRANSACTION_FEE_HOVER" : "Heute Transaktionsgebühren insgesamt", + "BLOCK_INTERVAL_HOVER" : "Heute Blockintervall in Sekunden", "BLOCK" : "Block", "BLOCKS_MINED" : "Blöcke abgebaut", "TRANSACTION_FEES" : "Transkationsgebühren", diff --git a/server/i18n/en.json b/server/i18n/en.json index 198f206..2f0acd4 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -44,6 +44,10 @@ "TRANSACTIONS_BY_TIME" : "Transactions over time", "BLOCKS" : "Blocks", "BLOCKSINTERVAL" : "Interval B/W Blocks", + "SUPPLY_GROWTH_HOVER" : "Today Supply Growth", + "BOCKS_COUNT_HOVER" : "Today Block Count", + "TRANSACTION_FEE_HOVER" : "Today Total Transaction Fees", + "BLOCK_INTERVAL_HOVER" : "Today Block Interval in Secs", "BLOCK" : "Block", "BLOCKS_MINED" : "Blocks Mined", "TRANSACTION_FEES" : "Transaction Fees", diff --git a/src/app/view/home/graph-list/graph-list.component.html b/src/app/view/home/graph-list/graph-list.component.html index 8ff3269..65dfe87 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -115,7 +115,7 @@

{{'home.BLOCKS' | translate}}

- {{ + {{ this.brg_last | number }}
@@ -170,7 +170,7 @@

{{'home.TRANSACTION_FEES' | translate}}

- {{this.fg_last |number}} + {{this.fg_last |number}}

{{'home.SUPPLY_GROWTH' | translate}}

- {{ + {{ this.gg_last | number }}
@@ -262,7 +262,7 @@

{{'home.BLOCKS_MINED' | translate}}

- {{ + {{ this.dg_last | number }} @@ -352,7 +352,7 @@

Blocks by Algorithm

- {{ + {{ this.sg_last | number }} @@ -447,7 +447,7 @@

{{'home.BLOCK_INTERVAL' | translate}}

- {{ this.ag_last | number }} sec + {{ this.ag_last | number }} sec
diff --git a/src/app/view/home/graph-list/graph-list.component.ts b/src/app/view/home/graph-list/graph-list.component.ts index aae4db0..f27130c 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -167,8 +167,9 @@ export class GraphListComponent implements OnInit { let Cuckoo = res.response.Cuckoo; let ProgPow = res.response.ProgPow; let RandomX = res.response.RandomX; - this.sg_last = - RandomX[RandomX.length - 1]; + let today_date_index = sDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + this.sg_last = RandomX[today_date_index] + ProgPow[today_date_index] + Cuckoo[today_date_index]; + //this.sg_last = RandomX[RandomX.length - 1]; this.stackchartFunc( sDate, Cuckoo, @@ -299,7 +300,11 @@ export class GraphListComponent implements OnInit { let Cuckooper = res.response.Cuckooper; let RandomXper = res.response.RandomXper; - this.dg_last = RandomXper[RandomXper.length - 1]; + let today_date_index = mDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + + this.dg_last = ProgPow[today_date_index] + Cuckoo[today_date_index] + RandomX[today_date_index]; + + //this.dg_last = RandomXper[RandomXper.length - 1]; this.blockminedFunc( mDate, ProgPow, @@ -330,7 +335,9 @@ export class GraphListComponent implements OnInit { if (res['status'] == 200) { let bDate = res.response.date; let bPeriod = res.response.period; - this.ag_last = bPeriod[bPeriod.length - 1]; + let today_date_index = bDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + this.ag_last = bPeriod[today_date_index]; + //this.ag_last = bPeriod[bPeriod.length - 1]; this.blockspersecFunc(bDate, bPeriod); resolve(); } @@ -354,7 +361,10 @@ export class GraphListComponent implements OnInit { let gDate = res.response.date; let gReward = res.response.total_reward_per_day; let gaddedreward = res.response.addedreward; - this.gg_last = gReward[gReward.length - 1]; + let today_date_index = gDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + //let today_date_index = gDate.indexOf('2019-08-06'); + this.gg_last = gReward[today_date_index]; + //this.gg_last = gReward[gReward.length - 1]; this.growthFunc(gDate, gReward, gaddedreward); resolve(); } @@ -377,7 +387,9 @@ export class GraphListComponent implements OnInit { if (res['status'] == 200) { let TfDate = res.response.Date; let TfFee = res.response.Fee; - this.fg_last = TfFee[TfFee.length - 1]; + let today_date_index = TfDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + this.fg_last = TfFee[today_date_index]; + //this.fg_last = TfFee[TfFee.length - 1]; this.transcationfeeFunc(TfDate, TfFee); resolve(); } @@ -566,7 +578,9 @@ export class GraphListComponent implements OnInit { let DifficultychartDate = res.response.Date; let BlocksChartDate = res.response.blockDate; let Blockval = res.response.Blocks; - this.brg_last = Blockval[Blockval.length - 1]; + let today_date_index = BlocksChartDate.indexOf(moment(Date.now()).format('YYYY-MM-DD')); + this.brg_last = Blockval[today_date_index]; + //this.brg_last = Blockval[Blockval.length - 1]; this.totalBlocksFunc(BlocksChartDate, Blockval); resolve(); }