From 99cdea84e5e5006eb5675abd9cf35e6c07063418 Mon Sep 17 00:00:00 2001
From: shunmugam <sundaram.blaze@gmail.com>
Date: Tue, 24 Sep 2019 13:01:45 +0530
Subject: [PATCH] Progpow label changes . Changes provided by Micheal on sept
 23

---
 .../graph-detail/graph-detail.component.html  |  9 ++++----
 .../graph-detail/graph-detail.component.ts    | 11 ++++++---
 .../block-detail-list.component.html          |  2 +-
 .../home/graph-list/graph-list.component.html |  4 ++--
 .../home/graph-list/graph-list.component.ts   | 23 ++++++++++++-------
 .../latestblocks/latestblocks.component.html  |  2 +-
 6 files changed, 32 insertions(+), 19 deletions(-)

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 3e4358b..23ae675 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
@@ -100,7 +100,7 @@
 
                 <a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty' || this.title == 'Blocks'" (click)="
             ChartFromView('', '', '1 day', comp.Type); selectedItem = 6; comp.difficultyRange = '1 day';comp.TdifficultyRange = '1 day'
-              " id="6" #item6 [ngClass]="{ active: selectedItem == item6.id, txt_primary: true }">1 Day</a>
+              " id="6" #item6 [ngClass]="{ active: selectedItem == item6.id, txt_primary: true }">1 day</a>
                 <a href="JavaScript:void(0);" (click)="
             ChartFromView('', '', '1 week', comp.Type); selectedItem = 1; comp.difficultyRange = '1 week';comp.TdifficultyRange = '1 week'
               " id="1" #item1 [ngClass]="{ active: selectedItem == item1.id, txt_primary: true }">1
@@ -145,9 +145,10 @@
               <a href="JavaScript:void(0);" (click)="
               ChartFromView('yesterday'); selectedInteverval = 2
                   " id="2" #intevalitem2 [ngClass]="{ active: selectedInteverval == intevalitem2.id, txt_primary: true }">Yesterday</a>
-                  <a href="JavaScript:void(0);" (click)="ChartFromView('previous'); "><</a>
-                  <span>{{showcurrentIntervalDate}}</span>
-                  <a href="JavaScript:void(0);" (click)="ChartFromView('next'); ">></a>
+                  <a *ngIf ="showcurrentIntervalDatetimestamp >= 1567468800000" href="JavaScript:void(0);" (click)="ChartFromView('previous'); "><</a>
+                  <span>{{showcurrentIntervalDate}} </span>
+                  <a  *ngIf ="showcurrentIntervalDatetimestamp < todaydate" href="JavaScript:void(0);" (click)="ChartFromView('next'); ">></a>
+                 
               </div>
 
             </div>
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 d516be2..26d1be9 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 = 3;
+  public selectedItem: Number = 1;
   public selectedItem8: Number = 1;
   public selectedItem12: Number = 4;
   public Type: any = '';
