Hide PnL columns

This commit is contained in:
Michael Harding committed 2019-12-06 10:37:28 -05:00
1 parent a08eb90b1a
commit c98144daa0
2 files changed
+108 -94

No files matched your search

+105 -91
View File
@@ -60,56 +60,49 @@ let calcPnL (bid:double) (ask:double) (longPrice:double) (shortPrice:double) lon
)
let PnLTabView (model:Model) (dispatch:Msg->Unit) =
let visibleCols = [
("Account", true)
("Symbol", false)
("Exchange", false)
("Type", true)
("Security", true)
("Security Key", false)
("Total PnL", false)
("Open PnL", false)
("Day PnL", true)
("Total Pos", false)
("Total Long", false)
("Total Long Avg", false)
("Total Short", false)
("Total Short Avg", false)
("Open Pos", false)
("Open Long", false)
("Open Long Avg", false)
("Open Short", false)
("Open Short Avg", false)
("Day Pos", true)
("Day Long", false)
("Day Long Avg", false)
("Day Short", false)
("Day Short Avg", false)
("Raw Day Long", false)
("Raw Day Short", false)
("Raw Day Pos", false)
("Traded Today", true)
("Bid", false)
("Ask", false)
("Mid", false)
("Last", false)
("Settlement", false)
("CPP", false)]
// Browser.window.localStorage.setItem("thing", "some")
// let thing = Browser.window.localStorage.getItem("thing")
let headerRow:TableControl.row =
{
cells =
[
TableControl.Cell (str "Symbol")
TableControl.Cell (str "Account")
TableControl.Cell (str "Exchange")
TableControl.Cell (str "Type")
TableControl.Cell (str "Security")
TableControl.Cell (str "Security Key")
TableControl.Cell (str "Total PnL")
TableControl.Cell (str "Open PnL")
TableControl.Cell (str "Day PnL")
TableControl.Cell (str "Total Pos")
TableControl.Cell (str "Total Long")
TableControl.Cell (str "Total Long Avg")
TableControl.Cell (str "Total Short")
TableControl.Cell (str "Total Short Avg")
TableControl.Cell (str "Open Pos")
TableControl.Cell (str "Open Long")
TableControl.Cell (str "Open Long Avg")
TableControl.Cell (str "Open Short")
TableControl.Cell (str "Open Short Avg")
TableControl.Cell (str "Day Pos")
TableControl.Cell (str "Day Long")
TableControl.Cell (str "Day Long Avg")
TableControl.Cell (str "Day Short")
TableControl.Cell (str "Day Short Avg")
TableControl.Cell (str "Raw Day Long")
TableControl.Cell (str "Raw Day Short")
TableControl.Cell (str "Raw Day Pos")
TableControl.Cell (str "Traded Today")
(*
// TableControl.Cell (str "Working Pos")
// TableControl.Cell (str "Working Long") // Working Long Pos
// TableControl.Cell (str "Working Long Ave") // working long avg price
// TableControl.Cell (str "Working Short") // Working short Pos
// TableControl.Cell (str "Working Short Avg") // Working short avg price
*)
TableControl.Cell (str "Bid")
TableControl.Cell (str "Ask")
TableControl.Cell (str "Mid")
TableControl.Cell (str "Last")
TableControl.Cell (str "Settlement")
// TableControl.Cell (str "PnL Price")
TableControl.Cell (str "CPP")
]
[ for header, visible in visibleCols do if visible then yield (TableControl.Cell (str header)) ]
className = ""
header = None
onClick = None
@@ -139,14 +132,16 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) =
[
for data in model.positionData do yield {
cells =
[
TableControl.Cell (str (sprintf "%s" (getSec <| uint32 data.pos.securityId).symbol))
TableControl.Cell (str data.pos.account)
TableControl.Cell (str (sprintf "%s" (venueToString (getSec <| uint32 data.pos.securityId).venue)))
TableControl.Cell (str (sprintf "%s" (securityTypeToString <| (getSec <| uint32 data.pos.securityId).securityType)))
TableControl.Cell (str (sprintf "%s" (getSec <| uint32 data.pos.securityId).securityName))
TableControl.Cell (str (sprintf "%i" data.pos.securityId))
TableControl.Cell (str (numberOrNot ((calcPnL
[ for header, visible in visibleCols do if visible then yield (
match header with
| "Symbol" -> TableControl.Cell (str (sprintf "%s" (getSec <| uint32 data.pos.securityId).symbol))
| "Account" -> TableControl.Cell (str data.pos.account)
| "Exchange" -> TableControl.Cell (str (sprintf "%s" (venueToString (getSec <| uint32 data.pos.securityId).venue)))
| "Type" -> TableControl.Cell (str (sprintf "%s" (securityTypeToString <| (getSec <| uint32 data.pos.securityId).securityType)))
| "Security" -> TableControl.Cell (str (sprintf "%s" (getSec <| uint32 data.pos.securityId).securityName))
| "Security Key" -> TableControl.Cell (str (sprintf "%i" data.pos.securityId))
| "Total PnL" ->
TableControl.Cell (str (numberOrNot ((calcPnL
data.bidPrice
data.askPrice
data.pos.sod.longAvgPrice
@@ -164,8 +159,8 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) =
data.cashValue)
)
))//Total PNL
TableControl.Cell (str (numberOrNot (calcPnL
| "Open PnL" ->
TableControl.Cell (str (numberOrNot (calcPnL
data.bidPrice
data.askPrice
data.pos.sod.longAvgPrice
@@ -174,7 +169,8 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) =
data.pos.sod.shortPos
data.cashValue)
))// SOD Pnl (Open PnL)
TableControl.Cell (str (numberOrNot (calcPnL
| "Day PnL" ->
TableControl.Cell (str (numberOrNot (calcPnL
data.bidPrice
data.askPrice
data.pos.day.longAvgPrice
@@ -183,40 +179,58 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) =
data.pos.day.shortPos
data.cashValue)
))//Day PnL
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.longPos + data.pos.sod.longPos) - (data.pos.day.shortPos + data.pos.sod.shortPos))))//Total Pos
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.longPos + data.pos.sod.longPos)))//Total Long
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.longAvgPrice + data.pos.sod.longAvgPrice))))//Total Long Avg
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.shortPos + data.pos.sod.shortPos)))//Total Short
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.shortAvgPrice + data.pos.sod.shortAvgPrice))))//Total Short Avg
TableControl.Cell (str (sprintf "%.2f" (data.pos.sod.longPos - data.pos.sod.shortPos))) // SOD Net Pos
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.longPos)) // SOD Long Pos
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.longAvgPrice)) //SOD Long Avg Price
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortPos)) //SOD Short Pos
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortAvgPrice)) //SOD Short Avg Price
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.longPos - data.pos.day.shortPos)))//Day Pos
TableControl.Cell (str (sprintf "%.2f" data.pos.day.longPos))
TableControl.Cell (str (sprintf "%.2f" data.pos.day.longAvgPrice))
TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortPos))
TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortAvgPrice))
TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos))
TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos))
TableControl.Cell (str (sprintf "%.2f" (data.pos.rawDay.longPos - data.pos.rawDay.shortPos)))//Raw Day Pos
TableControl.Cell (str (boolToYesNo ((data.pos.day.longPos > 0.0) || (data.pos.day.shortPos > 0.0)) )) //Traded Today
(*
// TableControl.Cell (str "-")//Working Pos
// TableControl.Cell (str "-") // Working Long Pos
// TableControl.Cell (str "-") // working long avg price
// TableControl.Cell (str "-") // Working short Pos
// TableControl.Cell (str "-") // Working short avg price
*)
TableControl.Cell (str (sprintf "%.2f" data.bidPrice))//bid
TableControl.Cell (str (sprintf "%.2f" data.askPrice))//ask
TableControl.Cell (str (sprintf "%.2f" ((data.askPrice + data.bidPrice) / 2.0)))//mid
TableControl.Cell (str (sprintf "%.2f" data.lastPrice))//last
TableControl.Cell (str (sprintf "%.2f" data.settlementPrice))
// TableControl.Cell (str "-")//PnL Price
TableControl.Cell (str (sprintf "%.2f" data.cashValue))//CPP/cash value
]
| "Total Pos" ->
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.longPos + data.pos.sod.longPos) - (data.pos.day.shortPos + data.pos.sod.shortPos))))//Total Pos
| "Total Long" ->
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.longPos + data.pos.sod.longPos)))//Total Long
| "Total Long Avg" ->
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.longAvgPrice + data.pos.sod.longAvgPrice))))//Total Long Avg
| "Total Short" ->
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.shortPos + data.pos.sod.shortPos)))//Total Short
| "Total Short Avg" ->
TableControl.Cell (str (sprintf "%.2f" ((data.pos.day.shortAvgPrice + data.pos.sod.shortAvgPrice))))//Total Short Avg
| "Open Pos" ->
TableControl.Cell (str (sprintf "%.2f" (data.pos.sod.longPos - data.pos.sod.shortPos))) // SOD Net Pos
| "Open Long" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.longPos)) // SOD Long Pos
| "Open Long Avg" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.longAvgPrice)) //SOD Long Avg Price
| "Open Short" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortPos)) //SOD Short Pos
| "Open Short Avg" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortAvgPrice)) //SOD Short Avg Price
| "Day Pos" ->
TableControl.Cell (str (sprintf "%.2f" (data.pos.day.longPos - data.pos.day.shortPos)))//Day Pos
| "Day Long" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.day.longPos))
| "Day Long Avg" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.day.longAvgPrice))
| "Day Short" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortPos))
| "Day Short Avg" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortAvgPrice))
| "Raw Day Long" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos))
| "Raw Day Short" ->
TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos))
| "Raw Day Pos" ->
TableControl.Cell (str (sprintf "%.2f" (data.pos.rawDay.longPos - data.pos.rawDay.shortPos)))//Raw Day Pos
| "Traded Today" ->
TableControl.Cell (str (boolToYesNo ((data.pos.day.longPos > 0.0) || (data.pos.day.shortPos > 0.0)) )) //Traded Today
| "Bid" ->
TableControl.Cell (str (sprintf "%.2f" data.bidPrice))//bid
| "Ask" ->
TableControl.Cell (str (sprintf "%.2f" data.askPrice))//ask
| "Mid" ->
TableControl.Cell (str (sprintf "%.2f" ((data.askPrice + data.bidPrice) / 2.0)))//mid
| "Last" ->
TableControl.Cell (str (sprintf "%.2f" data.lastPrice))//last
| "Settlement" ->
TableControl.Cell (str (sprintf "%.2f" data.settlementPrice))
| "CPP" ->
TableControl.Cell (str (sprintf "%.2f" data.cashValue))//CPP/cash value
| _ -> TableControl.Cell (str "")
)]
className = ""
header = None
onClick = None
@@ -238,8 +252,8 @@ let PnLAreEqual (one:PNLUnit []) (two:PNLUnit []) =
&& (int <| one.[i].pos.dayShortPos) = (int <| two.[i].pos.dayShortPos)
&& (int <| one.[i].pos.sodLongPos) = (int <| two.[i].pos.sodLongPos)
&& (int <| one.[i].pos.sodShortPos) = (int <| two.[i].pos.sodShortPos)
&& (int <| one.[i].askPrice) = (int <| two.[i].askPrice)
&& (int <| one.[i].bidPrice) = (int <| two.[i].bidPrice)
&& (int <| one.[i].askPrice * 100.0) = (int <| two.[i].askPrice * 100.0)
&& (int <| one.[i].bidPrice * 100.0) = (int <| two.[i].bidPrice * 100.0)
acc
let lazyPnLView model dispatch =
+3 -3
View File
@@ -28,15 +28,15 @@ let updateLoggedIn msg model =
let update msg model =
match model with
| PreLogin p ->
| PreLogin p ->
match msg with
| LoginMsg (Login.LoginSuccess ctx) ->
let (lmodel, lmsg) = Users.State.init ctx
LoggedIn { context = ctx; page = UsersModel lmodel }, Cmd.map UsersMsg lmsg
| LoginMsg m' ->
| LoginMsg m' ->
let (lmodel, lmsg) = Login.update m' p
PreLogin lmodel, Cmd.map LoginMsg lmsg
| _ -> model, Cmd.Empty
| LoggedIn m ->
| LoggedIn m ->
let lmodel, lmsg = updateLoggedIn msg m
LoggedIn lmodel, lmsg