This commit is contained in:
2019-02-27 00:12:23 +00:00
parent 45be0c1d25
commit bb3a05e9fd
4 changed files with 38 additions and 36 deletions

View File

@@ -1724,7 +1724,7 @@
},
"@types/strip-bom": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
"resolved": "http://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz",
"integrity": "sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=",
"dev": true
},
@@ -9599,7 +9599,7 @@
},
"jest-get-type": {
"version": "22.4.3",
"resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
"resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
"integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
"dev": true
},
@@ -11038,6 +11038,11 @@
"yallist": "^2.1.2"
}
},
"luxon": {
"version": "1.11.3",
"resolved": "https://registry.npmjs.org/luxon/-/luxon-1.11.3.tgz",
"integrity": "sha512-/0jMa+JfTRBx1ixsSBs5ZPAQ32H+TPeP9BvgRf0Gi4VxCqhUpRNWagwupy6wA8MckazneKWBLCcwwAH8hkQamg=="
},
"make-dir": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
@@ -13839,7 +13844,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
@@ -15962,6 +15967,11 @@
"integrity": "sha512-vkai2B3XqanmscUYSioIjJkU7bzBZGl9mCuIISEZtaDy3qWEkF143UGdJ72u/rGuOytLxpV+9B+FNoV93qlnag==",
"dev": true
},
"vue-datetime": {
"version": "1.0.0-beta.10",
"resolved": "https://registry.npmjs.org/vue-datetime/-/vue-datetime-1.0.0-beta.10.tgz",
"integrity": "sha512-/wJkj95JSzWqH0Ja4JpXX6I+fXo2A34GCtsx00vR5RjNxk3++93rg7G4ZlI3MFo807zH9bIxXfIohbAZgnAWbQ=="
},
"vue-eslint-parser": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
@@ -16112,7 +16122,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
"dev": true
}
@@ -16568,6 +16578,11 @@
"integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
"dev": true
},
"weekstart": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/weekstart/-/weekstart-1.0.0.tgz",
"integrity": "sha1-4K7jWNRa2ZgCJUdp17KjTJOA9Tk="
},
"whatwg-encoding": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
@@ -16930,7 +16945,7 @@
},
"yargs": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
"dev": true,
"requires": {

View File

@@ -13,15 +13,18 @@
"@babel/polyfill": "^7.2.5",
"dayjs": "^1.8.6",
"jwt-decode": "^2.2.0",
"luxon": "^1.11.3",
"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-datetime": "^1.0.0-beta.10",
"vue-router": "^3.0.2",
"vuetify": "^1.5.2",
"vuex": "^3.1.0",
"vuex-persistedstate": "^2.5.4"
"vuex-persistedstate": "^2.5.4",
"weekstart": "^1.0.0"
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^3.0.0",

View File

@@ -11,6 +11,8 @@ import errorHandler from "./api/errorhandler";
import NProgress from "nprogress";
import "nprogress/nprogress.css";
import dayjs from "dayjs";
import Datetime from "vue-datetime";
import "vue-datetime/dist/vue-datetime.css";
/////////////////////////////////////////////////////////////////
// FORM VALIDATION
@@ -18,6 +20,8 @@ import dayjs from "dayjs";
import VeeValidate from "vee-validate";
Vue.use(VeeValidate);
Vue.use(Datetime);
Vue.config.productionTip = false;
/////////////////////////////////////////////////////////////////

View File

@@ -47,18 +47,16 @@
required
></v-text-field>
</v-flex>
<!-- v-validate="localDecimalValidate()" -->
<!-- <v-flex xs12 sm6 lg4 xl3 px-2>
<v-select
v-model="select"
v-validate="'required'"
:items="items"
:error-messages="errors.collect('select')"
label="Select"
data-vv-name="select"
<v-flex xs12 sm6 lg4 xl3 px-2>
<datetime
v-model="obj.startDate"
:error-messages="errors.collect('startDate')"
:label="lc.get('WidgetStartDate')"
data-vv-name="startDate"
type="datetime"
required
></v-select>
</v-flex>-->
></datetime>
</v-flex>
<v-flex xs12 sm6 lg4 xl3 px-2>
<v-checkbox
v-model="obj.active"
@@ -98,25 +96,7 @@ export default {
components: {},
data() {
return {
obj: {
// id: 100,
// concurrencyToken: 2675248,
// ownerId: 1,
// name: "Fantastic Wooden Chips 122",
// serial: 100,
// dollarAmount: 584.83,
// dollarAmount2: 987.65,
// dollarAmount3: 123.45,
// active: true,
// roles: 8212,
// startDate: "2019-02-12T10:12:39.594206",
// endDate: "2019-02-12T13:40:59.986405",
// notes:
// "Eum optio incidunt blanditiis laboriosam. Sed ipsam occaecati minus corrupti repudiandae delectus. Culpa nostrum est ullam assumenda animi ut. Velit sunt ex ipsum. Temporibus cum quaerat at omnis at quas. Commodi dolor molestiae beatae.",
// count: 10,
// customFields: null,
// tags: ["brown", "red"]
},
obj: {},
lc: locale
};
},