CHANGELOG.md

@@ -5,41 +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.
-- Show invoice number when receiving row.
-- Center receiving buttons; add "12 EA" quick receive button.
-
-## [0.1.21] - 2023-10-06
-### Changed
-- Auto-trim username field in login form.
-- Auto-focus case/unit field when showing inventory count page.
-
-## [0.1.20] - 2023-09-17
-### Changed
-- Validate amount when adding receiving quantity.
-- Show "missing" quantities for item receiving.
-
 ## [0.1.19] - 2023-08-29
 ### Changed
 - Add support for "missing" credit in mobile receiving.

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "byjove",
-    "version": "0.1.26",
+    "version": "0.1.19",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "byjove",
-            "version": "0.1.26",
+            "version": "0.1.19",
             "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.19",
     "description": "Generic-ish app components for Vue.js frontend to Tailbone API backend",
     "keywords": [
         "rattail",

src/components/inventory/ByjoveInventory.vue

@@ -44,15 +44,13 @@
         <b-input v-model="row.cases"
                  type="number"
                  step="any"
-                 ref="cases"
                  :disabled="!shouldAllowCases()">
         </b-input>
       </b-field>
       <b-field label="Units" expanded>
         <b-input v-model="row.units"
                  type="number"
-                 step="any"
+                 step="any">
-                 ref="units">
         </b-input>
       </b-field>
     </b-field>
@@ -83,10 +81,6 @@ export default {
             type: Boolean,
             default: true,
         },
-        focusCases: {
-            type: Boolean,
-            default: false,
-        },
         allowEdit: {
             type: Boolean,
             default: false,
@@ -96,7 +90,6 @@ export default {
             default: false,
         },
     },
-
     data() {
         return {
             row: {},
@@ -160,14 +153,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/login/ByjoveLogin.vue

@@ -6,7 +6,7 @@
       </byjove-logo>
 
       <b-field label="Username">
-        <b-input v-model.trim="username" />
+        <b-input v-model="username" />
       </b-field>
 
       <b-field label="Password">

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

@@ -25,16 +25,58 @@
           {{ row.description }} {{ row.size }}
         </p>
 
-        <p v-if="row.invoice_number"
-           class="has-text-weight-bold">
-          Invoice # {{ row.invoice_number }}
-        </p>
-
         <p v-if="allowCases"
            class="has-text-weight-bold">
           1 CS = {{ row.case_quantity || 1 }} {{ row.unit_uom }}
         </p>
 
+        <table class="receiving-quantities">
+          <tr v-if="row.order_quantities_known">
+            <td>ordered</td>
+            <td>
+              <span v-if="allowCases">
+                {{ row.cases_ordered || 0}} /
+              </span>
+              {{ row.units_ordered || 0}}
+            </td>
+          </tr>
+          <tr v-if="row.order_quantities_known">
+            <td>shipped</td>
+            <td>
+              <span v-if="allowCases">
+                {{ row.cases_shipped || 0}} /
+              </span>
+              {{ row.units_shipped || 0}}
+            </td>
+          </tr>
+          <tr>
+            <td>received</td>
+            <td>
+              <span v-if="allowCases">
+                {{ row.cases_received || 0}} /
+              </span>
+              {{ row.units_received || 0}}
+            </td>
+          </tr>
+          <tr>
+            <td>damaged</td>
+            <td>
+              <span v-if="allowCases">
+                {{ row.cases_damaged || 0}} /
+              </span>
+              {{ row.units_damaged || 0}}
+            </td>
+          </tr>
+          <tr v-if="allowExpired">
+            <td>expired</td>
+            <td>
+              <span v-if="allowCases">
+                {{ row.cases_expired || 0}} /
+              </span>
+              {{ row.units_expired || 0}}
+            </td>
+          </tr>
+        </table>
       </div>
 
       <div>
@@ -42,56 +84,6 @@
       </div>
     </div>
 
-    <div class="columns is-mobile">
-
-      <div class="column">
-
-        <div v-if="row.order_quantities_known"
-             style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">ordered</span>
-          <span v-if="allowCases">{{ row.cases_ordered || 0 }} /</span>
-          <span>{{ row.units_ordered || 0}}</span>
-        </div>
-
-        <div v-if="row.order_quantities_known"
-             style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">shipped</span>
-          <span v-if="allowCases">{{ row.cases_shipped || 0 }} /</span>
-          <span>{{ row.units_shipped || 0}}</span>
-        </div>
-
-        <div style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">received</span>
-          <span v-if="allowCases">{{ row.cases_received || 0 }} /</span>
-          <span>{{ row.units_received || 0}}</span>
-        </div>
-      </div>
-
-      <div class="column">
-
-        <div style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">damaged</span>
-          <span v-if="allowCases">{{ row.cases_damaged || 0 }} /</span>
-          <span>{{ row.units_damaged || 0}}</span>
-        </div>
-
-        <div v-if="allowExpired"
-             style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">expired</span>
-          <span v-if="allowCases">{{ row.cases_expired || 0 }} /</span>
-          <span>{{ row.units_expired || 0}}</span>
-        </div>
-
-        <div style="display: flex; gap: 0.3rem;">
-          <span style="flex-grow: 1;">missing</span>
-          <span v-if="allowCases">{{ row.cases_missing || 0 }} /</span>
-          <span>{{ row.units_missing || 0}}</span>
-        </div>
-
-      </div>
-
-    </div>
-
     <div v-if="row.received_alert"
          class="has-text-danger">
       <br />
@@ -118,36 +110,28 @@
                     expanded>
             {{ row.quick_receive_text }}
           </b-button>          
-          <div v-if="!row.quick_receive_all"
+          <div v-if="!row.quick_receive_all">
-               style="margin: auto;">
+            <div class="buttons"
-            <b-button v-if="allowCases"
+                 v-if="allowCases">
-                      type="is-primary"
+              <b-button type="is-primary"
-                      @click="addQuickAmount(1, 'CS')"
+                        @click="addQuickAmount(1, 'CS')"
-                      expanded
+                        expanded>
-                      style="margin-bottom: 1rem;">
+                Receive 1 CS
-              Receive 1 CS
+              </b-button>
-            </b-button>
+            </div>
-            <div>
+            <div class="buttons has-text-centered" style="width: 100%;">
               <b-button type="is-primary"
-                        size="is-small"
                         @click="addQuickAmount(1, row.unit_uom)">
                 1 {{ row.unit_uom }}
               </b-button>
               <b-button type="is-primary"
-                        size="is-small"
                         @click="addQuickAmount(3, row.unit_uom)">
                 3 {{ row.unit_uom }}
               </b-button>
               <b-button type="is-primary"
-                        size="is-small"
                         @click="addQuickAmount(6, row.unit_uom)">
                 6 {{ row.unit_uom }}
               </b-button>
-              <b-button type="is-primary"
-                        size="is-small"
-                        @click="addQuickAmount(12, row.unit_uom)">
-                12 {{ row.unit_uom }}
-              </b-button>
             </div>
           </div>
         </div>
@@ -159,13 +143,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"
@@ -214,17 +195,15 @@
     </b-field>
 
     <div class="buttons">
-      <div style="margin: auto;">
+      <b-button type="is-primary"
-        <b-button type="is-primary"
+                @click="addAmount()"
-                  @click="addAmount()"
+                :disabled="addAmountDisabled">
-                  :disabled="addAmountDisabled">
+        Add Amount
-          Add Amount
+      </b-button>
-        </b-button>
+      <b-button type="is-warning"
-        <b-button type="is-warning"
+                @click="subtractAmount()">
-                  @click="subtractAmount()">
+        Subtract Amount
-          Subtract
+      </b-button>
-        </b-button>
-      </div>
     </div>
 
     <p class="has-text-centered is-italic">OR</p>
@@ -249,11 +228,8 @@
 </template>
 
 <script>
-import NumericInput from '../numeric-input/NumericInput.vue'
-
 export default {
     name: 'ByjoveReceiving',
-    components: {NumericInput},
     props: {
         productKey: {
             type: String,
@@ -263,10 +239,6 @@ export default {
             type: Boolean,
             default: true,
         },
-        allowDecimalQuantities: {
-            type: Boolean,
-            default: false,
-        },
         allowExpired: {
             type: Boolean,
             default: true,
@@ -342,17 +314,6 @@ export default {
         },
 
         addAmount() {
-
-            let amount = this.inputQuantity
-            amount = this.allowDecimalQuantities ? parseFloat(amount) : parseInt(amount)
-            if (!amount) {
-                this.$buefy.toast.open({
-                    message: "Please specify an amount",
-                    type: 'is-info',
-                })
-                return
-            }
-
             let url = `/api/receiving-batch-row/${this.row.uuid}/receive`
             let params = {
                 row: this.row.uuid,
@@ -364,23 +325,23 @@ export default {
             }
 
             if (this.inputUOM == 'CS') {
-                params.cases = amount
+                params.cases = this.inputQuantity
             } else {
-                params.units = amount
+                params.units = this.inputQuantity
             }
 
             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',
                 })
             })
@@ -404,6 +365,6 @@ export default {
       padding: 0px 10px 0px 0px;
   }
   .input.receiving-quantity-input {
-      width: 6rem;
+      width: 10rem;
   }
 </style>