diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs
index c1ccd0ce7..1e394d2bf 100644
--- a/src/client/spark/Images/Icons.cs
+++ b/src/client/spark/Images/Icons.cs
@@ -92,6 +92,7 @@ namespace mbts.ui
public static ImageSource AddSynthetic { get { return (DrawingImage)_resources["AddSynthetic"]; } }
public static ImageSource RemoveSynthetic { get { return (DrawingImage)_resources["RemoveSynthetic"]; } }
public static ImageSource ModifySynthetic { get { return (DrawingImage)_resources["ModifySynthetic"]; } }
+ public static ImageSource CloneSynthetic { get { return (DrawingImage)_resources["CloneSynthetic"]; } }
public static ImageSource ModifyOrder { get { return (DrawingImage)_resources["ModifyOrder"]; } }
public static ImageSource Clock { get { return (DrawingImage)_resources["Clock"]; } }
diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml
index 3bb5591cf..f51f84272 100644
--- a/src/client/spark/Images/Vector/Icons.xaml
+++ b/src/client/spark/Images/Vector/Icons.xaml
@@ -718,6 +718,17 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z">
+
+
+
+
+
+
+
+
+
-
+
diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf
index 5e761ce22..c719216f7 100644
--- a/src/lib/config/defaults/jetfix.conf
+++ b/src/lib/config/defaults/jetfix.conf
@@ -247,5 +247,5 @@ JetFIX {
# pp cme_mbx
# taha cme_mc1
# kevin cme_mc5
-
+# michael cme_mc8
SparkConnection {value {connection_name: "sim"}}
diff --git a/testing/manual/misc/P&L.txt b/testing/manual/misc/P&L.txt
index 3c6f08f0b..6558964e5 100644
--- a/testing/manual/misc/P&L.txt
+++ b/testing/manual/misc/P&L.txt
@@ -1,12 +1,68 @@
P&L UI Test
-Open the P&L form (Trading->P&L)
+Turn merge with md off since we want to control the md
-Open a ladder and select an account that's not currently listed on the P&L form
+ExchangeSim {
+ value {merge_with_md:false}
+}
-Make some trades by crossing yourself in that ladder.
+clear your fills database:
+ rm ~/.bts/data/databases/fills/*
-A new P&L row with your account should come up, P&L should read zero, buy qty and sell qty should be equal
+and you may also want to clear your orders for a clean slate:
+ rm ~/.bts/data/databases/orders/*
+
+Bring up the pnl form (empty).
+Bring up a ladder form. It should be completely empty since we're controlling the md. For this exercise we'll be using ES.
+Bring up an order ticket for your corresponding ladder
+ place a buy order with price 2500 and qty 100
+ your ladder should populate now
+Sell a 1 lot at your bid
+ The Start of Day (SOD) position should be 0
+ Buy qty and Sell qty should be 1 (we crossed our own bid)
+ Net Pos should be 0 (buy 1 - sell 1)
+ PnL should be 0 (since we have a 0 net position)
+ PnL Price should be the level of your bid.
+ AvgBuy and Avg Sell should both represent the level at which you entered the buy and sell order
+Improve the bid
+ Under BTS2 account (this is important for the next step), enter a 100 lot at 2500.25
+ Observe the PnL Price reflect the current bid
+ Switch back to BTS1
+Sell a 1 lot at the current bid
+ You should now have rows for both the BTS1 and BTS2 account
+ BTS1
+ Sell Qty 2
+ Net Pos -1
+ PnL 0
+ Avg Buy 2500.0
+ Avg Sell 2500.13
+Improve the Bid
+ Enter a 100 lot at 2500.50
+ The PnL Price should reflect the current Bid (2500.5)
+ The PnL for BTS1 account should show -12.5
+ Fill 1: 25 = (2500.5 - 2500) * 1 * 50
+ Fill 2: -25 = (2500 - 2500.5) * 1 * 50
+ Fill 3: -12.5 = (2500.25 - 2500.5) * 1 * 50
+ The PnL for BTS2 account should show 12.5 by a similar calculation as above (but there is only 1 fill)
+Go to bed and wake up the next day
+ The SOD for BTS1 should show a -1
+ The SOD for BTS2 should show a 1
+ Buy Qty for all should show 0
+ Sell Qty for all should show 0
+ Net Pos should be the same as SOD at the moment
+The simulator might not work for orders left up overnight
+ If your ladder shows no working orders, place a buy order with price 2500 and qty 100
+Sell a 1 lot as the current bid
+ The SOD should still show -1
+ The Buy and Sell Qty should show 1 (we crossed ourself)
+ The net position will still say -1
+ Now switch to BTS2
+Sell a 5 lot at the current bid
+ The SOD should still show -1
+ BTS1 Buy qty should show 5
+ BTS1 Sell Qty should show 1
+ Net Pos should show 3 (-1 (SOD) + 5 (Buys) -1 (Sells))
+ BTS1 PnL should show 12.5
Test sorting and filtering
diff --git a/testing/manual/misc/ladder.txt b/testing/manual/misc/ladder.txt
index ff94b7bb7..abc4164ee 100644
--- a/testing/manual/misc/ladder.txt
+++ b/testing/manual/misc/ladder.txt
@@ -17,6 +17,7 @@ Check that what you mouse into or type into the keypad is reflected in the order
Cancels: Work some orders, cancel them individually, and via Cancel Bids, Cancel Asks, Cancel all
Order Types
+**Market, Stop, and Stop Limit orders require Cert**
Test a market order, do a buy and a sell and make sure they fill at market price and qty
Test Stop and Stop limit orders. Put a Stop Buy above the market and a Stop Sell below
@@ -25,6 +26,4 @@ Select ICEBerg and then specify limit as subtype via the left arrow. Set show q
Now select a size greater than 1 in the main ladder, place buys and sells in the ladder.'
Test TimeBox
-Ask Taha?
-
-
+Enter any time in the future and a reasonable end time. Enter two orders. Cross one of the orders during the specified time window with a limit order and verify it was filled correctly. Verify the other order cancels after the end time.
diff --git a/tools/setup_builds.bat b/tools/setup_builds.bat
index 431b08f6a..864627cdc 100644
--- a/tools/setup_builds.bat
+++ b/tools/setup_builds.bat
@@ -12,4 +12,4 @@ if exist "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Commo
)
copy /y ..\tools\cpp.build.props Directory.Build.Props
del spark.sln
-nuget_restore.cmd
+%~dp0\nuget_restore.cmd