Commit for timezone mention in kernal
This commit is contained in:
parent
61f2454f0b
commit
ada0d5ba8a
@ -651,8 +651,14 @@ export class BlockchainKernelController {
|
|||||||
.utc()
|
.utc()
|
||||||
.format('YYYY-MM-DD');
|
.format('YYYY-MM-DD');
|
||||||
|
|
||||||
var timeIntervalQry =
|
var timeIntervalQry =
|
||||||
'timestamp BETWEEN SYMMETRIC ' + fromdate + ' AND ' + todate;
|
"timestamp at time zone '" +
|
||||||
|
process.env.TIME_ZONE +
|
||||||
|
"' BETWEEN SYMMETRIC '" +
|
||||||
|
fromdate +
|
||||||
|
"' AND '" +
|
||||||
|
todate +
|
||||||
|
"'";
|
||||||
} else {
|
} else {
|
||||||
var timeIntervalQry = "timestamp > current_date - interval '30 days'";
|
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.FromDate ||
|
||||||
TransactionFeeRequestData.ToDate
|
TransactionFeeRequestData.ToDate
|
||||||
) {
|
) {
|
||||||
var timeIntervalQry =
|
// var timeIntervalQry =
|
||||||
'blockchain_block.timestamp BETWEEN SYMMETRIC ' +
|
// '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 +
|
TransactionFeeRequestData.FromDate +
|
||||||
' AND ' +
|
"' AND '" +
|
||||||
TransactionFeeRequestData.ToDate;
|
TransactionFeeRequestData.ToDate +
|
||||||
|
"'";
|
||||||
|
|
||||||
var seriesquery =
|
var seriesquery =
|
||||||
"'" +
|
"'" +
|
||||||
TransactionFeeRequestData.FromDate +
|
TransactionFeeRequestData.FromDate +
|
||||||
|
@ -659,6 +659,12 @@
|
|||||||
<a href="JavaScript:void(0);" (click)="
|
<a href="JavaScript:void(0);" (click)="
|
||||||
Transactionlinechartreq('', '', '3 months'); selectedItem8 = 5
|
Transactionlinechartreq('', '', '3 months'); selectedItem8 = 5
|
||||||
" id="5" #item5 [ngClass]="{ active: selectedItem8 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
|
" id="5" #item5 [ngClass]="{ active: selectedItem8 == item5.id, day3m_txt: true }">3 {{'home.MONTHS' | translate}}</a>
|
||||||
|
|
||||||
|
<a href="JavaScript:void(0);" (click)="
|
||||||
|
Transactionlinechartreq('', '', 'all'); selectedItem8 = 8;
|
||||||
|
" id="8" #item8 [ngClass]="{ active: selectedItem8 == item8.id, day3m_txt: true }">{{'home.All' | translate}}</a>
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="explore_all text-right">
|
<div class="explore_all text-right">
|
||||||
<a routerLink="/chart/transactions-by-date"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
|
<a routerLink="/chart/transactions-by-date"><span class="text-uppercase d-block">{{'home.EXPLORE_IT' | translate}} <i
|
||||||
|
@ -222,9 +222,18 @@ export class GraphListComponent implements OnInit {
|
|||||||
Transactionlinechartreq(fromDate = '', ToDate = '', interval = '') {
|
Transactionlinechartreq(fromDate = '', ToDate = '', interval = '') {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let params = new HttpParams();
|
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('FromDate', fromDate);
|
||||||
params = params.append('ToDate', ToDate);
|
params = params.append('ToDate', ToDate);
|
||||||
params = params.append('Interval', interval);
|
// params = params.append('Interval', interval);
|
||||||
this.chartService
|
this.chartService
|
||||||
.apiGetRequest(params, '/blockchain_kernel/transactionlinechart')
|
.apiGetRequest(params, '/blockchain_kernel/transactionlinechart')
|
||||||
.subscribe(
|
.subscribe(
|
||||||
|
Loading…
Reference in New Issue
Block a user