Converted to SASS

wwwroot/scripts/ts/dredgepos.authenticate.ts

@@ -1,6 +1,4 @@
-let showLoginBox = () => {
-    showVirtualNumpad('Enter Login Code', 6, true, false, false, authenticate)
-}
+let showLoginBox = () => showVirtualNumpad('Enter Login Code', 6, true, false, false, authenticate)
 
 let  authenticate = (input : string) => {
     let login = ajaxSync('/ajax/authenticateClerk', input)

wwwroot/scripts/ts/dredgepos.floorplan.ts

@@ -72,6 +72,8 @@ const setupFloorplanEvents = () => {
 
 const roomButtonClicked = (e: Event) => {
     const button = $(e.target)
+    $('.roomButton').removeClass('active')
+    button.addClass('active')
     const roomId = button.data('value')
     loadRoom(getRoomById(roomId))
 }
@@ -600,7 +602,7 @@ const setupKonva = () => {
     if(Floorplan.stage !== null) Floorplan.stage.destroy()
 
     Floorplan.stage = new Konva.Stage({
-        container: 'tableMap',
+        container: 'floorplanCanvas',
         width: dimensions.width,
         height: dimensions.height,
     })
@@ -802,22 +804,20 @@ const tableTransferred = (tables: Record<"origin"|"destination", table>) => {
 
 const getDimensions = () => {
 
-    Floorplan.floorplanDiv = $('#tableMap')
-    const parentDiv = $('#mapContainer')
+    Floorplan.floorplanDiv = $('#floorplanCanvas')
+    const parentDiv = $('#floorplanCenterColumn .middleCell')
     const outerWidth = parentDiv.outerWidth()
     const outerHeight = parentDiv.outerHeight()
 
-    let width = outerWidth;
-    let height = outerWidth;
+
 
     if (outerWidth >= outerHeight) {
-        width = outerHeight
-        height = outerHeight
+        Floorplan.floorplanDiv.css('height', '100%')
+    } else {
+        Floorplan.floorplanDiv.css('width','100%')
     }
 
-    Floorplan.floorplanDiv.height(height)
-    Floorplan.floorplanDiv.width(width)
-    Floorplan.visualScale = width / Floorplan.visualScaleBasis
+    Floorplan.visualScale = Floorplan.floorplanDiv.width() / Floorplan.visualScaleBasis
 
-    return {width: width, height:height}
+    return {width: Floorplan.floorplanDiv.width(), height:Floorplan.floorplanDiv.height()}
 }

wwwroot/scripts/ts/keyboards.ts

@@ -129,9 +129,7 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
         setKeyboardLayout('default')
     }
 
-     let showVirtualKeyboard = (heading: string, maxlength = 32, isPassword = false, submitFunction :Function = () => {
-        hideVirtualKeyboard()
-    }) => {
+     let showVirtualKeyboard = (heading: string, maxlength = 32, isPassword = false, submitFunction :Function = () => {hideVirtualKeyboard()}) => {
         let keyboard = $('#virtualKeyboard')
         let inputBox = $('#virtualKeyboardInput')
 
@@ -143,14 +141,13 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
         keyboard.data('maxlength', maxlength)
         keyboard.data('password', isPassword)
         keyboard.data('submitfunction', submitFunction)
-
-        $(document).off('keyup')
+        inputBox.trigger('focus')
         $(document).on('keyup', e => {
             let key = e.key
-            if (key == 'Enter')
+            if (key == 'Enter' && inputBox.val().toString().length > 0) {
                 key = 'submit'
-
-            virtualKeyboardInput(key)
+                virtualKeyboardInput(key)
+            }
         })
     }
 
@@ -166,13 +163,13 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
             case 'backspace':
             case 'delete':
                 let newText = inputBox.text().slice(0, -1);
-                inputBox.text(newText)
+                inputBox.val(newText)
                 keyboard.data('value', newText);
                 break;
             case 'submit':
                 hideVirtualKeyboard();
                 let submitFunction = keyboard.data('submitfunction')
-                submitFunction(inputBox.text());
+                submitFunction(inputBox.val());
                 break;
             case 'shift':
                 if (Application.keyboard.capsLock) break;
@@ -196,17 +193,17 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
         if (input.length == 1) {
             if (Application.keyboard.shift || Application.keyboard.capsLock) {
                 input = input.toUpperCase()
+
+                //If shift, reload lowercase
+                if (Application.keyboard.shift) {
+                    Application.keyboard.shift = false
+                    setKeyboardLayout('default');
+                }
             }
 
-            let newText = inputBox.text() + input;
+            let newText = inputBox.val() + input;
             keyboard.data('value', newText);
-            inputBox.text(newText)
-
-            //If shift, reload lowercase
-            if (Application.keyboard.shift) {
-                Application.keyboard.shift = false
-                setKeyboardLayout('default');
-            }
+            inputBox.val(newText)
         }
 
     }