diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts index 91d1842..c0f88cc 100644 --- a/server/controllers/BlockchainBlock.ts +++ b/server/controllers/BlockchainBlock.ts @@ -219,6 +219,10 @@ export class BlockchainBlockController { * description: Enter the Algorithm Type * in: query * type: string + * - name: Difftype + * description: Enter the Difficulty Type + * in: query + * type: string * responses: * 200: * description: Total Difficulty fetched successfully @@ -1133,8 +1137,14 @@ export class BlockchainBlockController { } var alog_type = TotalDifficultyNBlockRequestData.Type; - - const TotalDifficultyNBlockQuery = await getConnection() + var Difftype = TotalDifficultyNBlockRequestData.Difftype; + if (TotalDifficultyNBlockRequestData.Interval && TotalDifficultyNBlockRequestData.Interval != '1 day') { + var dateFormat = 'YYYY-MM-DD'; + }else{ + var dateFormat = 'HH:mm'; + } + if(Difftype == "target"){ + var TotalDifficultyNBlockQuery = await getConnection() .query( "SELECT a.hash, a.tarket_difficulty, a.date FROM(select 1 as hash, (total_difficulty_"+alog_type+" - LAG(total_difficulty_"+alog_type+") OVER (ORDER BY total_difficulty_"+alog_type+")) AS tarket_difficulty, \ DATE_TRUNC('minute', timestamp at time zone '" + @@ -1147,6 +1157,49 @@ export class BlockchainBlockController { .catch(err_msg => { next(err_msg); }); + }else if(Difftype == "solution"){ + var TotalDifficultyNBlockQuery = await getConnection() + .query( + "SELECT a.hash, a.tarket_difficulty, a.date FROM(select 1 as hash, (total_difficulty_"+alog_type+" - LAG(total_difficulty_"+alog_type+") OVER (ORDER BY total_difficulty_"+alog_type+")) AS tarket_difficulty, \ + DATE_TRUNC('minute', timestamp at time zone '" + + process.env.TIME_ZONE + + "') as date \ + from blockchain_block where " + + timeIntervalQry + + " order by height) as a WHERE a.tarket_difficulty IS NOT NULL", + ) + .catch(err_msg => { + next(err_msg); + }); + }else if(Difftype == "total"){ + var TotalDifficultyNBlockQuery = await getConnection() + .query( + "select 1 as hash, total_difficulty_"+alog_type+" as tarket_difficulty, \ + DATE_TRUNC('minute', timestamp at time zone '" + + process.env.TIME_ZONE + + "') as date \ + from blockchain_block where " + + timeIntervalQry + + " order by height", + ) + .catch(err_msg => { + next(err_msg); + }); + }else{ + var TotalDifficultyNBlockQuery = await getConnection() + .query( + "SELECT a.hash, a.tarket_difficulty, a.date FROM(select 1 as hash, (total_difficulty_"+alog_type+" - LAG(total_difficulty_"+alog_type+") OVER (ORDER BY total_difficulty_"+alog_type+")) AS tarket_difficulty, \ + DATE_TRUNC('minute', timestamp at time zone '" + + process.env.TIME_ZONE + + "') as date \ + from blockchain_block where " + + timeIntervalQry + + " order by height) as a WHERE a.tarket_difficulty IS NOT NULL", + ) + .catch(err_msg => { + next(err_msg); + }); + } let date = [], //DifficultyCuckaroo = [], //DifficultyCuckatoo = [], @@ -1157,7 +1210,7 @@ export class BlockchainBlockController { TotalDifficultyNBlockQuery.forEach(e => { //date.indexOf(moment(e.date).format('YYYY-MM-DD')) < 0 ? - date.push(moment(e.date).format('YYYY-MM-DD')); + date.push(moment(e.date).format(dateFormat)); // DifficultyCuckaroo.push(parseInt(e.total_difficulty_cuckaroo)); // DifficultyCuckatoo.push(parseInt(e.total_difficulty_cuckatoo)); // DifficultyProgpow.push(parseInt(e.total_difficulty_progpow)); @@ -1168,7 +1221,7 @@ export class BlockchainBlockController { response.status(200).json({ status: 200, timestamp: Date.now(), - message: 'Total Difficulty and Blocks Data fetched Successfully', + message: 'Difficulty and Blocks Data fetched Successfully', response: { Date: date, // DifficultyCuckaroo: DifficultyCuckaroo, diff --git a/server/dtos/BlockchainBlock.ts b/server/dtos/BlockchainBlock.ts index c17ee97..b7a83b5 100644 --- a/server/dtos/BlockchainBlock.ts +++ b/server/dtos/BlockchainBlock.ts @@ -139,4 +139,7 @@ export class TotalDifficultyNBlockDto { @IsString() public Type: string; + @IsString() + public Difftype: string; + } diff --git a/server/i18n/de.json b/server/i18n/de.json index d98ee2e..e062121 100644 --- a/server/i18n/de.json +++ b/server/i18n/de.json @@ -1,5 +1,5 @@ { - "total-difficulty" : "Gesamtschwierigkeit", + "difficulty" : "Schwierigkeit", "transactions-by-time" : "Transaktionen im Zeitverlauf", "blocks" : "Blöcke", "transaction-fees" : "Transkationsgebühren", diff --git a/server/i18n/en.json b/server/i18n/en.json index fe05d36..73ad174 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -1,5 +1,5 @@ { - "total-difficulty" : "Total Difficulty", + "difficulty" : "Difficulty", "transactions-by-time" : "Transactions over time", "blocks" : "Blocks", "transaction-fees" : "Transaction Fees", 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 43feb74..92821bd 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 @@ -8,7 +8,7 @@
-

{{this.chartType | translate}}

+

{{this.title=='Total Difficulty' ? 'Target Difficulty' : this.chartType | translate}}

@@ -32,7 +32,7 @@ ChartFromView('', '', '3 months', comp.Type); selectedItem = 5; comp.difficultyRange = '3 months' " id="5" #item5 [ngClass]="{ active: selectedItem == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}
-
+
Cuckoo @@ -72,7 +72,7 @@

{{'home.EXPLORE' | translate}}

+
+
+ +
+
+
+
+ +

Total Difficulty

+ + +
+ 1 Day + 1 {{'home.WEEK' | translate}} + 15 {{'home.DAYS' | translate}} + 30 {{'home.DAYS' | translate}} + 60 {{'home.DAYS' | translate}} + 3 {{'home.MONTHS' | translate}} +
+
+ Cuckoo + ProgPow + RandomX +
+ +
+ +
+
+
+
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 95f9e6d..decea01 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 @@ -25,13 +25,16 @@ export class GraphDetailComponent implements OnInit { public selectedItem8: Number = 2; public selectedItem12: Number = 1; public Type: any = ''; - + public selectedTarget: Number = 3; + public selectedTarget12: Number = 1; public GraphtInput: any; public GraphtOutput: any; public GraphtKernal: any; public GraphtDate: any; public GraphtHour: any; + public linearTotalGraphData: any = []; + public TdifficultyRange: any = '1 day'; constructor( private route: ActivatedRoute, @@ -41,9 +44,7 @@ export class GraphDetailComponent implements OnInit { public translate: TransServiceService ) {} ngOnInit() { - if(this.title=='Total Difficulty'){ - this.selectedItem = 6; - } + var self = this; var x = setInterval(function() { self.TimeArr = self.chartService.GetTimer() @@ -54,11 +55,14 @@ export class GraphDetailComponent implements OnInit { this.chartType = params['hashid']; //console.log(this.chartType); switch(this.chartType){ - case 'total-difficulty': + case 'difficulty': + this.totalDifficultyreq(); this.comp.Difficultyreq().then(res => { this.hashdata = this.comp.linearGraphData; this.hashdata.layout.height = 500; this.title = 'Total Difficulty'; + this.selectedItem = 6; + this.selectedTarget = 6; this.titleService.setTitle( this.route.snapshot.data.title + ' - ' + this.title, ); @@ -199,7 +203,7 @@ export class GraphDetailComponent implements OnInit { this.comp.Type = p4 != '' ? p4 : this.comp.Type == '' ? 'cuckatoo' : this.comp.Type; switch (this.chartType) { - case 'total-difficulty': + case 'difficulty': this.comp.Difficultyreq(p1, p2, p3, p4).then(res => { this.hashdata = this.comp.linearGraphData; this.hashdata.layout.height = 500; @@ -291,4 +295,75 @@ export class GraphDetailComponent implements OnInit { break; } } + + totalDifficultyreq( + fromDate = '', + ToDate = '', + interval = '', + type = '' + ) { + this.Type = type != '' ? type : this.Type == '' ? 'cuckatoo' : this.Type; + return new Promise((resolve, reject) => { + let params = new HttpParams(); + params = params.append('FromDate', fromDate); + params = params.append('ToDate', ToDate); + params = params.append('Interval', interval); + params = params.append('Type', this.Type); + params = params.append('Difftype', 'total'); + this.chartService + .apiGetRequest(params, '/blockchain_block/totaldiff') + .subscribe( + res => { + if (res['status'] == 200) { + let DifficultychartDate = res.response.Date; + let TargetDifficulty = res.response.TargetDifficulty; + + this.totaldifficultyChartFunc( + DifficultychartDate, + TargetDifficulty, + this.Type + ); + resolve(); + } + }, + error => {}, + ); + }); + } + + totaldifficultyChartFunc(DifficultychartDate, TargetDifficulty, Type) { + this.linearTotalGraphData = { + data: [ + { + x: DifficultychartDate, + y: TargetDifficulty, + text: TargetDifficulty, + mode: 'lines+markers', + type: 'scatter', + name: '', + line: { color: '#ac3333' }, + hovertemplate: '%{x}
Difficulty : %{text:,}', + }, + ], + layout: { + hovermode: 'closest', + height: 250, + autosize: true, + showlegend: false, + xaxis: { + tickangle: -45, + tickformat: '%m-%d', + }, + yaxis: { + title: 'Diff', + }, + margin: { + l: 50, + r: 50, + b: 50, + t: 50, + }, + }, + }; + } } 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 8ab895e..8837c8f 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 @@ -
+
1 Day @@ -45,7 +45,7 @@
-
+
Cuckoo @@ -56,7 +56,7 @@ Difficultyreq('', '', difficultyRange,'randomx'); selectedItem12 = 3 " id="3" #item123 [ngClass]="{ active: selectedItem12 == item123.id, txt_primay: true }">RandomX
- {{'home.EXPLORE_IT' | translate}} {{'home.EXPLORE_IT' | translate}}
diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 7a8d886..45934d5 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -644,3 +644,4 @@ body.dark_theme { .dark_theme .tab_hdng{color: #ffffff;} .dark_theme .view_content table{border-color: #384566;} .dark_theme .card-body{background-color: #1c2437;} +.diff_margin{margin-bottom: -10px !important; margin-top: -10px !important;} \ No newline at end of file