Updates

wwwroot/scripts/ts/dredgepos.authenticate.ts

@@ -2,8 +2,9 @@
 
 let  authenticate = (input : string) => {
     let login = ajaxSync('/ajax/authenticateClerk', input)
-    if(login === 'success')
-        redirect('/floorplan')
+    if(login === 'success'){
+        location.assign('/floorplan')
+    }
     else
         showLoginBox()
 }

wwwroot/scripts/ts/dredgepos.core.ts

@@ -67,15 +67,20 @@
     }
 
     /* Redirect to a specific URL */
-     let redirect = (url: string) : void => {
-        window.location.href = url
-    }
+     let redirect = (url: string) : void => location.assign(url)
 
 
+
+    const resize = () => {
+        $('#pageContainer').height(window.innerHeight + "px");
+    }
+
      let setupCore = (languageVars: Record<string, string>) => {
          Application.languageVars = languageVars
          const doc = $(document)
          doc.on('click', '#alertNo, #alertOk', hideAlerts)
+         window.addEventListener('resize', resize)
+         resize()
 
          setElementVisibilityByMode()
      }
@@ -159,7 +164,7 @@
         invisibleElements.each((index, elem) => {
             let element = $(elem)
             let inVisibleInModes: PosModes = element.data('invisible-in-mode')
-            let hideElement = inVisibleInModes.every(invisibleMode => {
+            let hideElement = inVisibleInModes.some(invisibleMode => {
                 return mode.includes(invisibleMode)
             })
             element.toggle(!hideElement)

wwwroot/scripts/ts/dredgepos.floorplan.ts

@@ -212,18 +212,24 @@ const createTableShape = (table: table) => {
 const setupTableEvents = (tableGroup: Konva.Group) => {
     const tableShape = getTableShapeFromGroup(tableGroup)
 
-    tableGroup.on('click', (e) => tableClicked(e.target as Konva.Shape))
-    tableGroup.on('tap', (e) => tableClicked(e.target as Konva.Shape))
-    tableGroup.on('dragend', (e) => saveTableTransformation(e.target as Konva.Group))
-    tableShape.on('transformend', (e) => {
-        const group = getTableGroupFromShape(e.target as Konva.Shape)
-        saveTableTransformation(group)
-    })
+    tableGroup.on('click', tableClicked)
+    tableGroup.on('tap', tableClicked)
+    tableGroup.on('dragend', tableGroupTransformed)
+    tableShape.on('transformend',  tableShapeTransformed)
 }
 
 const getTableShapeFromGroup = (group: Konva.Group) => group.getChildren()[0] as Konva.Shape
 const getTableGroupFromShape = (shape: Konva.Shape) => shape.parent as Konva.Group
 
+const tableGroupTransformed = (e: Konva.KonvaEventObject<any>) => {
+    saveTableTransformation(e.target as Konva.Group)
+}
+const tableShapeTransformed = (e: Konva.KonvaEventObject<any>) => {
+    let shape = e.target as Konva.Shape
+    let group = getTableGroupFromShape(shape)
+    saveTableTransformation(group)
+}
+
 const saveTableTransformation = (tableGroup: Konva.Group) => {
     const originalTable = getTableDataFromGroup(tableGroup)
     const tableShape = getTableShapeFromGroup(tableGroup)
@@ -425,7 +431,8 @@ const selectTable = (tableShape: Konva.Shape) => {
 
 const updateCoverText = (table:table) => $('.selectedTableCovers').text(lang('covers', table.default_covers.toString()))
 
-const tableClicked = (tableShape: Konva.Shape) => {
+const tableClicked =  (event: Konva.KonvaEventObject<any>) => {
+    let tableShape = getTableShapeFromGroup(event.currentTarget as Konva.Group)
     const table = getTableDataFromShape(tableShape)
 
     if(isInMode('merge')) {
@@ -481,20 +488,14 @@ const createDecorationShape =  (decoration:decoration, select?: boolean) => {
 }
 
 const setupDecorationEvents = (decorationShape: Konva.Image) => {
-    decorationShape.on('click', e => {
-            decorationClicked(e.target as Konva.Image)
-    })
-
-    decorationShape.on('transformend', e => {
-        decorationTransformed(e.target as Konva.Image)
-    })
-
-    decorationShape.on('dragend', e => {
-        decorationTransformed(e.target as Konva.Image)
-    })
+    decorationShape.on('click', decorationClicked)
+    decorationShape.on('tap', decorationClicked)
+    decorationShape.on('transformend', decorationTransformed)
+    decorationShape.on('dragend', decorationTransformed)
 }
 
-const decorationClicked = (decorationShape: Konva.Image) => {
+const decorationClicked = (event: Konva.KonvaEventObject<any>) => {
+    let decorationShape = event.target as Konva.Image
     if(isInMode('edit')){
         turnOffMode('tableSelected')
         if ((Floorplan.transformer.nodes().length > 0 && Floorplan.transformer.nodes()[0] != decorationShape) || Floorplan.transformer.nodes().length == 0) {
@@ -519,8 +520,8 @@ const getDecorationDataById = (id: number) => {
     return Floorplan.decorations.find(decoration => id == decoration.id)
 }
 
-const decorationTransformed = (decorationShape: Konva.Image) => {
-
+const decorationTransformed = (event: Konva.KonvaEventObject<MouseEvent>|Konva.KonvaEventObject<TouchEvent|DragEvent|MouseEvent>) => {
+    let decorationShape = event.currentTarget as Konva.Image
     const oldDecorationData = getDecorationDataById(Number(decorationShape.id()))
     const newDecoration: decoration = {
         id: oldDecorationData.id,

wwwroot/scripts/ts/keyboards.ts

@@ -126,6 +126,9 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
             virtualKeyboardInput($(e.target).data('value'));
         })
 
+        $(document).on('click', '.forceFocus', (e) => {
+            $('#virtualKeyboardInput').trigger('focus')
+        })
         setKeyboardLayout('default')
     }
 
@@ -135,13 +138,17 @@ let showVirtualNumpad = (heading: string, maxlength = 4, isPassword: boolean, al
 
         keyboard.css('display', 'flex')
         $('#virtualKeyboardHeading').html(heading)
+        $('.forceFocus').trigger('click')
 
         keyboard.data('value', '')
-        inputBox.text('')
+        inputBox.val('')
         keyboard.data('maxlength', maxlength)
         keyboard.data('password', isPassword)
         keyboard.data('submitfunction', submitFunction)
+        inputBox.attr('autofocus', 'autofocus');
         inputBox.trigger('focus')
+        inputBox.trigger('click')
+        inputBox.trigger('select')
         $(document).on('keyup', e => {
             let key = e.key
             if (key == 'Enter' && inputBox.val().toString().length > 0) {