diff --git a/AjaxController.fs b/AjaxController.fs index 9c7d1ca..31a4683 100644 --- a/AjaxController.fs +++ b/AjaxController.fs @@ -17,15 +17,13 @@ let getLanguageVars = ajaxSuccess languageVars let getActiveTables venue = Floorplan.getActiveTables venue |> ajaxSuccess |> json -let getRoomData roomId = Floorplan.getRoom roomId |> ajaxSuccess |> json - let mergeTables (tables: floorplan_table[]) = let status = - if mergeTables tables.[0].table_number tables.[1].table_number then + if mergeTables tables[0].table_number tables[1].table_number then let outputTables = map [ - "parent", tables.[0]; - "child", tables.[1]; - "merged", getTable tables.[0].table_number; + "parent", tables[0]; + "child", tables[1]; + "merged", getTable tables[0].table_number; ] ajaxSuccess outputTables else ajaxFail "Could Not Merge Tables" @@ -36,7 +34,7 @@ let unmergeTable tableNumber = let unmergedTables = match unmerged with | Some (parent, child) -> - map["parent", parent; "child", child] |> ajaxSuccess + map ["parent", parent; "child", child] |> ajaxSuccess | None -> ajaxFail "Could not Unmerge Table" unmergedTables |> json @@ -64,7 +62,8 @@ let getOrderScreenData (id: int) = |> json let getKeyboardLayout (language: string) = - let layout = $"""wwwroot/languages/{language}/keyboardLayout.json""" |> GetFileContents + let layout = $"""wwwroot/languages/{language}/keyboardLayout.json""" + |> GetFileContents map [ "status", "success" "data", layout diff --git a/Browser.module.fs b/Browser.module.fs index 4f8343e..07cb33d 100644 --- a/Browser.module.fs +++ b/Browser.module.fs @@ -17,7 +17,7 @@ let deleteCookie name (context: HttpContext) = if cookieExists name context then context.Response.Cookies.Delete(name) let getCookie cookieName (context: HttpContext) = - context.Request.Cookies.[cookieName] |? "" + context.Request.Cookies[cookieName] |? "" let setCookie name value (expiry: DateTimeOffset) (context: HttpContext) = deleteCookie name context diff --git a/DredgeFramework.module.fs b/DredgeFramework.module.fs index 481f7ef..566f8fd 100644 --- a/DredgeFramework.module.fs +++ b/DredgeFramework.module.fs @@ -37,8 +37,8 @@ let GetFileContents (file: string) = File.ReadAllText file let GetFileName (file: string) = Path.GetFileName file let length (variable: 'T[]) = variable.Length -let first (array: 'a[]) = array.[0] -let last (array: 'a[]) = array.[array.Length-1] +let first (array: 'a[]) = array[0] +let last (array: 'a[]) = array[array.Length-1] let removeFalseValues (variable: bool[]) = variable |> Array.filter id diff --git a/DredgePos.fsproj b/DredgePos.fsproj index 65ea817..72e261b 100644 --- a/DredgePos.fsproj +++ b/DredgePos.fsproj @@ -14,6 +14,7 @@ + @@ -42,6 +43,7 @@ + diff --git a/Floorplan.module.fs b/Floorplan.module.fs index 4eea807..2aca4a4 100644 --- a/Floorplan.module.fs +++ b/Floorplan.module.fs @@ -27,8 +27,8 @@ let tableIsOpen (table: floorplan_table) = tableNumberIsOpen table.table_number let fileNameToTableNumber (fileName: string) = //Takes a file name for a floorplan table and returns the table number if fileName.Contains ".table" then - let fileName = (fileName.Split ".").[0] - (fileName.Split "/table").[1] |> int + let fileName = (fileName.Split ".")[0] + (fileName.Split "/table")[1] |> int else 0 let openTables () = //Get a list of all open tables. @@ -121,7 +121,7 @@ let updateTablePosition (floorplanTable: floorplan_table) = Entity.updateInDatab let createEmptyReservation (reservation: reservation) = update { table "floorplan_tables" - set {| status = 2 |}Target + set {| status = 2 |} where(eq "id" reservation.reservation_table_id) } |> db.Update |> ignore @@ -173,7 +173,7 @@ let tableExists (tableNumber: int) = match allTables.Length with | 0 -> false |> string //Table does not exist | _ -> - let parentTableData = getTable allTables.[0] + let parentTableData = getTable allTables[0] let parentRoom = getRoom parentTableData.room_id let parentRoomName = parentRoom.room_name language.getAndReplace "error_table_exists_merged" [parentRoomName; parentTableData.table_number.ToString()] diff --git a/Language.module.fs b/Language.module.fs index a206f0f..311faa2 100644 --- a/Language.module.fs +++ b/Language.module.fs @@ -19,7 +19,7 @@ let languageVars = //Gets a value of a language variable let get var = if languageVars.ContainsKey var then - languageVars.[var] + languageVars[var] else "Missing language variable: " + var diff --git a/OrderScreen.module.fs b/OrderScreen.module.fs index 338b108..a9c7492 100644 --- a/OrderScreen.module.fs +++ b/OrderScreen.module.fs @@ -62,7 +62,7 @@ let renderButton (buttonId: int) = | "spacer" -> {|extra_data=""; text=""|} | _ -> {|extra_data=""; text=""|} - let vars = map[ + let vars = map [ "extra_classes", button.extra_classes + " " + extraClasses "extra_styles", extra_styles "primary_action", button.primary_action diff --git a/PageController.fs b/PageController.fs index 1e863b5..c833f0b 100644 --- a/PageController.fs +++ b/PageController.fs @@ -8,7 +8,7 @@ open Giraffe open DredgeFramework let loadHomePage(): HttpHandler = - let variables = map["title", "Log In"] + let variables = map ["title", "Log In"] let scripts = ["dredgepos.authenticate.js"] let styles = ["dredgepos.authenticate.css"] @@ -31,7 +31,7 @@ let loadFloorplan (ctx: HttpContext) : HttpHandler = let scripts = ["../external/konva.min.js" ; "dredgepos.floorplan.js"] let currentClerk = recordToMap <| Session.getCurrentClerk ctx - let arrays = map["clerk", currentClerk] + let arrays = map ["clerk", currentClerk] htmlString <| Theme.loadTemplateWithVarsArraysScriptsAndStyles "floorplan" variables arrays scripts styles @@ -63,7 +63,7 @@ let loadOrderScreen (ctx: HttpContext) : HttpHandler = let styles = ["dredgepos.orderScreen.css"] let scripts = ["dredgepos.orderScreen.js"] let currentClerk = recordToMap <| Session.getCurrentClerk ctx - let arrays = map["clerk", currentClerk] + let arrays = map ["clerk", currentClerk] htmlString <| Theme.loadTemplateWithVarsArraysScriptsAndStyles "orderScreen" variables arrays scripts styles diff --git a/Printer.module.fs b/Printer.module.fs new file mode 100644 index 0000000..89e974b --- /dev/null +++ b/Printer.module.fs @@ -0,0 +1,2 @@ +module Printer + diff --git a/Program.fs b/Program.fs index 8099f95..2d5f28b 100644 --- a/Program.fs +++ b/Program.fs @@ -17,7 +17,6 @@ module Program = use_warbler } - let floorplanRouter = router { pipe_through browser post "/authenticateClerk" (bindJson (handlePostRoute AjaxController.loginWithLoginCode) ) @@ -32,7 +31,6 @@ module Program = post "/updateReservation" (bindJson AjaxController.updateReservation) post "/getReservation" (bindJson (fun reservation -> json <| GetReservationById reservation) ) post "/unreserveTable" (bindJson AjaxController.unreserveTable ) - getf "/getRoomData/%i" AjaxController.getRoomData getf "/getKeyboardLayout/%s" AjaxController.getKeyboardLayout get "/languageVars" (json <| AjaxController.getLanguageVars) get "/getOpenTables" (json <| Floorplan.getActiveTables (DredgeFramework.getCurrentVenue())) diff --git a/Theme.module.fs b/Theme.module.fs index 29733a3..94b3eb5 100644 --- a/Theme.module.fs +++ b/Theme.module.fs @@ -43,11 +43,11 @@ let ParseVariables (varArray: Map) (html:string) = Regex.Replace(html, "", MatchEvaluator( fun matchedVar -> - let varName = matchedVar.Groups.[1] |> string |> StringTrim + let varName = matchedVar.Groups[1] |> string |> StringTrim if varArray.ContainsKey varName then - if varName |> ToLowerCase = "title" then titlePrefix varArray.[varName] - else varArray.[varName] + if varName |> ToLowerCase = "title" then titlePrefix varArray[varName] + else varArray[varName] else "" )) @@ -56,11 +56,11 @@ let ParseArrays (arrayArray: Map>) (string:string) = Regex.Replace(string, "", MatchEvaluator( fun matchedVar -> - let arrayName = matchedVar.Groups.[1].ToString() |> StringTrim - let keyName = matchedVar.Groups.[2].ToString() + let arrayName = matchedVar.Groups[1].ToString() |> StringTrim + let keyName = matchedVar.Groups[2].ToString() - if arrayArray.ContainsKey arrayName && arrayArray.[arrayName].ContainsKey keyName then - arrayArray.[arrayName].[keyName] + if arrayArray.ContainsKey arrayName && arrayArray[arrayName].ContainsKey keyName then + arrayArray[arrayName][keyName] else "" ) @@ -70,7 +70,7 @@ let ParseSimpleLanguageVariables (string:string) = Regex.Replace(string, "", new MatchEvaluator( fun matchedVar -> - let varName = matchedVar.Groups.[1].ToString() + let varName = matchedVar.Groups[1].ToString() |> StringTrim language.get varName @@ -80,8 +80,8 @@ let ParseLanguageVariablesWithReplacements (string: string) = Regex.Replace(string, "", new MatchEvaluator( fun matchedVar -> - let varName = matchedVar.Groups.[1].ToString() - let replacements = matchedVar.Groups.[2].ToString() + let varName = matchedVar.Groups[1].ToString() + let replacements = matchedVar.Groups[2].ToString() |> StringSplit "," |> Array.toList @@ -115,7 +115,7 @@ let rec loadTemplateWithVarsArraysScriptsAndStyles templateName vars arrays scri and ParseTemplates vars arrays scripts styles (string: string) = Regex.Replace(string, "", new MatchEvaluator( fun template -> - let templateName = template.Groups.[1].ToString() |> StringTrim + let templateName = template.Groups[1].ToString() |> StringTrim loadTemplateWithVarsArraysScriptsAndStyles templateName vars arrays scripts styles )) diff --git a/wwwroot/scripts/ts/keyboards.ts b/wwwroot/scripts/ts/keyboards.ts index 0ac4c95..8bbc711 100644 --- a/wwwroot/scripts/ts/keyboards.ts +++ b/wwwroot/scripts/ts/keyboards.ts @@ -216,7 +216,6 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al } let setKeyboardLayout = (layout: string, modifier = '') => { - if (modifier != '') modifier = `_${modifier}` Application.keyboard.currentLayout = layout let layoutToLoad = Application.keyboard.layouts[layout] @@ -226,9 +225,8 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al We start at 1 instead of 0. Makes it easier for non-programmers and translators making their own language packs */ - index = index + 1; + index = index + 1 - // @ts-ignore let currentRow : string[] = layoutToLoad[`row${index}${modifier}`] $(row).children('a').each((keyIndex, button) => {