lychiyu/frequi_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/frequi.git synced 2024-11-22 19:15:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't exclude still open trades from plotting

Browse Source 
closes #1093
This commit is contained in:
Matthias 2023-01-14 21:30:51 +01:00
parent 312a3bc173
commit 2078ff8942
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/charts/tradeChartData.ts
View File

@ -43,15 +43,18 @@ export function getTradeEntries(dataset: PairHistory, filteredTrades: Trade[]) {
for (let i = 0, len = filteredTrades.length; i < len; i += 1) { for (let i = 0, len = filteredTrades.length; i < len; i += 1) {
const trade: Trade = filteredTrades[i]; const trade: Trade = filteredTrades[i];
if ( if (
trade.open_timestamp >= dataset.data_start_ts && // Trade is open or closed and within timerange
trade.open_timestamp <= dataset.data_stop_ts roundTimeframe(dataset.timeframe_ms ?? 0, trade.open_timestamp) <= dataset.data_stop_ts ||
!trade.close_timestamp ||
(trade.close_timestamp && trade.close_timestamp >= dataset.data_start_ts)
) { ) {
if (trade.orders) { if (trade.orders) {
for (let i = 0; i < trade.orders.length; i++) { for (let i = 0; i < trade.orders.length; i++) {
const order: Order = trade.orders[i]; const order: Order = trade.orders[i];
if ( if (
order.order_filled_timestamp && order.order_filled_timestamp &&
order.order_filled_timestamp <= dataset.data_stop_ts && roundTimeframe(dataset.timeframe_ms ?? 0, order.order_filled_timestamp) <=
dataset.data_stop_ts &&
order.order_filled_timestamp > dataset.data_start_ts order.order_filled_timestamp > dataset.data_start_ts
) { ) {
// Trade entry // Trade entry
@ -68,7 +71,8 @@ export function getTradeEntries(dataset: PairHistory, filteredTrades: Trade[]) {
// Trade exit // Trade exit
} else if (i === trade.orders.length - 1 && trade.close_timestamp) { } else if (i === trade.orders.length - 1 && trade.close_timestamp) {
if ( if (
trade.close_timestamp <= dataset.data_stop_ts && roundTimeframe(dataset.timeframe_ms ?? 0, trade.close_timestamp) <=
dataset.data_stop_ts &&
trade.close_timestamp > dataset.data_start_ts && trade.close_timestamp > dataset.data_start_ts &&
trade.is_open === false trade.is_open === false
) { ) {