Unverified Commit 26d93d3b authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_23.1' into release_23.2

parents dacdfcc8 60d063a1

client/src/components/Form/Elements/FormNumber.vue

+10 −3
Original line number Diff line number Diff line
@@ -38,11 +38,13 @@ export default { 
            type: [Number, String],

            required: false,

            default: undefined,

            validator: (prop) => typeof prop == "number" || prop === null,

        },

        max: {

            type: [Number, String],

            required: false,

            default: undefined,

            validator: (prop) => typeof prop == "number" || prop === null,

        },

        workflowBuildingMode: {

            type: Boolean,
@@ -74,7 +76,7 @@ export default { 
            return this.workflowBuildingMode ? "text" : "number";

        },

        isRangeValid() {

            return !isNaN(this.min) && !isNaN(this.max) && this.max > this.min;

            return typeof this.min == "number" && typeof this.max == "number" && this.max > this.min;

        },

        isInteger() {

            return this.type.toLowerCase() === "integer";
@@ -124,10 +126,15 @@ export default { 
            }

        },

        isOutOfRange(value) {

            return this.isRangeValid && (value > this.max || value < this.min);

            /* If value=null, then value is within range. */

            return (

                (typeof this.max == "number" && value > this.max) || (typeof this.min == "number" && value < this.min)

            );

        },

        showOutOfRangeWarning(value) {

            const warningMessage = `${value} is out of ${this.min} - ${this.max} range!`;

            const rangeDetail =

                typeof this.max == "number" && value > this.max ? `${value} > ${this.max}` : `${value} < ${this.min}`;

            const warningMessage = `${value} is out of range! (${rangeDetail})`;

            this.showAlert(warningMessage);

        },

        resetAlert() {