diff --git a/DredgeFramework.module.fs b/DredgeFramework.module.fs index 3639052..e6e6857 100644 --- a/DredgeFramework.module.fs +++ b/DredgeFramework.module.fs @@ -16,6 +16,8 @@ open Thoth.Json.Net let (|?) lhs rhs = if lhs = null then rhs else lhs +let joinWithNewLine (arr: string[]) = arr |> String.concat "\n" + let getCurrentVenue () = 1 let map list = list |> Map.ofList diff --git a/OrderScreen.module.fs b/OrderScreen.module.fs index c3d6693..97e7bc0 100644 --- a/OrderScreen.module.fs +++ b/OrderScreen.module.fs @@ -109,7 +109,7 @@ let generateSalesCategoryOverrideButtons () = Entity.GetAllInVenue |> Array.map printGroupPosButton |> Array.append [|PosButton (language.getAndReplace "print_with" ["default"]) "printGroupOverrideButton toggle default active" """data-value="0" """|] - |> String.concat "\n" + |> joinWithNewLine let renderGrid (grid: grid) = @@ -123,7 +123,7 @@ let renderGrid (grid: grid) = |> Array.map snd |> Array.map(fun row -> row |> Array.map renderButton |> String.concat "\n") |> Array.map (renderPage grid) - |> String.concat "\n" + |> joinWithNewLine let loadGrid gridId = renderGrid (Entity.GetById gridId) diff --git a/PageController.fs b/PageController.fs index d053ba3..1863307 100644 --- a/PageController.fs +++ b/PageController.fs @@ -22,7 +22,7 @@ let loadFloorplan (ctx: HttpContext) : HttpHandler = let roomMenu = Entity.GetAllInVenue |> Array.map makeRoomButton - |> String.concat "\n" + |> joinWithNewLine let variables = map [ "title", "Floorplan" @@ -64,12 +64,12 @@ let loadOrderScreen (ctx: HttpContext) (tableNumber: int) : HttpHandler = let categoryArray = map ["page", categoryMap] Theme.loadTemplateWithArrays "orderScreen/page_group_button" categoryArray ) - |> String.concat "\n" + |> joinWithNewLine let grids = OrderScreen.getAllPageGrids () |> Array.map OrderScreen.getPagesHTML - |> String.concat "\n" + |> joinWithNewLine let coverSelectorButtons = Array.init (covers+1) id