Fix bugs

app.py

@@ -36,8 +36,14 @@ def fetch_orders_for_strategy(strategy):
     orders['profit'] = orders['close_price'] - orders['open_price']
     orders['profit'] = orders['profit'].round(2)
     orders['created_date'] = orders['created_ts'].dt.date
-    orders['ticker_open_price'] = orders['ticker_open_price'].astype(int)
-    orders['ticker_close_price'] = orders['ticker_close_price'].astype(int)
+    orders['ticker_open_price'] = pd.to_numeric(orders['ticker_open_price'], errors="coerce")
+    orders['ticker_close_price'] = pd.to_numeric(orders['ticker_close_price'], errors="coerce")
+    orders['ticker_open_price'] = orders['ticker_open_price'].astype(int, errors='ignore')
+    orders['ticker_close_price'] = orders['ticker_close_price'].astype(int, errors='ignore')
+    orders['ticker_delta'] = orders['ticker_close_price'] - orders['ticker_open_price']
+    orders['ticker_delta'] = orders['ticker_delta'].round(2)
+    orders['ticker_delta'] = orders.apply(lambda o: o['ticker_delta'] if o['market_position'] == 'long' else -o['ticker_delta'], axis=1)
+    #market_position
     orders = orders.sort_values(by='created_ts', ascending=False)
     return orders
 
@@ -55,18 +61,19 @@ def create_latest_profit_plot(strategy, profits):
     plot.update_layout(legend=dict(x=0.5, y=0.99),  title_x=0.5, legend_title_text="")
 
     table = go.Figure(data=[go.Table(
-        header=dict(values=list(['Strategy', 'Created', 'Closed', 'Ticker Open', 'Ticker Close', 'Market Type', 'Symbol', 'Open', 'Close', 'Qty', 'Profit']),
+        header=dict(values=list(['Created', 'Closed',  'Market Type', 'Symbol', 'Qty', 'Ticker Delta', 'Open', 'Close', 'Profit']),
                     align='left'),
-        cells=dict(values=[orders.strategy_id,
+        cells=dict(values=[
                             orders.created_ts,
                             orders.closed_ts,
-                            orders.ticker_open_price,
-                            orders.ticker_close_price,
+                            # orders.ticker_open_price,
+                            # orders.ticker_close_price,
                             orders.market_type,
                             orders.tradingsymbol,
+                            orders.quantity,
+                            orders.ticker_delta,
                             orders.open_price,
                             orders.close_price,
-                            orders.quantity,
                             orders.profit])
                 )
     ])