EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Progpow label changes . Changes provided by Micheal on sept 23

Browse Source
This commit is contained in:
shunmugam 2019-09-24 13:01:45 +05:30
parent a1e66c0e62
commit 99cdea84e5
6 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/view/graph-view/graph-detail/graph-detail.component.html
View File

@ -100,7 +100,7 @@
<a href="JavaScript:void(0);" *ngIf="this.title=='Total Difficulty' || this.title=='Target Difficulty' || this.title == 'Blocks'" (click)=" <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' 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)=" <a href="JavaScript:void(0);" (click)="
ChartFromView('', '', '1 week', comp.Type); selectedItem = 1; comp.difficultyRange = '1 week';comp.TdifficultyRange = '1 week' 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 " id="1" #item1 [ngClass]="{ active: selectedItem == item1.id, txt_primary: true }">1
@ -145,9 +145,10 @@
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
ChartFromView('yesterday'); selectedInteverval = 2 ChartFromView('yesterday'); selectedInteverval = 2
" id="2" #intevalitem2 [ngClass]="{ active: selectedInteverval == intevalitem2.id, txt_primary: true }">Yesterday</a> " id="2" #intevalitem2 [ngClass]="{ active: selectedInteverval == intevalitem2.id, txt_primary: true }">Yesterday</a>
<a href="JavaScript:void(0);" (click)="ChartFromView('previous'); "><</a> <a *ngIf ="showcurrentIntervalDatetimestamp >= 1567468800000" href="JavaScript:void(0);" (click)="ChartFromView('previous'); "><</a>
<span>{{showcurrentIntervalDate}}</span> <span>{{showcurrentIntervalDate}} </span>
<a href="JavaScript:void(0);" (click)="ChartFromView('next'); ">></a> <a *ngIf ="showcurrentIntervalDatetimestamp < todaydate" href="JavaScript:void(0);" (click)="ChartFromView('next'); ">></a>
</div> </div>
</div> </div>

11
src/app/view/graph-view/graph-detail/graph-detail.component.ts
View File

