From b9aaaa7d37b9543aaf192d1e507200e713c19c5a Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 1 Nov 2018 10:37:09 -0400 Subject: [PATCH] mic mapping for brian --- src/web/ui/src/Users/State.fs | 1 - src/web/ui/src/Users/Types.fs | 7 +++++++ src/web/ui/src/Users/View.fs | 34 +++++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index e4ee5b4c9..23323d096 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -17,7 +17,6 @@ let SMPInstructionMap:Map = Map.empty .Add("N", "Cancel Aggressing") .Add("", "Undefined") - let isNewUser (user:BTSUser) = user.id = 0u && user.isPresent diff --git a/src/web/ui/src/Users/Types.fs b/src/web/ui/src/Users/Types.fs index 5f58e4854..fee416ef7 100644 --- a/src/web/ui/src/Users/Types.fs +++ b/src/web/ui/src/Users/Types.fs @@ -56,3 +56,10 @@ type Model = { OptionsMenuOpen: string ConfirmModal: string * Msg } + + +let CMEMicMap:Map = Map.empty + .Add("XCME", bts.api.CMEMics.CME) + .Add("XNYM", bts.api.CMEMics.NYMEX) + .Add("XCBT", bts.api.CMEMics.CBT) + .Add("XCEC", bts.api.CMEMics.COMEX) \ No newline at end of file diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index f67c55941..ad95c803a 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -140,21 +140,33 @@ let MarketDataTabView (model:Model) (dispatch:Msg->Unit) = | None -> false - let micList = [ - for micValue in bts.api.CMEMics.values do + // let micList = [ + // for micValue in bts.api.CMEMics.values do + // yield ( + // if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || + // micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then + // Fields.checkbox + // (sprintf "%O" micValue) + // "" + // (findCheckedValue micValue) + // [] + // (fun chk -> (({enabled = chk; mic = micValue }:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + // else + // str "" + // ) + // ] + + let micList = [ + for micPair in CMEMicMap do yield ( - if (micValue = bts.api.CMEMics.UNSET || micValue = bts.api.CMEMics.MGE || - micValue = bts.api.CMEMics.DME || micValue = bts.api.CMEMics.NYMSW || micValue = bts.api.CMEMics.FXS) |> not then Fields.checkbox - (sprintf "%O" micValue) + (sprintf "%O" micPair.Key) "" - (findCheckedValue micValue) + (findCheckedValue micPair.Value) [] - (fun chk -> (({enabled = chk; mic = micValue }:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) - else - str "" - ) - ] + (fun chk -> (({enabled = chk; mic = micPair.Value}:CMEMicData) |> (CMEMic >> UpdateField >> dispatch))) + ) + ] let send = UpdateField>>dispatch div []