This commit is contained in:
2020-12-23 23:24:40 +00:00
parent d6e626b478
commit 1883b4d1c8
7 changed files with 28 additions and 90 deletions

View File

@@ -12,10 +12,8 @@
:disabled="disabled" :disabled="disabled"
:label="label" :label="label"
:rules="rules" :rules="rules"
:error-messages="errorMessages"
></v-text-field> ></v-text-field>
<p v-show="error" class="form__error v-messages theme--light error--text">
{{ error }}
</p>
</div> </div>
</template> </template>
<script> <script>
@@ -38,10 +36,7 @@ export default {
value: { type: Number, default: null }, value: { type: Number, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: { errorMessages: { type: Array, default: null }
type: String,
required: false
}
}, },
computed: { computed: {
currencyValue() { currencyValue() {

View File

@@ -10,7 +10,7 @@
:label="label" :label="label"
:rules="rules" :rules="rules"
type="date" type="date"
:error-messages="allErrors()" :error-messages="errorMessages"
:data-cy="'dateinput:' + testId" :data-cy="'dateinput:' + testId"
></v-text-field> ></v-text-field>
</template> </template>
@@ -34,14 +34,10 @@ export default {
props: { props: {
label: String, label: String,
rules: Array, rules: Array,
"error-messages": { type: Array, default: null }, errorMessages: { type: Array, default: null },
value: { type: String, default: null }, value: { type: String, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: {
type: String,
required: false
},
testId: String testId: String
}, },
computed: { computed: {
@@ -53,16 +49,6 @@ export default {
} }
}, },
methods: { methods: {
allErrors() {
let ret = "";
if (this.error != null) {
ret = this.error;
}
if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString();
}
return ret;
},
readonlyFormat() { readonlyFormat() {
return window.$gz.locale.utcDateToShortDateLocalized( return window.$gz.locale.utcDateToShortDateLocalized(
this.internalValue, this.internalValue,

View File

@@ -11,7 +11,7 @@
:label="label" :label="label"
:rules="rules" :rules="rules"
type="date" type="date"
:error-messages="allErrors()" :error-messages="errorMessages"
:data-cy="'dateinput:' + testId" :data-cy="'dateinput:' + testId"
></v-text-field> ></v-text-field>
</v-col> </v-col>
@@ -49,14 +49,10 @@ export default {
props: { props: {
label: String, label: String,
rules: Array, rules: Array,
"error-messages": { type: Array, default: null }, errorMessages: { type: Array, default: null },
value: { type: String, default: null }, value: { type: String, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: {
type: String,
required: false
},
testId: String testId: String
}, },
computed: { computed: {
@@ -74,16 +70,6 @@ export default {
} }
}, },
methods: { methods: {
allErrors() {
let ret = "";
if (this.error != null) {
ret = this.error;
}
if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString();
}
return ret;
},
readonlyFormat() { readonlyFormat() {
return window.$gz.locale.utcDateToShortDateAndTimeLocalized( return window.$gz.locale.utcDateToShortDateAndTimeLocalized(
this.value, this.value,

View File

@@ -13,10 +13,8 @@
:disabled="disabled" :disabled="disabled"
:label="label" :label="label"
:rules="rules" :rules="rules"
:error-messages="errorMessages"
></v-text-field> ></v-text-field>
<p v-show="error" class="form__error v-messages theme--light error--text">
{{ error }}
</p>
</div> </div>
</template> </template>
<script> <script>
@@ -40,10 +38,7 @@ export default {
value: { type: Number, default: null }, value: { type: Number, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: { errorMessages: { type: Array, default: null },
type: String,
required: false
},
precision: { type: Number, default: undefined } precision: { type: Number, default: undefined }
}, },
computed: { computed: {

View File

@@ -16,6 +16,7 @@
:label="$ay.t('TimeSpanDays')" :label="$ay.t('TimeSpanDays')"
type="number" type="number"
:data-cy="'durationdays:' + testId" :data-cy="'durationdays:' + testId"
:error="!!hasErrors"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="3"> <v-col cols="3">
@@ -28,6 +29,7 @@
:label="$ay.t('TimeSpanHours')" :label="$ay.t('TimeSpanHours')"
type="number" type="number"
:data-cy="'durationhours:' + testId" :data-cy="'durationhours:' + testId"
:error="!!hasErrors"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="3"> <v-col cols="3">
@@ -40,6 +42,7 @@
:label="$ay.t('TimeSpanMinutes')" :label="$ay.t('TimeSpanMinutes')"
type="number" type="number"
:data-cy="'durationminutes:' + testId" :data-cy="'durationminutes:' + testId"
:error="!!hasErrors"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="3"> <v-col cols="3">
@@ -53,14 +56,16 @@
:label="$ay.t('TimeSpanSeconds')" :label="$ay.t('TimeSpanSeconds')"
type="number" type="number"
:data-cy="'durationseconds:' + testId" :data-cy="'durationseconds:' + testId"
:error="!!hasErrors"
></v-text-field> ></v-text-field>
</v-col> </v-col>
</v-row> </v-row>
</template> </template>
<div class="v-messages theme--light error--text mt-n5" role="alert">
<p v-show="error" class="form__error v-messages theme--light error--text"> <div class="v-messages__wrapper">
{{ error }} <div class="v-messages__message">{{ allErrors() }}</div>
</p> </div>
</div>
</div> </div>
</template> </template>
<script> <script>
@@ -82,19 +87,19 @@ export default {
props: { props: {
label: String, label: String,
rules: Array, rules: Array,
"error-messages": { type: Array, default: null }, errorMessages: { type: Array, default: null },
value: { type: String, default: null }, value: { type: String, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: {
type: String,
required: false
},
showSeconds: { type: Boolean, default: true }, showSeconds: { type: Boolean, default: true },
showDays: { type: Boolean, default: true }, showDays: { type: Boolean, default: true },
testId: String testId: String
}, },
computed: { computed: {
hasErrors() {
return this.errorMessages != null && this.errorMessages.length > 0;
},
splitSpan() { splitSpan() {
let vm = this; let vm = this;
let theDays = 0; let theDays = 0;
@@ -138,9 +143,7 @@ export default {
methods: { methods: {
allErrors() { allErrors() {
let ret = ""; let ret = "";
if (this.error != null) {
ret = this.error;
}
if (this.errorMessages != null && this.errorMessages.length > 0) { if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString(); ret += this.errorMessages.toString();
} }

View File

@@ -12,7 +12,7 @@
:disabled="disabled" :disabled="disabled"
:label="label" :label="label"
:rules="rules" :rules="rules"
:error-messages="allErrors()" :error-messages="errorMessages"
:data-cy="'roleinput:' + testId" :data-cy="'roleinput:' + testId"
></v-select> ></v-select>
</template> </template>
@@ -46,14 +46,10 @@ export default {
props: { props: {
label: String, label: String,
rules: Array, rules: Array,
"error-messages": { type: Array, default: null }, errorMessages: { type: Array, default: null },
value: { type: Number, default: 0 }, value: { type: Number, default: 0 },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: {
type: String,
required: false
},
limitSelectionTo: { type: String, default: null }, //"inside" - no customer roles, "outside" - no non-customer roles limitSelectionTo: { type: String, default: null }, //"inside" - no customer roles, "outside" - no non-customer roles
testId: String testId: String
}, },
@@ -72,16 +68,6 @@ export default {
} }
}, },
methods: { methods: {
allErrors() {
let ret = "";
if (this.error != null) {
ret = this.error;
}
if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString();
}
return ret;
},
handleInput(value) { handleInput(value) {
let newValue = 0; let newValue = 0;
if (value != null && value != [] && value.length > 0) { if (value != null && value != [] && value.length > 0) {

View File

@@ -9,7 +9,7 @@
:disabled="disabled" :disabled="disabled"
:label="label" :label="label"
:rules="rules" :rules="rules"
:error-messages="allErrors()" :error-messages="errorMessages"
type="time" type="time"
:data-cy="'timeinput:' + testId" :data-cy="'timeinput:' + testId"
></v-text-field> ></v-text-field>
@@ -37,14 +37,11 @@ export default {
props: { props: {
label: String, label: String,
rules: Array, rules: Array,
"error-messages": { type: Array, default: null }, errorMessages: { type: Array, default: null },
value: { type: String, default: null }, value: { type: String, default: null },
readonly: { type: Boolean, default: false }, readonly: { type: Boolean, default: false },
disabled: { type: Boolean, default: false }, disabled: { type: Boolean, default: false },
error: {
type: String,
required: false
},
testId: String testId: String
}, },
computed: { computed: {
@@ -56,16 +53,6 @@ export default {
} }
}, },
methods: { methods: {
allErrors() {
let ret = "";
if (this.error != null) {
ret = this.error;
}
if (this.errorMessages != null && this.errorMessages.length > 0) {
ret += this.errorMessages.toString();
}
return ret;
},
readonlyFormat() { readonlyFormat() {
return window.$gz.locale.utcDateToShortTimeLocalized( return window.$gz.locale.utcDateToShortTimeLocalized(
this.value, this.value,