This commit is contained in:
SuriyaR 2019-08-08 19:42:59 +05:30
parent b3714c2961
commit 41033a9be0
6 changed files with 82 additions and 79 deletions

View File

@ -1,6 +1,7 @@
{
"difficulty" : "Schwierigkeit",
"transactions-by-time" : "Transaktionen im Zeitverlauf",
"transactions-over-time" : "Transaktionen im Zeitverlauf",
"blocks-by-algorithm" : "Blöcke nach Algorithmus",
"blocks" : "Blöcke",
"transaction-fees" : "Transkationsgebühren",
"supply-growth" : "Angebotswachstum",

View File

@ -1,13 +1,14 @@
{
"difficulty" : "Difficulty",
"transactions-by-time" : "Transactions over time",
"transactions-over-time" : "Transactions over time",
"blocks-by-algorithm" : "Blocks by Algorithm",
"blocks" : "Blocks",
"transaction-fees" : "Transaction Fees",
"supply-growth" : "Supply Growth",
"blocks-mined" : "Blocks Mined",
"hashrate-growth-chart" : "HashRate Growth Chart",
"block-interval" : "Block Interval",
"transactions-vs-date" : "Transactions by Date",
"transactions-by-date" : "Transactions by Date",
"total-difficulty" : "Total Difficulty",
"target-difficulty" : "Target Difficulty",
"home": {

View File

@ -156,7 +156,7 @@
<li class="mb-1" *ngIf="this.title!='Total Difficulty'"><a
routerLink="/chart/total-difficulty">{{'total-difficulty' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Transactions over time'"><a
routerLink="/chart/transactions-by-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li>
routerLink="/chart/transactions-over-time">{{'home.TRANSACTIONS_BY_TIME' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Blocks'"><a
routerLink="/chart/blocks">{{'home.BLOCKS' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Blocks Mined'"><a
@ -169,8 +169,8 @@
<li class="mb-1" *ngIf="this.title!='Transactions over time'"><a
routerLink="/chart/block-interval">{{'home.BLOCK_INTERVAL' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Transactions by Date'"><a
routerLink="/chart/transactions-vs-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/stackchart">Stackbar Chart</a>
routerLink="/chart/transactions-by-date">{{'home.TRANSACTIONS_VS_DATE' | translate}}</a></li>
<li class="mb-1" *ngIf="this.title!='Stackbar Chart'"><a routerLink="/chart/blocks-by-algorithm">Blocks by Algorithm</a>
</li>
<!-- <li class="mb-1" *ngIf="this.title!='Pie Chart'"><a routerLink="/chart/piechart">Pie Chart</a></li> -->
</ul>

View File

@ -60,7 +60,7 @@ export class GraphDetailComponent implements OnInit {
this.comp.Difficultyreq('total').then(res => {
this.hashdata = this.comp.linearTotalGraphData;
console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData);
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Total Difficulty';
this.selectedItem = 6;
this.titleService.setTitle(
@ -74,7 +74,7 @@ export class GraphDetailComponent implements OnInit {
this.comp.Difficultyreq('target').then(res => {
this.hashdata = this.comp.linearGraphData;
console.log('this.comp.linearGraphData',this.comp.linearGraphData);
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Target Difficulty';
this.selectedItem = 6;
this.titleService.setTitle(
@ -84,10 +84,10 @@ export class GraphDetailComponent implements OnInit {
});
break;
case 'transactions-by-time':
case 'transactions-over-time':
this.comp.Transactionheatmapreq().then(res => {
this.hashdata = this.comp.heatMapGrowthData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - (window.innerWidth / 2.8);
this.title = 'Transactions over time';
@ -108,7 +108,7 @@ export class GraphDetailComponent implements OnInit {
case 'blocks':
this.comp.blockreq().then(res => {
this.hashdata = this.comp.barGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Blocks';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
@ -119,7 +119,7 @@ export class GraphDetailComponent implements OnInit {
this.comp.Transcationreq().then(res => {
this.hashdata = this.comp.transcationGraphData;
//console.log(this.hashdata);
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Transaction Fees';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
@ -129,7 +129,7 @@ export class GraphDetailComponent implements OnInit {
case 'supply-growth':
this.comp.Growthreq().then(res => {
this.hashdata = this.comp.growthGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Supply Growth';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
@ -139,7 +139,7 @@ export class GraphDetailComponent implements OnInit {
case 'blocks-mined':
this.comp.Blockminedreq().then(res => {
this.hashdata = this.comp.doubleareaGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Blocks Mined';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
@ -147,21 +147,21 @@ export class GraphDetailComponent implements OnInit {
});
break;
case 'hashrate-growth-chart':
this.comp.Transactiondoublelinechartreq().then(res => {
this.hashdata = this.comp.blockGraphData;
this.hashdata.layout.height = 500;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'HashRate Growth Chart';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
);
});
// this.comp.Transactiondoublelinechartreq().then(res => {
// this.hashdata = this.comp.blockGraphData;
// this.hashdata.layout.height = 300;
// // this.hashdata.layout.width =
// // window.innerWidth - window.innerWidth / 2.8;
// this.title = 'HashRate Growth Chart';
// this.titleService.setTitle(
// this.route.snapshot.data.title + ' - ' + this.title,
// );
// });
break;
case 'block-interval':
this.comp.Blockspersecreq().then(res => {
this.hashdata = this.comp.areaGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Block Interval';
@ -170,11 +170,11 @@ export class GraphDetailComponent implements OnInit {
);
});
break;
case 'stackchart':
case 'blocks-by-algorithm':
this.comp.stackchartreq().then(res => {
this.hashdata = this.comp.stackGraphData;
this.hashdata.layout.height = 500;
this.title = 'Stackbar Chart';
this.hashdata.layout.height = 300;
this.title = 'Blocks by Algorithm';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
);
@ -183,17 +183,17 @@ export class GraphDetailComponent implements OnInit {
case 'piechart':
this.comp.piechartreq().then(res => {
this.hashdata = this.comp.pieGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Pie Chart';
this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title,
);
});
break;
case 'transactions-vs-date':
case 'transactions-by-date':
this.comp.Transactionlinechartreq().then(res => {
this.hashdata = this.comp.feeGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
//console.log(this.hashdata.layout.width);
@ -221,22 +221,22 @@ export class GraphDetailComponent implements OnInit {
case 'target-difficulty':
this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => {
this.hashdata = this.comp.linearGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Target Difficulty';
});
break;
case 'total-difficulty':
this.comp.Difficultyreq('total',p1, p2, p3, p4).then(res => {
this.hashdata = this.comp.linearTotalGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Total Difficulty';
});
break;
case 'transactions-by-time':
case 'transactions-over-time':
this.comp.transactionheatmapFunc(p1, p2, p3, p4).then(res => {
this.hashdata = this.comp.heatMapGrowthData;
// console.log(this.hashdata);
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Transactions over time';
@ -245,53 +245,53 @@ export class GraphDetailComponent implements OnInit {
case 'blocks':
this.comp.blockreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.barGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Blocks';
});
break;
case 'blocks-mined':
this.comp.Blockminedreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.doubleareaGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Blocks Mined';
});
break;
case 'transaction-fees':
this.comp.Transcationreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.transcationGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Transaction Fees';
});
break;
case 'supply-growth':
this.comp.Growthreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.growthGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
this.title = 'Supply Growth';
});
break;
case 'hashrate-growth-chart':
this.comp.Transactiondoublelinechartreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.blockGraphData;
this.hashdata.layout.height = 500;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'HashRate Growth Chart';
});
// this.comp.Transactiondoublelinechartreq(p1, p2, p3).then(res => {
// this.hashdata = this.comp.blockGraphData;
// this.hashdata.layout.height = 300;
// // this.hashdata.layout.width =
// // window.innerWidth - window.innerWidth / 2.8;
// this.title = 'HashRate Growth Chart';
// });
break;
case 'block-interval':
this.comp.Blockspersecreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.areaGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Block Interval';
});
break;
case 'stackchart':
case 'blocks-by-algorithm':
this.comp.stackchartreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.stackGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Stackbar Chart';
@ -300,16 +300,16 @@ export class GraphDetailComponent implements OnInit {
case 'piechart':
this.comp.piechartreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.pieGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Pie Chart';
});
break;
case 'transactions-vs-date':
case 'transactions-by-date':
this.comp.Transactionlinechartreq(p1, p2, p3).then(res => {
this.hashdata = this.comp.feeGraphData;
this.hashdata.layout.height = 500;
this.hashdata.layout.height = 300;
// this.hashdata.layout.width =
// window.innerWidth - window.innerWidth / 2.8;
this.title = 'Transactions by Date';
@ -336,7 +336,7 @@ export class GraphDetailComponent implements OnInit {
// ],
// layout: {
// hovermode: 'closest',
// height: 500,
// height: 300,
// autosize: true,
// showlegend: false,
// xaxis: {

View File

@ -160,15 +160,15 @@
<div class="day_filter">
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tInput,'Input'); selectedItem8 = 1" id="1" #item1
[ngClass]="{ active: selectedItem8 == item1.id, txt_primay: true }">{{'home.INPUT' | translate}}</a>
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tKernal,'Kernal'); selectedItem8 = 2" id="2" #item2
[ngClass]="{ active: selectedItem8 == item2.id, day15_txt: true }">{{'home.KERNEL' | translate}}</a>
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tOutput,'Output'); selectedItem8 = 3" id="3" #item3
[ngClass]="{ active: selectedItem8 == item3.id, day30_txt: true }">{{'home.OUTPUT' | translate}}</a>
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tInput,'Input'); selectedItem81 = 1" id="1" #item1
[ngClass]="{ active: selectedItem81 == item1.id, txt_primay: true }">{{'home.INPUT' | translate}}</a>
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tKernal,'Kernal'); selectedItem81 = 2" id="2" #item2
[ngClass]="{ active: selectedItem81 == item2.id, day15_txt: true }">{{'home.KERNEL' | translate}}</a>
<a href="JavaScript:void(0);" (click)="transactionheatmapFunc(tDate, tHour, tOutput,'Output'); selectedItem81 = 3" id="3" #item3
[ngClass]="{ active: selectedItem81 == item3.id, day30_txt: true }">{{'home.OUTPUT' | translate}}</a>
</div>
<div class="explore_all text-right">
<a routerLink="/chart/transactions-by-time"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
<a routerLink="/chart/transactions-over-time"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a>
</div>
</div>
@ -433,7 +433,7 @@
" id="5" #item5 [ngClass]="{ active: selectedItem10 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right">
<a routerLink="/chart/stackchart"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
<a routerLink="/chart/blocks-by-algorithm"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a>
</div>
</div>
@ -521,7 +521,7 @@
" id="5" #item5 [ngClass]="{ active: selectedItem8 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
</div>
<div class="explore_all text-right">
<a routerLink="/chart/transactions-vs-date"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
<a routerLink="/chart/transactions-by-date"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
class="fa fa-long-arrow-right"></i></span></a>
</div>
</div>

View File

@ -45,7 +45,8 @@ export class GraphListComponent implements OnInit {
public selectedItem4: Number = 3;
public selectedItem5: Number = 3;
public selectedItem7: Number = 3;
public selectedItem8: Number = 1;
public selectedItem8: Number = 3;
public selectedItem81: Number = 2;
public selectedItem9: Number = 3;
public selectedItem10: Number = 3;
public selectedItem11: Number = 3;
@ -180,21 +181,21 @@ export class GraphListComponent implements OnInit {
params = params.append('FromDate', fromDate);
params = params.append('ToDate', ToDate);
params = params.append('Interval', interval);
this.chartService
.apiGetRequest(params, '/blockchain_block/hashrate')
.subscribe(
res => {
if (res['status'] == 200) {
let Hdate = res.response.date;
let H29 = res.response.hashrate29;
let H31 = res.response.hashrate31;
this.hg_last = H31[H31.length - 1];
this.transactiondoublelinechartFunc(Hdate, H29, H31);
resolve();
}
},
error => {},
);
// this.chartService
// .apiGetRequest(params, '/blockchain_block/hashrate')
// .subscribe(
// res => {
// if (res['status'] == 200) {
// let Hdate = res.response.date;
// let H29 = res.response.hashrate29;
// let H31 = res.response.hashrate31;
// this.hg_last = H31[H31.length - 1];
// this.transactiondoublelinechartFunc(Hdate, H29, H31);
// resolve();
// }
// },
// error => {},
// );
});
}
@ -259,7 +260,7 @@ export class GraphListComponent implements OnInit {
this.transactionheatmapFunc(
this.tDate,
this.tHour,
this.tInput,
this.tKernal,
'Kernal',
);
resolve();