CHANGELOG.md

@@ -5,25 +5,6 @@ All notable changes to 'byjove' will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Unreleased
-
-## [0.1.26] - 2024-06-03
-### Changed
-- Optionally allow decimal quantities for receiving.
-
-## [0.1.25] - 2024-05-29
-### Changed
-- Show actual error text if applicable, for receiving failure.
-
-## [0.1.24] - 2024-03-26
-### Changed
-- Add delay when fetching rows data for model CRUD component.
-
-## [0.1.23] - 2023-12-26
-### Changed
-- Improve focus behavior for inventory count view.
-- Keep row filters "raw" until encoding for actual request.
-
 ## [0.1.22] - 2023-10-23
 ### Changed
 - Use columns instead of table, for row receiving quantities.

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "byjove",
-    "version": "0.1.26",
+    "version": "0.1.22",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "byjove",
-            "version": "0.1.26",
+            "version": "0.1.22",
             "license": "GPL-3.0-or-later",
             "dependencies": {
                 "vue": "^2.7.14"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "byjove",
-    "version": "0.1.26",
+    "version": "0.1.22",
     "description": "Generic-ish app components for Vue.js frontend to Tailbone API backend",
     "keywords": [
         "rattail",

src/components/inventory/ByjoveInventory.vue

@@ -83,10 +83,6 @@ export default {
             type: Boolean,
             default: true,
         },
-        focusCases: {
-            type: Boolean,
-            default: false,
-        },
         allowEdit: {
             type: Boolean,
             default: false,
@@ -96,7 +92,6 @@ export default {
             default: false,
         },
     },
-
     data() {
         return {
             row: {},
@@ -107,6 +102,16 @@ export default {
         this.fetch(this.$route.params.uuid)
     },
 
+    updated() {
+        this.$nextTick(() => {
+            if (this.shouldAllowCases()) {
+                this.$refs.cases.focus()
+            } else {
+                this.$refs.units.focus()
+            }
+        })
+    },
+
     methods: {
 
         getIndexUrl() {
@@ -160,14 +165,6 @@ export default {
                 if (this.row.batch_executed || this.row.batch_complete) {
                     // cannot edit this row, so view it instead
                     this.$router.push(this.getViewUrl())
-                } else {
-                    this.$nextTick(() => {
-                        if (this.shouldAllowCases() && this.focusCases) {
-                            this.$refs.cases.focus()
-                        } else {
-                            this.$refs.units.focus()
-                        }
-                    })
                 }
             }, response => {
                 if (response.status == 403) { // forbidden; redirect to model index

src/components/model-crud/ByjoveModelCrud.vue

@@ -189,10 +189,10 @@ export default {
         rowFilters: {
             type: Function,
             default: (uuid) => {
-                return [
+                return JSON.stringify([
                     {field: 'batch_uuid', op: 'eq', value: uuid},
                     {field: 'removed', op: 'eq', value: false},
-                ]
+                ])
             },
         },
         rowOrderBy: {
@@ -511,14 +511,7 @@ export default {
                 this.record = response.data.data
                 this.$emit('refresh', this.record)
                 if (this.hasRows) {
-                    // TODO: was seeing occasional errors when a batch
+                    this.fetchRows(uuid)
-                    // view was loaded, and it tried to fetch rows but
-                    // somehow the uuid was not passed along and
-                    // server failed to build a query filter.  so
-                    // hoping the nextTick() delay fixes it..?
-                    this.$nextTick(() => {
-                        this.fetchRows(uuid)
-                    })
                 }
             }, response => {
                 if (response.status == 403) { // forbidden
@@ -545,7 +538,7 @@ export default {
 
         fetchRows(uuid) {
             let params = {
-                filters: JSON.stringify(this.rowFilters(uuid)),
+                filters: this.rowFilters(uuid),
                 orderBy: this.rowOrderBy,
                 ascending: this.rowOrderAscending ? 1 : 0,
             }

src/components/numeric-input/NumericInput.vue

@@ -1,152 +0,0 @@
-<template>
-  <b-input :name="name"
-           :value="value"
-           ref="input"
-           :placeholder="placeholder"
-           :size="size"
-           :icon-pack="iconPack"
-           :icon="icon"
-           :disabled="disabled"
-           :custom-class="customClass"
-           @focus="notifyFocus"
-           @blur="notifyBlur"
-           @keydown.native="keyDown"
-           @input="valueChanged"
-           />
-</template>
-
-<script>
-export default {
-    name: 'NumericInput',
-
-    props: {
-        name: String,
-        value: [Number, String],
-        placeholder: String,
-        iconPack: String,
-        icon: String,
-        size: String,
-        disabled: Boolean,
-        allowEnter: Boolean,
-        customClass: String,
-    },
-
-    methods: {
-
-        focus() {
-            this.$refs.input.focus()
-        },
-
-        notifyFocus(event) {
-            this.$emit('focus', event)
-        },
-
-        notifyBlur(event) {
-            this.$emit('blur', event)
-        },
-
-        keyDown(event) {
-            // by default we only allow numeric keys, and general navigation
-            // keys, but we might also allow Enter key
-            if (!this.key_modifies(event) && !this.key_allowed(event)) {
-                if (!this.allowEnter || event.which != 13) {
-                    event.preventDefault()
-                }
-            }
-        },
-
-        /*
-         * Determine if a keypress would modify the value of a textbox.
-         *
-         * Note that this implies that the keypress is also *valid* in the context of a
-         * numeric textbox.
-         *
-         * Returns `true` if the keypress is valid and would modify the textbox value,
-         * or `false` otherwise.
-         */
-        key_modifies(event) {
-
-            if (event.which >= 48 && event.which <= 57) {       // Numeric (QWERTY)
-                if (! event.shiftKey) {  // shift key means punctuation instead of numeric
-                    return true;
-                }
-
-            } else if (event.which >= 96 && event.which <= 105) { // Numeric (10-Key)
-                return true;
-
-            } else if (event.which == 109 || event.which == 173) { // hyphen (negative sign)
-                return true;
-
-            } else if (event.which == 110 || event.which == 190) { // period/decimal
-                return true;
-
-            } else if (event.which == 8) {                      // Backspace
-                return true;
-
-            } else if (event.which == 46) {                     // Delete
-                return true;
-            } else if (event.ctrlKey && event.which == 86) {    // Ctrl+V
-                return true;
-            } else if (event.ctrlKey && event.which == 88) {    // Ctrl+X
-                return true;
-            }
-
-            return false;
-        },
-
-        /*
-         * Determine if a keypress is allowed in the context of a textbox.
-         *
-         * The purpose of this function is to let certain "special" keys (e.g. function
-         * and navigational keys) to pass through, so they may be processed as they
-         * would for a normal textbox.
-         *
-         * Note that this function does *not* check for keys which would actually
-         * modify the value of the textbox.  It is assumed that the caller will have
-         * already used `key_modifies()` for that.
-         *
-         * Returns `true` if the keypress is allowed, or `false` otherwise.
-         */
-        key_allowed(event) {
-
-            // Allow anything with modifiers (except Shift).
-            if (event.altKey || event.ctrlKey || event.metaKey) {
-
-                // ...but don't allow Ctrl+X or Ctrl+V
-                return event.which != 86 && event.which != 88;
-            }
-
-            // Allow function keys.
-            if (event.which >= 112 && event.which <= 123) {
-                return true;
-            }
-
-            // Allow Home/End/arrow keys.
-            if (event.which >= 35 && event.which <= 40) {
-                return true;
-            }
-
-            // Allow Tab key.
-            if (event.which == 9) {
-                return true;
-            }
-
-            // allow Escape key
-            if (event.which == 27) {
-                return true;
-            }
-
-            return false;
-        },
-
-        select() {
-            this.$el.children[0].select()
-        },
-
-        valueChanged(value) {
-            this.$emit('input', value)
-        }
-
-    },
-}
-</script>

src/components/numeric-input/index.js

@@ -1,28 +0,0 @@
-// Import vue component
-import NumericInput from './NumericInput.vue'
-
-// Declare install function executed by Vue.use()
-export function install(Vue) {
-    if (install.installed) return;
-    install.installed = true;
-    Vue.component('NumericInput', NumericInput);
-}
-
-// Create module definition for Vue.use()
-const plugin = {
-    install,
-};
-
-// Auto-install when vue is found (eg. in browser via <script> tag)
-let GlobalVue = null;
-if (typeof window !== 'undefined') {
-    GlobalVue = window.Vue;
-} else if (typeof global !== 'undefined') {
-    GlobalVue = global.Vue;
-}
-if (GlobalVue) {
-    GlobalVue.use(plugin);
-}
-
-// To allow use as module (npm/webpack/etc.) export component
-export default NumericInput

src/components/receiving/ByjoveReceiving.vue

@@ -159,13 +159,10 @@
 
     <b-field grouped>
       <b-field class="control">
-        <numeric-input v-if="allowDecimalQuantities"
+        <b-input v-model="inputQuantity"
-                       v-model="inputQuantity"
-                       custom-class="receiving-quantity-input" />
-        <b-input v-else
-                 v-model="inputQuantity"
                  type="number"
-                 custom-class="receiving-quantity-input" />
+                 custom-class="receiving-quantity-input">
+        </b-input>
       </b-field>
       <b-field class="control">
         <b-radio-button v-model="inputUOM"
@@ -249,11 +246,8 @@
 </template>
 
 <script>
-import NumericInput from '../numeric-input/NumericInput.vue'
-
 export default {
     name: 'ByjoveReceiving',
-    components: {NumericInput},
     props: {
         productKey: {
             type: String,
@@ -263,10 +257,6 @@ export default {
             type: Boolean,
             default: true,
         },
-        allowDecimalQuantities: {
-            type: Boolean,
-            default: false,
-        },
         allowExpired: {
             type: Boolean,
             default: true,
@@ -343,8 +333,7 @@ export default {
 
         addAmount() {
 
-            let amount = this.inputQuantity
+            let amount = parseInt(this.inputQuantity)
-            amount = this.allowDecimalQuantities ? parseFloat(amount) : parseInt(amount)
             if (!amount) {
                 this.$buefy.toast.open({
                     message: "Please specify an amount",
@@ -370,17 +359,17 @@ export default {
             }
 
             this.$http.post(url, params).then(response => {
-                if (!response.data.error) {
+                if (response.data.data) {
                     this.$router.push(`/receiving/${this.row.batch_uuid}`)
                 } else {
                     this.$buefy.toast.open({
-                        message: response.data.error,
+                        message: response.data.error || "Failed to post receiving!",
                         type: 'is-danger',
                     })
                 }
             }, response => {
                 this.$buefy.toast.open({
-                    message: "Save failed: unknown error",
+                    message: "Failed to post receiving!",
                     type: 'is-danger',
                 })
             })