diff --git a/src/common/pattern.ts b/src/common/pattern.ts index 12ffed3..01e1d59 100644 --- a/src/common/pattern.ts +++ b/src/common/pattern.ts @@ -17,6 +17,6 @@ export class Patterns { * * 8 to 20 characters string with at least one digit, one upper case letter, one lower case letter and one special symbol */ - public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,20})/i + public static Password: RegExp = /^((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,30})/i } diff --git a/src/components/CDateTime/CDateTime.ts b/src/components/CDateTime/CDateTime.ts index 097f83d..4c57ee4 100644 --- a/src/components/CDateTime/CDateTime.ts +++ b/src/components/CDateTime/CDateTime.ts @@ -45,6 +45,7 @@ export default class CDateTime extends Vue { this.valueDate = new Date() this.myvalue = tools.getstrYYMMDDDateTime(this.valueDate) } + // console.log('Opening', this.valueDate, this.myvalue) this.$emit('show') } diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index a51bf05..1ed6770 100644 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -142,9 +142,9 @@ export default class CGridTableRec extends Vue { if (this.colsel.subfield !== '') { if (mydata.fieldsvalue[this.colsel.field] === undefined) { - mydata.fieldsvalue[this.colsel.field] = {} + mydata.fieldsvalue[this.colsel.field + '.' + this.colsel.subfield] = newVal } - mydata.fieldsvalue[this.colsel.field][this.colsel.subfield] = newVal + // mydata.fieldsvalue[this.colsel.field][this.colsel.subfield] = newVal } else { mydata.fieldsvalue[this.colsel.field] = newVal } diff --git a/src/components/CMyChipList/CMyChipList.scss b/src/components/CMyChipList/CMyChipList.scss index 2e84f39..9ecaf73 100644 --- a/src/components/CMyChipList/CMyChipList.scss +++ b/src/components/CMyChipList/CMyChipList.scss @@ -1,5 +1,6 @@ .clchip{ display: flex; + justify-content: center; //flex: 1; //flex-direction: column; } diff --git a/src/components/CMyChipList/CMyChipList.ts b/src/components/CMyChipList/CMyChipList.ts index dfbebf0..27f8449 100644 --- a/src/components/CMyChipList/CMyChipList.ts +++ b/src/components/CMyChipList/CMyChipList.ts @@ -35,52 +35,84 @@ export default class CMyChipList extends Vue { this.myarrvalues = [] // console.table(this.options) - this.options.forEach((rec, index) => { - if (this.type === tools.FieldType.multiselect) { - if (this.value.includes(rec[this.optval])) { - const mydata = { - label: null, - value: rec[this.optval], - // myris = mylist.filter((myrec) => arrval.includes(myrec[key])) - valbool: true, - icon: '', - color: tools.getColorByIndexBest(index) + if (this.options) { + this.options.forEach((rec, index) => { + if (this.type === tools.FieldType.multiselect) { + if (!!this.value) { + if (this.value.includes(rec[this.optval])) { + const mydata = { + label: null, + value: rec[this.optval], + // myris = mylist.filter((myrec) => arrval.includes(myrec[key])) + valbool: true, + icon: '', + color: tools.getColorByIndexBest(index) + } + + if (tools.isObject(this.optlab)) { + mydata.label = this.options.filter((myrec) => myrec[this.optval] === mydata.value).map(this.optlab) + if (mydata.label) + mydata.label = mydata.label[0] + } else { + mydata.label = rec[this.optlab] + } + + if (this.opticon) + mydata.icon = rec[this.opticon] + if (this.optcolor) + mydata.color = rec[this.optcolor] + + this.myarrvalues.push(mydata) + } + } + } else if (this.type === tools.FieldType.select) { + if (this.value === rec[this.optval]) { + const mydata = { + label: null, + value: this.value, + valbool: true, + icon: '', + color: tools.getColorByIndexBest(index) + } + + // console.log('mydata', mydata, 'optlab', this.optlab, 'value', this.value) + + if (tools.isObject(this.optlab)) { + mydata.label = this.options.filter((myrec) => myrec[this.optval] === mydata.value).map(this.optlab) + if (mydata.label) + mydata.label = mydata.label[0] + } else { + mydata.label = rec[this.optlab] + } + + if (this.opticon) + mydata.icon = rec[this.opticon] + if (this.optcolor) + mydata.color = rec[this.optcolor] + + this.myarrvalues.push(mydata) } - if (tools.isObject(this.optlab)) { - mydata.label = this.options.filter((myrec) => myrec[this.optval] === mydata.value).map(this.optlab) - if (mydata.label) - mydata.label = mydata.label[0] - } else { - mydata.label = rec[this.optlab] + } else { + if (tools.isBitActive(this.value, rec[this.optval])) { + const mydata = { + label: this.$t(rec[this.optlab]), + value: rec[this.optval], + valbool: tools.isBitActive(this.value, rec[this.optval]), + icon: '', + color: tools.getColorByIndexBest(index) + } + + if (this.opticon) + mydata.icon = rec[this.opticon] + if (this.optcolor) + mydata.color = rec[this.optcolor] + + this.myarrvalues.push(mydata) } - - if (this.opticon) - mydata.icon = rec[this.opticon] - if (this.optcolor) - mydata.color = rec[this.optcolor] - - this.myarrvalues.push(mydata) } - } else { - if (tools.isBitActive(this.value, rec[this.optval])) { - const mydata = { - label: this.$t(rec[this.optlab]), - value: rec[this.optval], - valbool: tools.isBitActive(this.value, rec[this.optval]), - icon: '', - color: tools.getColorByIndexBest(index) - } - - if (this.opticon) - mydata.icon = rec[this.opticon] - if (this.optcolor) - mydata.color = rec[this.optcolor] - - this.myarrvalues.push(mydata) - } - } - }) + }) + } if (this.myarrvalues.length === 0) this.myarrvalues.push({ label: this.$t('otherpages.manage.nessuno'), color: 'gray' }) diff --git a/src/components/CMyFieldDb/CMyFieldDb.ts b/src/components/CMyFieldDb/CMyFieldDb.ts index 3497768..5b78dc8 100644 --- a/src/components/CMyFieldDb/CMyFieldDb.ts +++ b/src/components/CMyFieldDb/CMyFieldDb.ts @@ -10,10 +10,11 @@ import { fieldsTable } from '../../store/Modules/fieldsTable' import { IColGridTable } from '../../model' import { CMySelect } from '../CMySelect' import { GlobalStore, UserStore } from '../../store/Modules' +import { CMyChipList } from '../CMyChipList' @Component({ name: 'CMyFieldDb', - components: { CMyEditor, CMySelect } + components: { CMyEditor, CMySelect, CMyChipList } }) export default class CMyFieldDb extends MixinBase { diff --git a/src/components/CMyFieldDb/CMyFieldDb.vue b/src/components/CMyFieldDb/CMyFieldDb.vue index f8abc9e..1460a8d 100644 --- a/src/components/CMyFieldDb/CMyFieldDb.vue +++ b/src/components/CMyFieldDb/CMyFieldDb.vue @@ -31,7 +31,7 @@ :opticon="db_fieldsTable.getIconByTable(col.jointable)"> -
+
-
+
- {{ myvalue }} + {{ myvalprinted }}
@@ -68,6 +68,16 @@ :optlab="db_fieldsTable.getLabelByTable(col.jointable)" :opticon="db_fieldsTable.getIconByTable(col.jointable)">
+
+ +
@@ -186,7 +196,7 @@
-
+
+
+ +
@@ -174,6 +184,8 @@
+
join: {{col.jointable}}
+ @@ -35,7 +35,7 @@ @blur="$v.signup.email.$touch" :error="$v.signup.email.$error" :error-message="errorMsg('email', $v.signup.email)" - + maxlength="50" debounce="1000" :label="$t('reg.email')"> @@ -51,7 +51,7 @@ @blur="$v.signup.username.$touch" :error="$v.signup.username.$error" @keydown.space="(event) => event.preventDefault()" - + maxlength="20" debounce="1000" :error-message="errorMsg('username', $v.signup.username)" :label="$t('reg.username')"> @@ -67,7 +67,7 @@ rounded outlined @blur="$v.signup.name.$touch" :error="$v.signup.name.$error" - + maxlength="30" debounce="1000" :error-message="errorMsg('name', $v.signup.name)" :label="$t('reg.name')"> @@ -83,7 +83,7 @@ rounded outlined @blur="$v.signup.surname.$touch" :error="$v.signup.surname.$error" - + maxlength="30" debounce="1000" :error-message="errorMsg('surname', $v.signup.surname)" :label="$t('reg.surname')"> @@ -101,7 +101,7 @@ @blur="$v.signup.password.$touch" :error="$v.signup.password.$error" :error-message="`${errorMsg('password', $v.signup.password)}`" - + maxlength="30" :label="$t('reg.password')">