diff --git a/src/app/view/graph-view/graph-detail/graph-detail.component.html b/src/app/view/graph-view/graph-detail/graph-detail.component.html index 6932c11..fd035cf 100644 --- a/src/app/view/graph-view/graph-detail/graph-detail.component.html +++ b/src/app/view/graph-view/graph-detail/graph-detail.component.html @@ -96,6 +96,27 @@ --> + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
{{'home.All' | translate}} 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 ef7a5a7..62d1001 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 @@ -244,7 +244,7 @@ export class GraphDetailComponent implements OnInit { // (p1, p2, p3, p4, p5) for (fromDate, ToDate, interval, fordifficult, forblocks) for difficult and nar chart // AND For heatmap and others - It will change this.comp.Type = p4 != '' && (p4 == 'cuckatoo' || p4 == 'progpow' || p4 == 'randomx') ? p4 : this.comp.Type == '' ? 'cuckatoo' : this.comp.Type; - + this.hashdata =[] switch (this.chartType) { case 'target-difficulty': this.comp.Difficultyreq('target',p1, p2, p3, p4).then(res => { 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 40eb468..41b18d2 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -325,6 +325,12 @@ [ngClass]="{ active: selectedItem7 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} + + {{'home.All' | translate}} + +
{{'home.EXPLORE_IT' | translate}} 3 {{'home.MONTHS' | translate}} - - - + stackchartreq('', '', 'all'); selectedItem10 = 8; + " id="8" #item8 [ngClass]="{ active: selectedItem10 == item8.id, day3m_txt: true }">{{'home.All' | translate}} + +
@@ -608,6 +613,12 @@ [ngClass]="{ active: selectedItem2 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}} 3 {{'home.MONTHS' | translate}} + + {{'home.All' | translate}} + +
{{'home.EXPLORE_IT' | translate}} { let params = new HttpParams(); - + this.stackGraphData = [] if(interval == "all") { // this.Type="" - fromDate = "2019-09-29 06:00:00" - ToDate = "2019-11-20 20:29:59" + fromDate = "2019-09-03 06:00:00" + ToDate = moment(new Date()).format("YYYY-MM-DD 23:29:59") } @@ -304,9 +304,20 @@ export class GraphListComponent implements OnInit { Blockminedreq(fromDate = '', ToDate = '', interval = '') { return new Promise((resolve, reject) => { let params = new HttpParams(); + + + this.doubleareaGraphData = [] + if(interval == "all") { + // this.Type="" + fromDate = "2019-09-03 00:00:00" + ToDate = moment(new Date()).format("YYYY-MM-DD 23:29:59") + } + + params = params.append('Interval', (interval == "all")?"":interval); + params = params.append('FromDate', fromDate); params = params.append('ToDate', ToDate); - params = params.append('Interval', interval); + // params = params.append('Interval', interval); this.chartService .apiGetRequest(params, '/blockchain_block/blockminedchart') .subscribe( @@ -346,9 +357,17 @@ export class GraphListComponent implements OnInit { Blockspersecreq(fromDate = '', ToDate = '', interval = '') { return new Promise((resolve, reject) => { let params = new HttpParams(); + this.areaGraphData = [] + if(interval == "all") { + // this.Type="" + fromDate = "2019-09-03 00:00:00" + ToDate = moment(new Date()).format("YYYY-MM-DD 23:29:59") + } + + params = params.append('Interval', (interval == "all")?"":interval); params = params.append('FromDate', fromDate); params = params.append('ToDate', ToDate); - params = params.append('Interval', interval); + // params = params.append('Interval', interval); this.chartService .apiGetRequest(params, '/blockchain_block/blockspersec') .subscribe( @@ -375,7 +394,7 @@ export class GraphListComponent implements OnInit { this.growthGraphData = [] if(interval == "all") { // this.Type="" - fromDate = "2019-09-05 00:00:00" + fromDate = "2019-09-04 00:00:00" ToDate = moment(new Date()).format("YYYY-MM-DD 23:29:59") }