OrderScreen complete

PageController.fs

@@ -20,7 +20,7 @@ let loadFloorplan (ctx: HttpContext) : HttpHandler =
    Session.RequireClerkAuthentication ctx
 
    let roomMenu =
-       Entity.getAllInVenue<floorplan_room>
+       Entity.GetAllInVenue<floorplan_room>
          |> Array.map makeRoomButton
          |> String.concat "\n"
 
@@ -43,14 +43,20 @@ let loadOrderScreen (ctx: HttpContext)  (tableNumber: int) : HttpHandler =
    let covers = if tableNumber > 0 then (getTable tableNumber).default_covers else 0
    let coverString = language.getAndReplace "covers" [covers]
 
-   let coverSelectorButton = if tableNumber > 0 then Theme.loadTemplateWithVars "orderScreen/cover_selector_button" (map ["covers", coverString]) else ""
+   let changeCoverNumberButton = if tableNumber > 0 then Theme.loadTemplateWithVars "orderScreen/change_cover_number_button" (map ["covers", coverString]) else ""
 
    let orderNumber =
        if tableNumber > 0 then language.getAndReplace "active_table" [tableNumber]
        else language.get "new_order"
 
+   let containerAttributes =
+        if tableNumber > 0 then
+            map ["data-table", jsonEncode (getTable tableNumber)]
+                |> Theme.htmlAttributes
+        else ""
+
    let categoryList =
-       Entity.getAllInVenue<order_screen_page_group>
+       Entity.GetAllInVenue<order_screen_page_group>
         |> Array.filter (fun page_group -> page_group.id <> 0)
         |> Array.sortBy (fun {order=order} -> order)
         |> Array.map (fun category ->
@@ -65,22 +71,24 @@ let loadOrderScreen (ctx: HttpContext)  (tableNumber: int) : HttpHandler =
        |> Array.map OrderScreen.getPagesHTML
        |> String.concat "\n"
 
-   let customItem =
-       Entity.getAllByColumn<item> "item_code" "OPEN000"
-       |> filterFirst
-       |> Array.map jsonEncode
-       |> String.concat ""
-
+   let coverSelectorButtons =
+        Array.init (covers+1) id
+            |> Array.map(fun coverNumber ->
+                let text = if coverNumber > 0 then language.getAndReplace "selected_cover" [coverNumber]
+                           else language.get "cover_zero"
+                Theme.PosButton text "coverSelectorButton" $"""data-cover="{coverNumber}" """)
+            |> String.concat "\n"
 
    let variables = map [
        "title", "Order"
+       "containerAttributes", containerAttributes
        "categoryList", categoryList
        "pageGroups", grids
        "orderNumber", orderNumber
-       "coverSelectorButton", coverSelectorButton
+       "changeCoverNumberButton", changeCoverNumberButton
        "covers", coverString
        "salesCategoryOverrideButtons", OrderScreen.generateSalesCategoryOverrideButtons ()
-       "custom", OrderScreen.generateSalesCategoryOverrideButtons ()
+       "coverSelectorButtons", coverSelectorButtons
    ]
 
    let styles = ["dredgepos.orderScreen.css"]
@@ -88,7 +96,8 @@ let loadOrderScreen (ctx: HttpContext)  (tableNumber: int) : HttpHandler =
    let currentClerk = recordToMap <| Session.getCurrentClerk ctx
    let arrays = map ["clerk", currentClerk]
 
-   htmlString <| Theme.loadTemplateWithVarsArraysScriptsAndStyles "orderScreen" variables arrays scripts styles
+   Theme.loadTemplateWithVarsArraysScriptsAndStyles "orderScreen" variables arrays scripts styles
+    |> htmlString
 
 let getOpenTables() =
     let rows = openTables()