diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index 1a911ad5..4bb230e9 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -84,7 +84,7 @@ export interface IUserProfile { born_city_str?: string born_province?: string resid_prov_id?: number - resid_province?: string + resid_province: string born_country?: string my_dream?: string saw_and_accepted?: boolean diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index f2d4f11d..8db447ac 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -2244,11 +2244,36 @@ export const colTableUsers = [ AddCol({ name: 'surname', label_trans: 'reg.surname' }), AddCol({ name: 'email', label_trans: 'reg.email' }), AddCol({ name: 'verified_email', label_trans: 'reg.verified_email', fieldtype: costanti.FieldType.boolean }), - AddCol({ name: 'profile.dateofbirth', label_trans: 'reg.dateofbirth', fieldtype: costanti.FieldType.onlydate }), - AddCol({ name: 'profile.born_city', label_trans: 'reg.born_city', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'profile.born_province', label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'profile.born_country', label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'profile.resid_province', label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string }), + AddCol({ + name: 'profile.dateofbirth', + field: 'profile', + subfield: 'dateofbirth', + label_trans: 'reg.dateofbirth', fieldtype: costanti.FieldType.onlydate + }), + AddCol({ + name: 'profile.born_city', + field: 'profile', + subfield: 'born_city', + label_trans: 'reg.born_city', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.born_province', + field: 'profile', + subfield: 'born_province', + label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.born_country', + field: 'profile', + subfield: 'born_country', + label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.resid_province', + field: 'profile', + subfield: 'resid_province', + label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string + }), AddCol({ name: 'profile.resplist', field: 'profile', @@ -2661,9 +2686,30 @@ export const colTableUsersISP = [ remote_field: 'comune', noshowlabel: true, }), - AddCol({ name: 'profile.born_province', label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'profile.born_country', label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'profile.resid_province', label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string }), + AddCol({ + name: 'profile.born_city', + field: 'profile', + subfield: 'born_city', + label_trans: 'reg.born_city', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.born_province', + field: 'profile', + subfield: 'born_province', + label_trans: 'reg.born_province', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.born_country', + field: 'profile', + subfield: 'born_country', + label_trans: 'reg.born_country', fieldtype: costanti.FieldType.string + }), + AddCol({ + name: 'profile.resid_province', + field: 'profile', + subfield: 'resid_province', + label_trans: 'reg.resid_province', fieldtype: costanti.FieldType.string + }), AddCol({ name: 'profile.cell', field: 'profile', subfield: 'cell', label_trans: 'reg.cell', maxlength: 12, @@ -2890,7 +2936,7 @@ export const colTableCircuitComplete = [ }), // AddCol({ name: 'strProv', label_trans: 'reg.provincia', fieldtype: costanti.FieldType.string, // showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist, - // }), + // }), AddCol({ name: 'visibility', label_trans: 'bot.visibility', @@ -3085,8 +3131,10 @@ export const colmyUserCircuit = [ fieldtype: costanti.FieldType.select, jointable: 'listcircuits', }), - AddCol({ name: 'username', label_trans: 'account.users', fieldtype: costanti.FieldType.username_chip, - tipovisu: costanti.TipoVisu.LINK }), + AddCol({ + name: 'username', label_trans: 'account.users', fieldtype: costanti.FieldType.username_chip, + tipovisu: costanti.TipoVisu.LINK + }), AddCol({ name: 'contocom', @@ -3143,10 +3191,14 @@ export const colTableNotifCoins = [ export const colTableMovement = [ AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }), - AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.select, - required: true, jointable: 'listaccounts', }), - AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.select, - required: true, jointable: 'listaccounts' }), + AddCol({ + name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.select, + required: true, jointable: 'listaccounts', + }), + AddCol({ + name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.select, + required: true, jointable: 'listaccounts' + }), AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number, required: true }), AddCol({ name: 'causal', label_trans: 'movement.causal' }), AddCol({ name: 'causal_table', label_trans: 'movement.causal_table' }), diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 2973f5fc..0ff9ec6e 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -89,6 +89,7 @@ export const DefaultUser: IUserFields = { manage_mycircuits: [], useraccounts: [], calc: { numGoodsAndServices: 0 }, + resid_province: '', }, cart: { userId: '', @@ -152,6 +153,7 @@ export const DefaultProfile: IUserProfile = { manage_mycircuits: [], useraccounts: [], calc: { numGoodsAndServices: 0 }, + resid_province: '', } export const useUserStore = defineStore('UserStore', {