diff --git a/ayanova/package-lock.json b/ayanova/package-lock.json index 24fb197a..4d0f0bd0 100644 --- a/ayanova/package-lock.json +++ b/ayanova/package-lock.json @@ -5169,9 +5169,9 @@ "dev": true }, "dayjs": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.6.tgz", - "integrity": "sha512-NLhaSS1/wWLRFy0Kn/VmsAExqll2zxRUPmPbqJoeMKQrFxG+RT94VMSE+cVljB6A76/zZkR0Xub4ihTHQ5HgGg==" + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.8.tgz", + "integrity": "sha512-qBY3kVAVJMxzS4e7DAwZZ/SSiO/DBXbvc/qqbyf1FbsZrxBq81QPdUEWhiPu8Fragf5RfHsLwtH8kCGwKL4qLQ==" }, "de-indent": { "version": "1.0.2", @@ -5785,9 +5785,9 @@ } }, "eslint": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.14.1.tgz", - "integrity": "sha512-CyUMbmsjxedx8B0mr79mNOqetvkbij/zrXnFeK2zc3pGRn3/tibjiNAv/3UxFEyfMDjh+ZqTrJrEGBFiGfD5Og==", + "version": "5.15.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.15.1.tgz", + "integrity": "sha512-NTcm6vQ+PTgN3UBsALw5BMhgO6i5EpIjQF/Xb5tIh3sk9QhrFafujUOczGz4J24JBlzWclSB9Vmx8d+9Z6bFCg==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -5796,7 +5796,7 @@ "cross-spawn": "^6.0.5", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.2", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", "espree": "^5.0.1", @@ -5829,9 +5829,9 @@ }, "dependencies": { "acorn": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.0.tgz", - "integrity": "sha512-MW/FjM+IvU9CgBzjO3UIPCE2pyEwUsoFl+VGdczOPEdxfGFjuKny/gN54mOuX7Qxmb9Rg9MCn2oKiSUeW+pjrw==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", + "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==", "dev": true }, "acorn-jsx": { @@ -5841,9 +5841,9 @@ "dev": true }, "ajv": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz", - "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -5888,6 +5888,16 @@ "esutils": "^2.0.2" } }, + "eslint-scope": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz", + "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, "espree": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", @@ -15952,9 +15962,9 @@ } }, "vue": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.6.tgz", - "integrity": "sha512-Y2DdOZD8sxApS+iUlwv1v8U1qN41kq6Kw45lM6nVZKhygeWA49q7VCCXkjXqeDBXgurrKWkYQ9cJeEJwAq0b9Q==" + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.8.tgz", + "integrity": "sha512-+vp9lEC2Kt3yom673pzg1J7T1NVGuGzO9j8Wxno+rQN2WYVBX2pyo/RGQ3fXCLh2Pk76Skw/laAPCuBuEQ4diw==" }, "vue-cli-plugin-vuetify": { "version": "0.4.6", @@ -16041,9 +16051,9 @@ } }, "vue-template-compiler": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.6.tgz", - "integrity": "sha512-OakxDGyrmMQViCjkakQFbDZlG0NibiOzpLauOfyCUVRQc9yPmTqpiz9nF0VeA+dFkXegetw0E5x65BFhhLXO0A==", + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.8.tgz", + "integrity": "sha512-SwWKANE5ee+oJg+dEJmsdxsxWYICPsNwk68+1AFjOS8l0O/Yz2845afuJtFqf3UjS/vXG7ECsPeHHEAD65Cjng==", "dev": true, "requires": { "de-indent": "^1.0.2", @@ -16057,9 +16067,9 @@ "dev": true }, "vuetify": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.2.tgz", - "integrity": "sha512-OzXHXklOpfYufV1l8v/av99gty6osJ/acTKqd/4CsRPOW+eyJA4nABXWk+4Qm9eAF/Uuf/fSHOprv4donvTeLw==" + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.5.tgz", + "integrity": "sha512-WXFpRNO+AX4WjmA/+maDOBLQpHpkw8xf7O9iV8KKbKVQv7OBbLOEt7a0LBKRRNJboZPyOFXtt7K4+Q/KYc6dnQ==" }, "vuex": { "version": "3.1.0", diff --git a/ayanova/package.json b/ayanova/package.json index b8d7dab9..bdadf8df 100644 --- a/ayanova/package.json +++ b/ayanova/package.json @@ -11,15 +11,15 @@ }, "dependencies": { "@babel/polyfill": "^7.2.5", - "dayjs": "^1.8.6", + "dayjs": "^1.8.8", "jwt-decode": "^2.2.0", "nprogress": "^0.2.0", "register-service-worker": "^1.6.2", "typeface-roboto": "0.0.54", "vee-validate": "^2.1.7", - "vue": "^2.6.6", + "vue": "^2.6.8", "vue-router": "^3.0.2", - "vuetify": "^1.5.2", + "vuetify": "^1.5.5", "vuex": "^3.1.0", "vuex-persistedstate": "^2.5.4" }, @@ -37,12 +37,12 @@ "babel-core": "7.0.0-bridge.0", "babel-eslint": "^10.0.1", "babel-jest": "^23.6.0", - "eslint": "^5.14.1", + "eslint": "^5.15.1", "eslint-plugin-vue": "^5.2.2", "node-sass": "^4.11.0", "sass-loader": "^7.0.1", "vue-cli-plugin-vuetify": "^0.4.6", - "vue-template-compiler": "^2.6.6" + "vue-template-compiler": "^2.6.8" }, "eslintConfig": { "root": true, diff --git a/ayanova/src/main.js b/ayanova/src/main.js index 7f712eab..8c39814d 100644 --- a/ayanova/src/main.js +++ b/ayanova/src/main.js @@ -14,6 +14,7 @@ import dayjs from "dayjs"; import gzdatepicker from "./components/gzdatepicker.vue"; import gztimepicker from "./components/gztimepicker.vue"; import gzdateandtimepicker from "./components/gzdateandtimepicker.vue"; +import altdateandtimepicker from "./components/altdateandtimepicker.vue"; ///////////////////////////////////////////////////////////////// // FORM VALIDATION @@ -110,6 +111,7 @@ Vue.filter("boolastext", function(value) { Vue.component("gz-date-picker", gzdatepicker); Vue.component("gz-time-picker", gztimepicker); Vue.component("gz-date-time-picker", gzdateandtimepicker); +Vue.component("alt-date-time-picker", altdateandtimepicker); ///////////////////////////////////////////////////////////////// // INSTANTIATE diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index b2da19ff..c40619ad 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -49,7 +49,7 @@ > - + + + + + + + @@ -105,7 +139,12 @@ export default { data() { return { obj: {}, - lc: locale + lc: locale, + theDate: new Date(), + date: new Date().toISOString().substr(0, 10), + menu: false, + modal: false, + menu2: false }; }, computed: {