diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.ts b/src/app/view/graph-view/graph-detail/graph-detail.component.ts index 62d1001..8414e35 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.ts +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.ts @@ -22,7 +22,7 @@ export class GraphDetailComponent implements OnInit { public title: any; public id:any; public chartType : any = []; - public selectedItem: Number = 1; + public selectedItem: Number = 7; public selectedItem8: Number = 1; public selectedItem12: Number = 4; public Type: any = ''; @@ -63,7 +63,7 @@ export class GraphDetailComponent implements OnInit { switch(this.chartType){ case 'total-difficulty': // this.totalDifficultyreq(); - this.comp.Difficultyreq('total').then(res => { + this.comp.Difficultyreq('total', '', '', 'all','').then(res => { this.hashdata = this.comp.linearTotalGraphData; console.log('this.comp.linearTotalGraphData',this.comp.linearTotalGraphData); this.hashdata.layout.height = 300; @@ -71,7 +71,7 @@ export class GraphDetailComponent implements OnInit { //this.hashdata.layout.yaxis2.position = 1.25; this.title = 'Total Difficulty'; this.id= 'total-difficulty'; - this.selectedItem = 6; + this.selectedItem = 7; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -80,7 +80,7 @@ export class GraphDetailComponent implements OnInit { break; case 'target-difficulty': // this.totalDifficultyreq(); - this.comp.Difficultyreq('target','','','1 week').then(res => { + this.comp.Difficultyreq('target','','','all').then(res => { this.hashdata = this.comp.linearGraphData; // console.log('this.comp.linearGraphData',this.comp.linearGraphData); // this.hashdata.layout.height = 300; @@ -118,11 +118,11 @@ export class GraphDetailComponent implements OnInit { }); break; case 'blocks': - this.comp.blockreq().then(res => { + this.comp.blockreq('', '', 'all').then(res => { this.hashdata = this.comp.barGraphData; this.hashdata.layout.height = 300; this.title = 'Blocks'; - this.selectedItem = 1; + this.selectedItem = 7; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -143,19 +143,19 @@ export class GraphDetailComponent implements OnInit { }); break; case 'transaction-fees': - this.comp.Transcationreq().then(res => { + this.comp.Transcationreq('', '', 'all').then(res => { this.hashdata = this.comp.transcationGraphData; //console.log(this.hashdata); this.hashdata.layout.height = 300; this.title = 'Transaction Fees'; - this.selectedItem = 3; + this.selectedItem = 7; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); }); break; case 'supply-growth': - this.comp.Growthreq("","","1 week").then(res => { + this.comp.Growthreq('', '', 'all').then(res => { this.hashdata = this.comp.growthGraphData; this.hashdata.layout.height = 300; this.title = 'Supply Growth'; @@ -165,7 +165,7 @@ export class GraphDetailComponent implements OnInit { }); break; case 'blocks-mined': - this.comp.Blockminedreq('','','1 week').then(res => { + this.comp.Blockminedreq('', '', 'all').then(res => { this.hashdata = this.comp.doubleareaGraphData; this.hashdata.layout.height = 300; this.title = 'Blocks Mined'; @@ -187,7 +187,7 @@ export class GraphDetailComponent implements OnInit { // }); break; case 'avg-block-interval': - this.comp.Blockspersecreq('','','1 week').then(res => { + this.comp.Blockspersecreq('', '', 'all').then(res => { this.hashdata = this.comp.areaGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = @@ -199,7 +199,7 @@ export class GraphDetailComponent implements OnInit { }); break; case 'blocks-by-algorithm': - this.comp.stackchartreq('','','1 week').then(res => { + this.comp.stackchartreq('', '', 'all').then(res => { this.hashdata = this.comp.stackGraphData; this.hashdata.layout.height = 300; this.title = 'Blocks by Algorithm'; @@ -219,7 +219,7 @@ export class GraphDetailComponent implements OnInit { }); break; case 'transactions-by-date': - this.comp.Transactionlinechartreq('','','1 week').then(res => { + this.comp.Transactionlinechartreq('', '', 'all').then(res => { this.hashdata = this.comp.feeGraphData; this.hashdata.layout.height = 300; // this.hashdata.layout.width = 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 5931c49..ca45002 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -23,7 +23,7 @@ 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} {{'home.All' | translate}} + " id="8" #item8 [ngClass]="{ active: selectedItem8 == item8.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} @@ -97,16 +97,16 @@ 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} - + " id="5" #item35 [ngClass]="{ active: selectedItem3 == item35.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}} --> +
{{'home.EXPLORE_IT' | translate}} @@ -136,13 +136,13 @@ [ngClass]="{ active: selectedItem5 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} {{'home.All' | translate}} + " id="7" #item7 [ngClass]="{ active: selectedItem5 == item7.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} {{'home.All' | translate}} + " id="8" #item8 [ngClass]="{ active: selectedItem10 == item8.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} @@ -214,13 +214,13 @@ [ngClass]="{ active: selectedItem7 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} {{'home.All' | translate}} + " id="8" #item8 [ngClass]="{ active: selectedItem7 == item8.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} 15 {{'home.DAYS' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} - {{'home.All' | translate}} + {{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} @@ -309,14 +309,14 @@ [ngClass]="{ active: selectedItem2 == item2.id, day15_txt: true }">15 {{'home.DAYS' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} {{'home.All' | translate}} + " id="8" #item8 [ngClass]="{ active: selectedItem2 == item8.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} @@ -348,7 +348,7 @@ Difficultyreq('total', '', '', '30 days',''); selectedTarget = 3; TdifficultyRange = '30 days' " id="3" #itemtarget3 [ngClass]="{ active: selectedTarget == itemtarget3.id, day30_txt: true }">30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} @@ -358,7 +358,7 @@ {{'home.MONTHS' | translate}} {{'home.All' | translate}} + " id="7" #itemtarget7 [ngClass]="{ active: selectedTarget == itemtarget7.id, dayall_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} 30 {{'home.DAYS' | translate}} - 60 {{'home.DAYS' | translate}} {{'home.All' | translate}} + " id="7" #item7 [ngClass]="{ active: selectedItem == item7.id, day3m_txt: true }">{{'home.All' | translate}} -->
{{'home.EXPLORE_IT' | translate}} 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 d7c04a7..b41a703 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -49,14 +49,14 @@ export class GraphListComponent implements OnInit { public selectedItem: Number = 6; public selectedItem3: Number = 1; - public selectedItem2: Number = 3; - public selectedItem4: Number = 3; - public selectedItem5: Number = 3; - public selectedItem7: Number = 3; - public selectedItem8: Number = 3; + public selectedItem2: Number = 1; + public selectedItem4: Number = 1; + public selectedItem5: Number = 1; + public selectedItem7: Number = 1; + public selectedItem8: Number = 1; public selectedItem81: Number = 1; public selectedItem9: Number = 3; - public selectedItem10: Number = 3; + public selectedItem10: Number = 1; public selectedItem11: Number = 3; public selectedItem12: Number = 4; public selectedTarget: Number = 6; @@ -88,33 +88,33 @@ export class GraphListComponent implements OnInit { /* Total Difficulty and blocks chart fetching */ this.Difficultyreq('target'); this.Difficultyreq('total'); - this.blockreq(); + this.blockreq('', '', '1 week'); this.Blockintervalreq(); /* Transcation fee chart fetching */ - this.Transcationreq(); + this.Transcationreq('', '', '1 week'); /* Growth chart fetching */ - this.Growthreq(); + this.Growthreq('', '', '1 week'); /* Blockspersec chart fetching */ - this.Blockspersecreq(); + this.Blockspersecreq('', '', '1 week'); /* Blockmined chart fetching */ - this.Blockminedreq(); + this.Blockminedreq('', '', '1 week'); /* Transactionheatmap chart fetching */ this.Transactionheatmapreq(); /* Transactionline chart fetching */ - this.Transactionlinechartreq(); + this.Transactionlinechartreq('','','1 week'); /* Transaction2line chart fetching */ // this.Transactiondoublelinechartreq(); /* Stack chart fetching */ - this.stackchartreq(); + this.stackchartreq('','','1 week'); /* Pie chart fetching */ // this.piechartreq();