From 36eadea6501ffde999955eae41351537b400a98f Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Wed, 22 Jan 2020 15:13:46 -0500 Subject: [PATCH] SP-54: colorful text --- src/web/ui/src/Reports/View.fs | 71 +++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/src/web/ui/src/Reports/View.fs b/src/web/ui/src/Reports/View.fs index 951bd3565..cf5f26980 100644 --- a/src/web/ui/src/Reports/View.fs +++ b/src/web/ui/src/Reports/View.fs @@ -113,10 +113,19 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) = onClick = None } - let numberOrNot number = - match number with - | 0.0 -> "" - | _ -> sprintf "%.2f" number + let fmtNum number = sprintf "%.2f" number + + let rgSpan (s:string) = + match s, s.Substring (0, 1) with + | _, "-" -> span [Style [Color "#C41212"; FontWeight "bold"]] [str s] + | "0.00", _ -> span [] [str s] + | _ -> span [Style [Color "#008000"; FontWeight "bold"]] [str s] + + let bidAskSpan (s:string) = + match s, s.Substring (0, 1) with + | _, "-" -> span [Style [Color "#A00000"]] [str s] + | "0.00", _ -> span [] [str s] + | _ -> span [Style [Color "#167ED3"]] [str s] let boolToYesNo yes = match yes with @@ -148,59 +157,59 @@ let PnLTabView (model:Model) (dispatch:Msg->Unit) = | "Type" -> TableControl.Cell (str (sprintf "%s" (securityTypeToString <| sec.securityType))) | "Security" -> TableControl.Cell (str (sprintf "%s" sec.securityName)) | "Security Key" -> TableControl.Cell (str (sprintf "%i" data.pos.securityId)) - | "Total PnL" -> TableControl.Cell (str (numberOrNot (calcTotalPnL data))) - | "Open PnL" -> TableControl.Cell (str (numberOrNot (calcSODPnL data))) - | "Day PnL" -> TableControl.Cell (str (numberOrNot (calcDayPnL data))) + | "Total PnL" -> TableControl.Cell (rgSpan (fmtNum (calcTotalPnL data))) + | "Open PnL" -> TableControl.Cell (rgSpan (fmtNum (calcSODPnL data))) + | "Day PnL" -> TableControl.Cell (rgSpan (fmtNum (calcDayPnL data))) | "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 + TableControl.Cell (bidAskSpan (fmtNum ((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 + TableControl.Cell (str (fmtNum (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 + TableControl.Cell (str (fmtNum ((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 + TableControl.Cell (str (fmtNum (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 + TableControl.Cell (str (fmtNum ((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 + TableControl.Cell (bidAskSpan (fmtNum (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 + TableControl.Cell (str (fmtNum data.pos.sod.longPos)) // SOD Long Pos | "Open Long Avg" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.sod.longAvgPrice)) //SOD Long Avg Price + TableControl.Cell (str (fmtNum data.pos.sod.longAvgPrice)) //SOD Long Avg Price | "Open Short" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortPos)) //SOD Short Pos + TableControl.Cell (str (fmtNum data.pos.sod.shortPos)) //SOD Short Pos | "Open Short Avg" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.sod.shortAvgPrice)) //SOD Short Avg Price + TableControl.Cell (str (fmtNum 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 + TableControl.Cell (str (fmtNum (data.pos.day.longPos - data.pos.day.shortPos)))//Day Pos | "Day Long" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.day.longPos)) + TableControl.Cell (str (fmtNum data.pos.day.longPos)) | "Day Long Avg" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.day.longAvgPrice)) + TableControl.Cell (str (fmtNum data.pos.day.longAvgPrice)) | "Day Short" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortPos)) + TableControl.Cell (str (fmtNum data.pos.day.shortPos)) | "Day Short Avg" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.day.shortAvgPrice)) + TableControl.Cell (str (fmtNum data.pos.day.shortAvgPrice)) | "Raw Day Long" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos)) + TableControl.Cell (str (fmtNum data.pos.rawDay.longPos)) | "Raw Day Short" -> - TableControl.Cell (str (sprintf "%.2f" data.pos.rawDay.longPos)) + TableControl.Cell (str (fmtNum data.pos.rawDay.longPos)) | "Raw Day Pos" -> - TableControl.Cell (str (sprintf "%.2f" (data.pos.rawDay.longPos - data.pos.rawDay.shortPos)))//Raw Day Pos + TableControl.Cell (str (fmtNum (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 + TableControl.Cell (span [Style [Color "#167ED3"]] [str (fmtNum data.bidPrice)])//bid | "Ask" -> - TableControl.Cell (str (sprintf "%.2f" data.askPrice))//ask + TableControl.Cell (span [Style [Color "#A00000"]] [str (fmtNum data.askPrice)])//ask | "Mid" -> - TableControl.Cell (str (sprintf "%.2f" ((data.askPrice + data.bidPrice) / 2.0)))//mid + TableControl.Cell (str (fmtNum ((data.askPrice + data.bidPrice) / 2.0)))//mid | "Last" -> - TableControl.Cell (str (sprintf "%.2f" data.lastPrice))//last + TableControl.Cell (str (fmtNum data.lastPrice))//last | "Settlement" -> - TableControl.Cell (str (sprintf "%.2f" data.settlementPrice)) + TableControl.Cell (str (fmtNum data.settlementPrice)) | "CPP" -> - TableControl.Cell (str (sprintf "%.2f" data.cashValue))//CPP/cash value + TableControl.Cell (str (fmtNum data.cashValue))//CPP/cash value | _ -> TableControl.Cell (str "") )] className = ""