fix 3-11 internal dash error

app.py

@@ -183,12 +183,16 @@ def drop_frac_cents(d):
     D = np.floor(100*d)/100
     return D
 def load_data(filename, account, exchange, otimeheader, fmat):
-    cols = ['id','datetime', 'exchange', 'subaccount', 'pair', 'side', 'action', 'amount', 'price', 'errors']
-    old_df = pd.read_csv("history-old.csv", header = 0, names= cols)
-    df = pd.read_csv(filename, header = 0, names= cols)
-    df = pd.concat([old_df, df], ignore_index=True)
-    filtdf = df[(df.exchange == exchange) & (df.subaccount == account)].dropna()
+    cols1 = ['id','datetime', 'exchange', 'subaccount', 'pair', 'side', 'action', 'amount', 'price', 'errors']
+    cols2 = ['id','datetime', 'exchange', 'subaccount', 'pair', 'side', 'action', 'amount', 'price', 'errors', 'P/L', 'P/L %','exit price', 'Lev']
+    old_df = pd.read_csv("history-old.csv", header = 0, names= cols1)
+    df = pd.read_csv(filename, header = 0, names= cols2)
+    df.loc[df['exit price'] > 0, 'price'] = df.loc[df['exit price'] > 0, 'exit price']
+    
+    df = pd.concat([old_df, df[old_df.columns]], ignore_index=True)
     
+    filtdf = df[(df.exchange == exchange) & (df.subaccount == account)].dropna()
+
     if not filtdf.empty:
         filtdf = filtdf.sort_values('datetime')
         filtdf = filtdf.iloc[np.where(filtdf.action == 'open')[0][0]:, :] #get first open signal in dataframe
@@ -243,6 +247,7 @@ def load_data(filename, account, exchange, otimeheader, fmat):
     
     df[dateheader] = [dateutil.parser.parse(date).date() for date in df[dateheader]]
     df[theader] = [dateutil.parser.parse(time).time() for time in df[theader]]
+    
     return df
 
 def get_sd_df(sd_df, sd, bot_selections, dca1, dca2, dca3, dca4, dca5, dca6, fees, lev, dollar_cap, principal_balance):

history-old.csv

@@ -14,4 +14,7 @@
 36,362,2024-03-05 02:00:12,BingX,Pure Bread (BingX),DOGEUSDT,LONG,open,12478,0.17898,Order filled
 37,363,2024-03-05 02:00:11,Phemex,Pure Bread (Phemex),DOGEUSDT,long,open,11729,0.17897205899906200,Order filled
 35,361,2024-03-05 02:00:08,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,open,12172,0.17893721,Order filled
-34,360,2024-03-05 02:00:06,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,11745,0.178745,Order filled
+34,360,2024-03-05 02:00:06,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,11745,0.178745,Order filled
+41,506,2024-03-11 15:30:57,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,short,close,12109,0.181040000,Order filled
+31,494,2024-03-11 08:00:16,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,open,12109,0.17260513,Order filled
+

history.csv

@@ -30,24 +30,18 @@
 28,491,2024-03-11 08:00:06,BingX,Pure Bread (BingX),DOGEUSDT,SHORT,close,12080,0.17228,Order filled,,,,
 29,492,2024-03-11 08:00:07,BingX,Pure Bread (BingX),DOGEUSDT,LONG,open,13241,0.17224,Order filled,,,,
 30,493,2024-03-11 08:00:15,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,close,11069,0.1725747,Order filled,,,,
