diff --git a/server/controllers/BlockchainKernel.ts b/server/controllers/BlockchainKernel.ts index a60a1d1..6f0dfc4 100644 --- a/server/controllers/BlockchainKernel.ts +++ b/server/controllers/BlockchainKernel.ts @@ -651,8 +651,14 @@ export class BlockchainKernelController { .utc() .format('YYYY-MM-DD'); - var timeIntervalQry = - 'timestamp BETWEEN SYMMETRIC ' + fromdate + ' AND ' + todate; + var timeIntervalQry = + "timestamp at time zone '" + + process.env.TIME_ZONE + + "' BETWEEN SYMMETRIC '" + + fromdate + + "' AND '" + + todate + + "'"; } else { var timeIntervalQry = "timestamp > current_date - interval '30 days'"; } @@ -841,11 +847,21 @@ LEFT JOIN (select block_id, count(block_id) as block_id_count from blockchain_ou TransactionFeeRequestData.FromDate || TransactionFeeRequestData.ToDate ) { - var timeIntervalQry = - 'blockchain_block.timestamp BETWEEN SYMMETRIC ' + + // var timeIntervalQry = + // 'blockchain_block.timestamp BETWEEN SYMMETRIC ' + + // TransactionFeeRequestData.FromDate + + // ' AND ' + + // TransactionFeeRequestData.ToDate; + + var timeIntervalQry = + "blockchain_block.timestamp at time zone '" + + process.env.TIME_ZONE + + "' BETWEEN SYMMETRIC '" + TransactionFeeRequestData.FromDate + - ' AND ' + - TransactionFeeRequestData.ToDate; + "' AND '" + + TransactionFeeRequestData.ToDate + + "'"; + var seriesquery = "'" + TransactionFeeRequestData.FromDate + 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 4999054..40eb468 100644 --- a/src/app/view/home/graph-list/graph-list.component.html +++ b/src/app/view/home/graph-list/graph-list.component.html @@ -659,6 +659,12 @@ 3 {{'home.MONTHS' | translate}} + + {{'home.All' | translate}} + +
{{'home.EXPLORE_IT' | translate}} { let params = new HttpParams(); + + this.feeGraphData = [] + 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_kernel/transactionlinechart') .subscribe(