Commit for all options in all graphs

src/app/view/graph-view/graph-detail/graph-detail.component.html

@@ -96,6 +96,27 @@
                     </div> -->
               <epic-explorer-plotly *ngIf="hashdata.data" [data]="hashdata.data" [layout]="hashdata.layout">
               </epic-explorer-plotly>
+
+
+              <div *ngIf="!hashdata.data" class="feedback_div news_desc text-center">
+                  <div class="graph_img background_loading mx-auto mb-3"></div>
+                  <div class=" bg-white">
+                    <div class="sk-cube-grid">
+                      <div class="sk-cube sk-cube1"></div>
+                      <div class="sk-cube sk-cube2"></div>
+                      <div class="sk-cube sk-cube3"></div>
+                      <div class="sk-cube sk-cube4"></div>
+                      <div class="sk-cube sk-cube5"></div>
+                      <div class="sk-cube sk-cube6"></div>
+                      <div class="sk-cube sk-cube7"></div>
+                      <div class="sk-cube sk-cube8"></div>
+                      <div class="sk-cube sk-cube9"></div>
+                    </div>
+                  </div>
+                </div>
+
+
+
               <div class="day_filter" *ngIf="this.title!='Transactions over time' &&  this.title!='Block Interval'">
 
                 <a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty' || this.title == 'Blocks'" (click)="
@@ -123,7 +144,7 @@
                   {{'home.MONTHS' | translate}}</a>
 
 
-                  <a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty'" (click)="
+                  <a href="JavaScript:void(0);"  (click)="
                   ChartFromView('', '', 'all', comp.Type); selectedItem = 7; comp.difficultyRange = 'all';comp.TdifficultyRange = 'all'
                     " id="7" #item7 [ngClass]="{ active: selectedItem == item7.id, txt_primary: true }">{{'home.All' | translate}}</a>
 

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 => {

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}}</a>
       <a href="JavaScript:void(0);" (click)="Blockminedreq('', '', '3 months'); selectedItem7 = 5" id="5" #item5
         [ngClass]="{ active: selectedItem7 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
+
+        <a href="JavaScript:void(0);" (click)="
+        Blockminedreq('', '', 'all'); selectedItem7 = 8; 
+        " id="8" #item8 [ngClass]="{ active: selectedItem7 == item8.id, day3m_txt: true }">{{'home.All' | translate}}</a>
+
+
     </div>
     <div class="explore_all text-right">
        <a routerLink="/chart/blocks-mined"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
@@ -419,12 +425,11 @@
             stackchartreq('', '', '3 months'); selectedItem10 = 5
               " id="5" #item5 [ngClass]="{ active: selectedItem10 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
 
-<!-- 
               <a href="JavaScript:void(0);" (click)="
-              stackchartreq('', '', 'all'); selectedItem = 7; 
+              stackchartreq('', '', 'all'); selectedItem10 = 8; 
-        " id="7" #item7 [ngClass]="{ active: selectedItem == item7.id, day3m_txt: true }">all {{'home.All' | translate}}</a> -->
+              " id="8" #item8 [ngClass]="{ active: selectedItem10 == item8.id, day3m_txt: true }">{{'home.All' | translate}}</a>
-
+      
-
+    
 
           </div>
           <div class="explore_all text-right">
@@ -608,6 +613,12 @@
           [ngClass]="{ active: selectedItem2 == item4.id, day60_txt: true }">60 {{'home.DAYS' | translate}}</a>
         <a href="JavaScript:void(0);" (click)="Blockspersecreq('', '', '3 months'); selectedItem2 = 5" id="5" #item5
           [ngClass]="{ active: selectedItem2 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
+
+          <a href="JavaScript:void(0);" (click)="
+          Blockspersecreq('', '', 'all'); selectedItem2 = 8; 
+          " id="8" #item8 [ngClass]="{ active: selectedItem2 == item8.id, day3m_txt: true }">{{'home.All' | translate}}</a>
+  
+
       </div>
       <div class="explore_all text-right">
         <a routerLink="/chart/avg-block-interval"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i

src/app/view/home/graph-list/graph-list.component.ts

@@ -157,11 +157,11 @@ export class GraphListComponent implements OnInit {
   ) {
     return new Promise((resolve, reject) => {
       let params = new HttpParams();
-   
+      this.stackGraphData = []
       if(interval == "all") {
         // this.Type=""
-        fromDate = "2019-09-29 06:00:00"
+        fromDate = "2019-09-03 06:00:00"
-        ToDate = "2019-11-20 20:29:59"
+        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")
       }