-31,494,2024-03-11 08:00:15,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,open,12109,0.17260513,Order filled,,,,
-32,495,2024-03-11 08:00:16,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,11813,0.17260261660882079,Order filled,,,,
-33,496,2024-03-11 08:00:17,Phemex,Pure Bread (Phemex),DOGEUSDT,long,open,12946,0.1727229847057006,Order filled,,,,
-34,497,2024-03-11 08:00:24,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,12389,0.172581,Order filled,,,,
-35,498,2024-03-11 08:00:26,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,12389,0.1726,Order filled,,,,
-36,500,2024-03-11 10:27:41,Bitget,bitget test321,ETHUSDT,long,open,0.08,4028.66,Order filled,0.0,0.0,0.0,0.0
-37,501,2024-03-11 10:28:09,Bitget,bitget test321,ETHUSDT,long,close,0.08,4028.66,Order filled,-0.2632,-1.22,4025.37,15.0
-38,503,2024-03-11 10:38:45,Bitget,bitget test321,ETHUSDT,short,open,0.07,4039.5,Order filled,0.0,0.0,0.0,0.0
-39,504,2024-03-11 10:38:56,Bitget,bitget test321,ETHUSDT,short,close,0.07,4039.5,Order filled,-0.0273,-0.14,4039.89,15.0
-40,505,2024-03-11 15:30:53,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,12389,0.1726,Order filled,102.531,14.38,0.18088,3.0
-41,506,2024-03-11 15:30:57,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,none,close,0,0,Order filled,0.0,0.0,0.0,0.0
-42,507,2024-03-11 15:30:53,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,12946,0.17275,Order filled,107.373,14.4,0.1811,3.0
-43,508,2024-03-11 15:30:59,BingX,Pure Bread (BingX),DOGEUSDT,long,close,13241,0.17224,Order filled,114.204,15.03,0.18087,3.0
-44,509,2024-03-11 22:00:04,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,open,13702,0.17391,Order filled,0.0,0.0,0.0,0.0
-45,510,2024-03-11 22:00:05,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,13858,0.173909,Order filled,0.0,0.0,0.0,0.0
-46,511,2024-03-11 22:00:08,BingX,Pure Bread (BingX),DOGEUSDT,long,open,14989,0.17371,Order filled,0.0,0.0,0.0,0.0
-47,512,2024-03-11 22:00:10,Phemex,Pure Bread (Phemex),DOGEUSDT,long,open,14562,0.17409,Order filled,0.0,0.0,0.0,0.0
-48,520,2024-03-12 09:00:50,BingX,Pure Bread (BingX),DOGEUSDT,long,close,14989,0.17371,Order filled,-98.5217,-11.35,0.16714,3.0
-49,521,2024-03-12 09:00:56,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,close,13702,0.17391,Order filled,-96.7856,-11.73,0.16711,3.0
-50,522,2024-03-12 09:00:55,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,14562,0.17411,Order filled,-105.612,-12.5,0.16687,3.0
-51,523,2024-03-12 09:01:06,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,13858,0.17391,Order filled,-91.8525,-11.43,0.16728,3.0
+31,495,2024-03-11 08:00:16,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,11813,0.17260261660882079,Order filled,,,,
+32,496,2024-03-11 08:00:17,Phemex,Pure Bread (Phemex),DOGEUSDT,long,open,12946,0.1727229847057006,Order filled,,,,
+33,497,2024-03-11 08:00:24,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,12389,0.172581,Order filled,,,,
+34,498,2024-03-11 08:00:26,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,12389,0.1726,Order filled,,,,
+35,505,2024-03-11 15:30:53,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,12389,0.1726,Order filled,102.531,14.38,0.18088,3.0
+36,507,2024-03-11 15:30:53,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,12946,0.17275,Order filled,107.373,14.4,0.1811,3.0
+37,508,2024-03-11 15:30:59,BingX,Pure Bread (BingX),DOGEUSDT,long,close,13241,0.17224,Order filled,114.204,15.03,0.18087,3.0
+38,509,2024-03-11 22:00:04,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,open,13702,0.17391,Order filled,0.0,0.0,0.0,0.0
+39,510,2024-03-11 22:00:05,Bitget,Pure Bread (BitGet),DOGEUSDT,long,open,13858,0.173909,Order filled,0.0,0.0,0.0,0.0
+40,511,2024-03-11 22:00:08,BingX,Pure Bread (BingX),DOGEUSDT,long,open,14989,0.17371,Order filled,0.0,0.0,0.0,0.0
+41,512,2024-03-11 22:00:10,Phemex,Pure Bread (Phemex),DOGEUSDT,long,open,14562,0.17409,Order filled,0.0,0.0,0.0,0.0
+42,520,2024-03-12 09:00:50,BingX,Pure Bread (BingX),DOGEUSDT,long,close,14989,0.17371,Order filled,-98.5217,-11.35,0.16714,3.0
+43,521,2024-03-12 09:00:56,Bybit Futures,Pure Bread (ByBit),DOGEUSDT,long,close,13702,0.17391,Order filled,-96.7856,-11.73,0.16711,3.0
+44,522,2024-03-12 09:00:55,Phemex,Pure Bread (Phemex),DOGEUSDT,long,close,14562,0.17411,Order filled,-105.612,-12.5,0.16687,3.0
+45,523,2024-03-12 09:01:06,Bitget,Pure Bread (BitGet),DOGEUSDT,long,close,13858,0.17391,Order filled,-91.8525,-11.43,0.16728,3.0