From f0eb187819ffd8f0316ebb8c5311b2dd28602084 Mon Sep 17 00:00:00 2001 From: shunmugam Date: Tue, 7 Jan 2020 11:12:06 +0530 Subject: [PATCH] Commit for place All tab in total diffculty tab --- server/controllers/BlockchainBlock.ts | 2 +- server/i18n/en.json | 2 +- src/app/view/home/graph-list/graph-list.component.html | 2 +- src/app/view/home/graph-list/graph-list.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/controllers/BlockchainBlock.ts b/server/controllers/BlockchainBlock.ts index bae49de..7477f63 100644 --- a/server/controllers/BlockchainBlock.ts +++ b/server/controllers/BlockchainBlock.ts @@ -1309,7 +1309,7 @@ export class BlockchainBlockController { try { const TotalDifficultyNBlockRequestData: TotalDifficultyNBlockDto = request.query; - if (TotalDifficultyNBlockRequestData.Interval) { + if (TotalDifficultyNBlockRequestData.Interval && TotalDifficultyNBlockRequestData.Interval != "all") { var timeIntervalQry = "timestamp at time zone '" + process.env.TIME_ZONE + diff --git a/server/i18n/en.json b/server/i18n/en.json index 0536826..f7a64fb 100644 --- a/server/i18n/en.json +++ b/server/i18n/en.json @@ -61,7 +61,7 @@ "TRANSACTIONS_VS_DATE" : "Transactions by Date", "DAYS" : "days", "MONTHS" : "months", - "All" : "all", + "All" : "All", "WEEK" : "week", "SEARCH_TEXT" : "Search by hash, or block height or output commit ID", "BLOCK_REWARD" : "Block Reward", 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 ad5fa14..fe951be 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -64,7 +64,7 @@ all {{'home.All' | translate}} + " id="7" #item7 [ngClass]="{ active: selectedItem == item7.id, day3m_txt: true }">{{'home.All' | translate}} 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 226f73f..29d855e 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -435,7 +435,7 @@ export class GraphListComponent implements OnInit { let params = new HttpParams(); params = params.append('FromDate', fromDate); params = params.append('ToDate', ToDate); - params = params.append('Interval', (interval == "all")?"":interval); + params = params.append('Interval', (interval == "all")?"all":interval); params = params.append('Type', this.Type); params = params.append('Difftype', difftype); this.chartService