Diagnostics...

Changes to be committed: modified: Extras/OliverTwist/OliverTwistEquity modified: Extras/OliverTwist/OliverTwistTrades
rapmd73 · Sep 23, 2024 · a2f9560 · a2f9560
1 parent 34249c0
commit a2f9560
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Extras/OliverTwist/OliverTwistEquity b/Extras/OliverTwist/OliverTwistEquity
@@ -58,7 +58,7 @@ else:
 lines=JRRsupport.ReadFile(sys.argv[2]).strip().split('\n')
 
 for line in lines:
-    if line=='' or ('Prft' not in line and 'Loss' not in line):
+    if line=='' or ('prft' not in line.lower() and 'loss' not in line.lower()):
         continue
 
     data=line.split(' ')
@@ -67,9 +67,9 @@ for line in lines:
 
     pdata=line.split('/')[1].strip().split(',')[0]
 
-    if 'Prft' in line:
+    if 'prft' in line.lower():
         pnl+=float(pdata)
-    if 'Loss' in line:
+    if 'loss' in line.lower():
         pnl-=float(pdata)
 
     xps.append(dt)

diff --git a/Extras/OliverTwist/OliverTwistTrades b/Extras/OliverTwist/OliverTwistTrades
@@ -233,7 +233,7 @@ for order in OpenOrders:
         du=float(order['Response']['Details']['Amount'])
         dp=float(order['Response']['Details']['Price'])
     else: # CCXT framework fall through
-        du=float(order['Response']['Details']['Amount'])
+        du=float(order['Response']['Details']['amount'])
         dp=float(order['Response']['Details']['price'])
 
     htxt=f"{order['ID']}: {du:.0f}@{dp:.5f}"