@ -22,7 +22,7 @@ export class GraphDetailComponent implements OnInit {
public title: any; public title: any;
public id:any; public id:any;
public chartType : any = []; public chartType : any = [];
public selectedItem: Number = 3; public selectedItem: Number = 1;
public selectedItem8: Number = 1; public selectedItem8: Number = 1;
public selectedItem12: Number = 4; public selectedItem12: Number = 4;
public Type: any = ''; public Type: any = '';
@ -31,6 +31,9 @@ export class GraphDetailComponent implements OnInit {
public selectedInteverval: Number = 1; public selectedInteverval: Number = 1;
public currenyIntervalDate: any; public currenyIntervalDate: any;
public showcurrentIntervalDate: 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 GraphtInput: any;
public GraphtOutput: any; public GraphtOutput: any;
@ -77,7 +80,7 @@ export class GraphDetailComponent implements OnInit {
break; break;
case 'target-difficulty': case 'target-difficulty':
// this.totalDifficultyreq(); // this.totalDifficultyreq();
this.comp.Difficultyreq('target').then(res => { this.comp.Difficultyreq('target','','','1 week').then(res => {
this.hashdata = this.comp.linearGraphData; this.hashdata = this.comp.linearGraphData;
// console.log('this.comp.linearGraphData',this.comp.linearGraphData); // console.log('this.comp.linearGraphData',this.comp.linearGraphData);
// this.hashdata.layout.height = 300; // this.hashdata.layout.height = 300;
@ -119,7 +122,7 @@ export class GraphDetailComponent implements OnInit {
this.hashdata = this.comp.barGraphData; this.hashdata = this.comp.barGraphData;
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
this.title = 'Blocks'; this.title = 'Blocks';
this.selectedItem = 6; this.selectedItem = 1;
this.titleService.setTitle( this.titleService.setTitle(
this.route.snapshot.data.title + ' - ' + this.title, this.route.snapshot.data.title + ' - ' + this.title,
); );
@ -130,6 +133,7 @@ export class GraphDetailComponent implements OnInit {
this.hashdata = this.comp.barGraphIntevalData; this.hashdata = this.comp.barGraphIntevalData;
this.currenyIntervalDate = this.comp.currenyIntervalDate; this.currenyIntervalDate = this.comp.currenyIntervalDate;
this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
this.showcurrentIntervalDatetimestamp = new Date(this.comp.showcurrentIntervalDate).getTime();
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
this.title = 'Block Interval'; this.title = 'Block Interval';
this.selectedInteverval = 1; this.selectedInteverval = 1;
@ -284,6 +288,7 @@ export class GraphDetailComponent implements OnInit {
this.hashdata = this.comp.barGraphIntevalData; this.hashdata = this.comp.barGraphIntevalData;
this.currenyIntervalDate = this.comp.currenyIntervalDate; this.currenyIntervalDate = this.comp.currenyIntervalDate;
this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate; this.showcurrentIntervalDate =this.comp.showcurrentIntervalDate;
this.showcurrentIntervalDatetimestamp = new Date(this.comp.showcurrentIntervalDate).getTime();
this.hashdata.layout.height = 300; this.hashdata.layout.height = 300;
this.title = 'Block Interval'; this.title = 'Block Interval';
}); });

2
src/app/view/home/block-detail-list/block-detail-list.component.html
View File

@ -106,7 +106,7 @@
<span> {{ latestblockdetail.targetdifficultycuckatoo | number }}</span> <span> {{ latestblockdetail.targetdifficultycuckatoo | number }}</span>
</div> </div>
<div class="difficulty_datas"> <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> <span class="diff_span" style="width:110px;" title="{{ latestblockdetail.targetdifficultyprogpow | number }}"> {{ latestblockdetail.targetdifficultyprogpow | number }}</span>
</div> </div>
<div class="difficulty_datas"> <div class="difficulty_datas">

4
src/app/view/home/graph-list/graph-list.component.html
View File

@ -435,9 +435,9 @@
<a href="JavaScript:void(0);" (click)=" <a href="JavaScript:void(0);" (click)="
Blockintervalreq('yesterday'); selectedInteverval = 2 Blockintervalreq('yesterday'); selectedInteverval = 2
" id="2" #intevalitem2 [ngClass]="{ active: selectedInteverval == intevalitem2.id, txt_primary: true }">Yesterday</a> " 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> <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>
<div class="explore_all text-right"> <div class="explore_all text-right">

23
src/app/view/home/graph-list/graph-list.component.ts
View File

@ -29,6 +29,8 @@ export class GraphListComponent implements OnInit {
public linearTotalGraphData: any = []; public linearTotalGraphData: any = [];
public currenyIntervalDate: any; public currenyIntervalDate: any;
public showcurrentIntervalDate: any; public showcurrentIntervalDate: any;
public showcurrentIntervalDatetimestamp : any;
public todaydate = new Date().setDate(new Date().getDate() - 1);
public lg_last: any; public lg_last: any;
public ag_last: any = ''; public ag_last: any = '';
@ -453,10 +455,10 @@ export class GraphListComponent implements OnInit {
text: DifficultychartDate, text: DifficultychartDate,
// mode: 'lines+markers', // mode: 'lines+markers',
type: 'scatter', type: 'scatter',
name: 'Progpow', name: 'ProgPoW',
yaxis: 'y2', yaxis: 'y2',
line: { color: '#0091ff' }, line: { color: '#0091ff' },
hovertemplate: 'Progpow : %{y:,}', hovertemplate: 'ProgPoW : %{y:,}',
hoverlabel: {namelength : 0} hoverlabel: {namelength : 0}
}, },
{ {
@ -538,20 +540,25 @@ export class GraphListComponent implements OnInit {
if(interval == "today"){ if(interval == "today"){
this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD'); this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD');
this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY'); this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY');
this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
}else if(interval == "yesterday"){ }else if(interval == "yesterday"){
this.currenyIntervalDate = moment(new Date()).subtract(1, "days").format("YYYY-MM-DD"); 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.showcurrentIntervalDate = moment(new Date()).subtract(1, "days").format("MM-DD-YYYY");
this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
}else if(interval == "previous"){ }else if(interval == "previous"){
var currentdate = this.currenyIntervalDate; var currentdate = this.currenyIntervalDate;
this.currenyIntervalDate = moment(currentdate).subtract(1, "days").format("YYYY-MM-DD"); this.currenyIntervalDate = moment(currentdate).subtract(1, "days").format("YYYY-MM-DD");
this.showcurrentIntervalDate = moment(currentdate).subtract(1, "days").format("MM-DD-YYYY"); this.showcurrentIntervalDate = moment(currentdate).subtract(1, "days").format("MM-DD-YYYY");
this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
}else if(interval == "next"){ }else if(interval == "next"){
var currentdate = this.currenyIntervalDate; var currentdate = this.currenyIntervalDate;
this.currenyIntervalDate = moment(currentdate).add(1, "days").format("YYYY-MM-DD"); this.currenyIntervalDate = moment(currentdate).add(1, "days").format("YYYY-MM-DD");
this.showcurrentIntervalDate = moment(currentdate).add(1, "days").format("MM-DD-YYYY"); this.showcurrentIntervalDate = moment(currentdate).add(1, "days").format("MM-DD-YYYY");
this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
}else{ }else{
this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD'); this.currenyIntervalDate = moment(new Date()).format('YYYY-MM-DD');
this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY'); this.showcurrentIntervalDate = moment(new Date()).format('MM-DD-YYYY');
this.showcurrentIntervalDatetimestamp = new Date(this.showcurrentIntervalDate).getTime();
} }
// console.log(this.currenyIntervalDate); // console.log(this.currenyIntervalDate);
// console.log(this.showcurrentIntervalDate); // console.log(this.showcurrentIntervalDate);
@ -662,7 +669,7 @@ export class GraphListComponent implements OnInit {
} }
}, },
yaxis2: { yaxis2: {
title: 'Progpow', title: 'ProgPoW',
fixedrange: true, fixedrange: true,
// showgrid: true, // showgrid: true,
range: range3, range: range3,
@ -730,10 +737,10 @@ export class GraphListComponent implements OnInit {
{ {
x: sDate, x: sDate,
y: ProgPow, y: ProgPow,
name: 'Progpow', name: 'ProgPoW',
type: 'bar', type: 'bar',
text: ProgPow, text: ProgPow,
hovertemplate: '%{x}<br> ProgPow : %{text:,}', hovertemplate: '%{x}<br> ProgPoW : %{text:,}',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
marker: { marker: {
color: '#48dc6b', color: '#48dc6b',
@ -1121,11 +1128,11 @@ export class GraphListComponent implements OnInit {
x: mDate, x: mDate,
y: ProgPowper, y: ProgPowper,
text: ProgPow, text: ProgPow,
hovertemplate: 'ProgPow : %{y} % ( %{text:,} )', hovertemplate: 'ProgPoW : %{y} % ( %{text:,} )',
hoverlabel: {namelength : 0}, hoverlabel: {namelength : 0},
fill: 'tozeroy', fill: 'tozeroy',
type: 'line', type: 'line',
name: 'ProgPow', name: 'ProgPoW',
line: { line: {
color: '#48dc6b', color: '#48dc6b',
}, },
@ -1405,7 +1412,7 @@ export class GraphListComponent implements OnInit {
} }
}, },
yaxis2: { yaxis2: {
title: 'Progpow', title: 'ProgPoW',
fixedrange: true, fixedrange: true,
// showgrid: true, // showgrid: true,
range: range3, range: range3,

2
src/app/view/home/latestblocks/latestblocks.component.html
View File

@ -93,7 +93,7 @@
</div> </div>
<div class="col-6 col-sm-6 col-md-3 tble_col"> <div class="col-6 col-sm-6 col-md-3 tble_col">
<div class="block_div"> <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> </div>
<div class="col-6 col-sm-6 col-md-3 tble_col"> <div class="col-6 col-sm-6 col-md-3 tble_col">