@@ -31,6 +31,9 @@ export class GraphDetailComponent implements OnInit {
   public selectedInteverval: Number = 1;
   public currenyIntervalDate: any;
   public showcurrentIntervalDate: any;
+  public showcurrentIntervalDatetimestamp : any;
+  // public todaydate = new Date().getMonth()+1+"-"+new Date().getDate()+"-"+new Date().getUTCFullYear();
+  public todaydate = new Date().setDate(new Date().getDate() - 1);
   
   public GraphtInput: any;
   public GraphtOutput: any;
@@ -77,7 +80,7 @@ export class GraphDetailComponent implements OnInit {
           break;
         case 'target-difficulty':
             // this.totalDifficultyreq();
-              this.comp.Difficultyreq('target').then(res => {
+              this.comp.Difficultyreq('target','','','1 week').then(res => {
                 this.hashdata = this.comp.linearGraphData;
                 // console.log('this.comp.linearGraphData',this.comp.linearGraphData);
                 // this.hashdata.layout.height = 300;
@@ -119,7 +122,7 @@ export class GraphDetailComponent implements OnInit {
             this.hashdata = this.comp.barGraphData;
             this.hashdata.layout.height = 300;
             this.title = 'Blocks';
-            this.selectedItem = 6;
+            this.selectedItem = 1;
             this.titleService.setTitle(
               this.route.snapshot.data.title + ' - ' + this.title,
             );
@@ -130,6 +133,7 @@ export class GraphDetailComponent implements OnInit {
               this.hashdata = this.comp.barGraphIntevalData;
               this.currenyIntervalDate = this.comp.currenyIntervalDate;
               this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
+              this.showcurrentIntervalDatetimestamp = new Date(this.comp.showcurrentIntervalDate).getTime();
               this.hashdata.layout.height = 300;
               this.title = 'Block Interval';
               this.selectedInteverval = 1;
@@ -284,6 +288,7 @@ export class GraphDetailComponent implements OnInit {
         this.hashdata = this.comp.barGraphIntevalData;
         this.currenyIntervalDate = this.comp.currenyIntervalDate;
         this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
+        this.showcurrentIntervalDatetimestamp = new Date(this.comp.showcurrentIntervalDate).getTime();
         this.hashdata.layout.height = 300;
         this.title = 'Block Interval';
       });
diff --git a/src/app/view/home/block-detail-list/block-detail-list.component.html b/src/app/view/home/block-detail-list/block-detail-list.component.html
index 9c2b5c9..cd4e889 100644
--- a/src/app/view/home/block-detail-list/block-detail-list.component.html
+++ b/src/app/view/home/block-detail-list/block-detail-list.component.html
@@ -106,7 +106,7 @@
             <span> {{ latestblockdetail.targetdifficultycuckatoo | number }}</span>
         </div>
         <div class="difficulty_datas">
-            <span class="day60_txt">ProgPow &nbsp;&nbsp;: </span>
+            <span class="day60_txt">ProgPoW &nbsp;&nbsp;: </span>
               <span class="diff_span" style="width:110px;" title="{{ latestblockdetail.targetdifficultyprogpow | number }}"> {{ latestblockdetail.targetdifficultyprogpow | number }}</span>
           </div>
           <div class="difficulty_datas">
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 4e6bf66..7321589 100644
--- a/src/app/view/home/graph-list/graph-list.component.html
+++ b/src/app/view/home/graph-list/graph-list.component.html
@@ -435,9 +435,9 @@
         <a href="JavaScript:void(0);" (click)="
         Blockintervalreq('yesterday'); selectedInteverval = 2
             " id="2" #intevalitem2 [ngClass]="{ active: selectedInteverval == intevalitem2.id, txt_primary: true }">Yesterday</a>
-            <a href="JavaScript:void(0);" (click)="Blockintervalreq('previous'); "><</a>
+            <a *ngIf ="showcurrentIntervalDatetimestamp >= 1567468800000" href="JavaScript:void(0);" (click)="Blockintervalreq('previous'); "><</a>
             <span>{{showcurrentIntervalDate}}</span>
-            <a href="JavaScript:void(0);" (click)="Blockintervalreq('next'); ">></a>
+            <a *ngIf ="showcurrentIntervalDatetimestamp < todaydate" href="JavaScript:void(0);" (click)="Blockintervalreq('next'); ">></a>
   
       </div>
       <div class="explore_all text-right">
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 4a35ee6..e6a4269 100644
--- a/src/app/view/home/graph-list/graph-list.component.ts
+++ b/src/app/view/home/graph-list/graph-list.component.ts
@@ -29,6 +29,8 @@ export class GraphListComponent implements OnInit {
   public linearTotalGraphData: any = [];
   public currenyIntervalDate: any;
   public showcurrentIntervalDate: any;
+  public showcurrentIntervalDatetimestamp : any;
+  public todaydate = new Date().setDate(new Date().getDate() - 1);
 
   public lg_last: any;
   public ag_last: any = '';
@@ -453,10 +455,10 @@ export class GraphListComponent implements OnInit {
                         text: DifficultychartDate,
                         // mode: 'lines+markers',
                         type: 'scatter',
-                        name: 'Progpow',
+                        name: 'ProgPoW',
                         yaxis: 'y2',
                         line: { color: '#0091ff' },
-                        hovertemplate: 'Progpow : %{y:,}',
+                        hovertemplate: 'ProgPoW : %{y:,}',
                         hoverlabel: {namelength : 0}
                       },
                       {
@@ -538,20 +540,25 @@ export class GraphListComponent implements OnInit {
     if(interval == "today"){
       this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD');
       this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY');
+      this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
     }else if(interval == "yesterday"){
       this.currenyIntervalDate = moment(new Date()).subtract(1, "days").format("YYYY-MM-DD");
       this.showcurrentIntervalDate = moment(new Date()).subtract(1, "days").format("MM-DD-YYYY");
+      this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
     }else if(interval == "previous"){
       var currentdate = this.currenyIntervalDate;
       this.currenyIntervalDate = moment(currentdate).subtract(1, "days").format("YYYY-MM-DD");
       this.showcurrentIntervalDate = moment(currentdate).subtract(1, "days").format("MM-DD-YYYY");
+      this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
     }else if(interval == "next"){
       var currentdate = this.currenyIntervalDate;
       this.currenyIntervalDate = moment(currentdate).add(1, "days").format("YYYY-MM-DD");
       this.showcurrentIntervalDate = moment(currentdate).add(1, "days").format("MM-DD-YYYY");
+      this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
     }else{
       this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD');
       this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY');
+      this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
     }
     // console.log(this.currenyIntervalDate);
     // console.log(this.showcurrentIntervalDate);
@@ -662,7 +669,7 @@ export class GraphListComponent implements OnInit {
           }
         },
         yaxis2: {
-          title: 'Progpow',
+          title: 'ProgPoW',
           fixedrange: true,
           // showgrid: true,
           range: range3,
@@ -730,10 +737,10 @@ export class GraphListComponent implements OnInit {
         {
           x: sDate,
           y: ProgPow,
-          name: 'Progpow',
+          name: 'ProgPoW',
           type: 'bar',
           text: ProgPow,
-          hovertemplate: '%{x}<br> ProgPow : %{text:,}',
+          hovertemplate: '%{x}<br> ProgPoW : %{text:,}',
           hoverlabel: {namelength : 0},
           marker: {
             color: '#48dc6b',
@@ -1121,11 +1128,11 @@ export class GraphListComponent implements OnInit {
           x: mDate,
           y: ProgPowper,
           text: ProgPow,
-          hovertemplate: 'ProgPow : %{y} % ( %{text:,} )',
+          hovertemplate: 'ProgPoW : %{y} % ( %{text:,} )',
           hoverlabel: {namelength : 0},
           fill: 'tozeroy',
           type: 'line',
-          name: 'ProgPow',
+          name: 'ProgPoW',
           line: {
             color: '#48dc6b',
           },
@@ -1405,7 +1412,7 @@ export class GraphListComponent implements OnInit {
           }
         },
         yaxis2: {
-          title: 'Progpow',
+          title: 'ProgPoW',
           fixedrange: true,
           // showgrid: true,
           range: range3,
diff --git a/src/app/view/home/latestblocks/latestblocks.component.html b/src/app/view/home/latestblocks/latestblocks.component.html
index 45c4ab5..6911dba 100644
--- a/src/app/view/home/latestblocks/latestblocks.component.html
+++ b/src/app/view/home/latestblocks/latestblocks.component.html
@@ -93,7 +93,7 @@
       </div>
       <div class="col-6 col-sm-6 col-md-3 tble_col">
         <div class="block_div">
-          <h6 class="mb-0">PoW Algo</h6><span class="blck_value">{{ hashvalue.powalgo }}</span>
+          <h6 class="mb-0">PoW Algo</h6><span class="blck_value">{{ (hashvalue.powalgo == 'ProgPow') ? 'ProgPoW' :  hashvalue.powalgo }}</span>
         </div>
       </div>
       <div class="col-6 col-sm-6 col-md-3 tble_col">