diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index db9eb64c..a2c1895c 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -304,7 +304,7 @@ export default defineComponent({ label: 'Offro/Cerco', table: 'adtypes', key: 'adType', - value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI, true), arrvalue: [], addall: true, type: costanti.FieldType.select, @@ -315,7 +315,7 @@ export default defineComponent({ label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', - value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, 0), + value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, 0, true), arrvalue: [], type: costanti.FieldType.select, filter: null, @@ -327,7 +327,7 @@ export default defineComponent({ label: 'Categoria', table: 'skills', key: 'idSkill', - value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI, true), arrvalue: [], type: costanti.FieldType.select, addall: true, @@ -467,7 +467,7 @@ export default defineComponent({ label: 'Settore', table: toolsext.TABSECTORS, key: 'idSector', - value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, 0), + value: tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, 0, true), arrvalue: [], type: costanti.FieldType.select, filter: null, @@ -479,7 +479,7 @@ export default defineComponent({ label: 'Categoria', table: 'skills', key: 'idSkill', - value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'skills' + '_' + tools.getCookie(tools.COOK_SEARCH + toolsext.TABSECTORS, costanti.FILTER_TUTTI), costanti.FILTER_TUTTI, true), arrvalue: [], type: costanti.FieldType.select, addall: true, @@ -547,7 +547,7 @@ export default defineComponent({ table: toolsext.TABTYPEHOSP, key: 'typeHosp', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + 'typeHosp', costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'typeHosp', costanti.FILTER_TUTTI, true), addall: true, arrvalue: [], filter: null, @@ -559,7 +559,7 @@ export default defineComponent({ table: toolsext.TABPEOPLE, key: 'numMaxPeopleHosp', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + 'numMaxPeopleHosp', costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'numMaxPeopleHosp', costanti.FILTER_TUTTI, true), addall: true, arrvalue: [], filter: null, @@ -637,14 +637,14 @@ export default defineComponent({ label: 'Offro/Cerco', table: 'adtypes', key: 'adType', - value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI), + value: tools.getCookie(tools.COOK_SEARCH + 'adtypes', costanti.FILTER_TUTTI, true), arrvalue: [], addall: true, type: costanti.FieldType.select, filter: null, useinput: false, }, - { + /*{ label: 'Settore', table: 'sectorgoods', key: 'idSectorGood', @@ -678,7 +678,7 @@ export default defineComponent({ addall: true, filter: null, useinput: false, - }, + },*/ /*{ label: 'Specializzazione', table: 'subskills', @@ -1046,6 +1046,7 @@ export default defineComponent({ accomodation: 1, preferences: 1, idContribType: 1, + photos: 1, idCity: 1, note: 1, website: 1, @@ -1060,7 +1061,6 @@ export default defineComponent({ comune: 1, mycities: 1, 'profile.img': 1, - 'profile.qualifica': 1, } }, } diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 9fc87e62..f35f48d6 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -399,7 +399,7 @@ export default defineComponent({ setCategBySector(toolsext.TABSKILLS, table, newval) } else if (table === toolsext.TABREGIONS) { setProvinceByRegion(toolsext.TABPROVINCE, table, newval) - }else if (table === 'goods') { + } else if (table === 'goods') { setCategBySector('sectorgoods', table, newval) } @@ -1303,35 +1303,37 @@ export default defineComponent({ colVisib.value = [] let elem: IColGridTable - for (elem of mycolumns.value) { - if (elem.field !== costanti.NOFIELD) { - if (checkIfColShow(elem.field)) { - colVisib.value.push(elem.field! + elem.subfield!) + if (tools.isArray(mycolumns.value)) { + for (elem of mycolumns.value) { + if (elem.field !== costanti.NOFIELD) { + if (checkIfColShow(elem.field)) { + colVisib.value.push(elem.field! + elem.subfield!) + } } } - } - if (!!myselcol && myselcol.length > 0) { - const arrselcol = myselcol.split('|') + if (!!myselcol && myselcol.length > 0) { + const arrselcol = myselcol.split('|') - for (const col of arrselcol) { - const arrv = col.split(',') - if (arrv.length > 1) { - let field = arrv[0] - let visib = arrv[1] - const rec = mycolumns.value.find((rec: any) => (rec.field + rec.subfield) === field) + for (const col of arrselcol) { + const arrv = col.split(',') + if (arrv.length > 1) { + let field = arrv[0] + let visib = arrv[1] + const rec = mycolumns.value.find((rec: any) => (rec.field + rec.subfield) === field) - if (rec) { - if (field) { - if (visib === '1') { - if (!colVisib.value.includes(field)) - colVisib.value.push(field) // se non incluso allora lo aggiungi - } else if (visib === '0') { - // Se da togliere, lo togli - if (colVisib.value.includes(field)) - colVisib.value = colVisib.value.filter((rec: any) => rec !== field) + if (rec) { + if (field) { + if (visib === '1') { + if (!colVisib.value.includes(field)) + colVisib.value.push(field) // se non incluso allora lo aggiungi + } else if (visib === '0') { + // Se da togliere, lo togli + if (colVisib.value.includes(field)) + colVisib.value = colVisib.value.filter((rec: any) => rec !== field) + } } } } diff --git a/src/components/CMyFriends/CMyFriends.ts b/src/components/CMyFriends/CMyFriends.ts index 355c1948..e3b22b63 100755 --- a/src/components/CMyFriends/CMyFriends.ts +++ b/src/components/CMyFriends/CMyFriends.ts @@ -208,8 +208,8 @@ export default defineComponent({ } - function setCmd($q: any, cmd: number, usernameDest: string, value: any, groupname: string) { - tools.setCmd($q, cmd, username.value, value, usernameDest) + function setCmd($q: any, cmd: number, username: string, value: any, usernameDest: string) { + tools.setCmd($q, cmd, username, value, usernameDest) if (cmd === shared_consts.FRIENDSCMD.SETTRUST) { setRequestTrust(usernameDest, value) diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts index 9fcb1dd0..ae9a6911 100755 --- a/src/components/CMySelect/CMySelect.ts +++ b/src/components/CMySelect/CMySelect.ts @@ -24,7 +24,7 @@ export default defineComponent({ return [] } }, - value: [String, Number], + value: [String, Number, Object], label: { type: String, required: true, @@ -152,7 +152,7 @@ export default defineComponent({ const optFiltered = ref([]) const valori = ref([]) - const myvalue = ref('') + const myvalue = ref('') const myarrvalue = ref([]) const arrtempOpt = ref([]) @@ -199,7 +199,7 @@ export default defineComponent({ if (!num) { num = 0 } else { - num = parseInt(num.toString()) + num = parseInt(num.toString(), 10) } } catch (e) { num = 0 @@ -268,7 +268,7 @@ export default defineComponent({ } function update() { - console.log('update') + console.log('update', props.value, props) // console.log(' #### mounted myselect', props.options, 'arrvalue', myarrvalue.value) let rec: any if (optionsreal.value) { @@ -277,7 +277,7 @@ export default defineComponent({ } } if (props.multiselect_by_server) { - const num = parseInt(localStorage.getItem(props.tablesel + 'NUM')!) + const num = parseInt(localStorage.getItem(props.tablesel + 'NUM')!, 10) // console.log('num LOADED ', num) arrtempOpt.value = [] if (props.addall) { @@ -299,7 +299,7 @@ export default defineComponent({ arrtempOpt.value = [myobj, ...arrtempOpt.value] } for (let i = 0; i < num; i++) { - const itemId = parseInt(localStorage.getItem(props.tablesel + i + props.optval)!) + const itemId = parseInt(localStorage.getItem(props.tablesel + i + props.optval)!, 10) const itemlab = localStorage.getItem(props.tablesel + i + props.optlab) if (itemId) { let obj: any = {} @@ -403,6 +403,7 @@ export default defineComponent({ } function updateArrOptions() { + let myarr: any = [] // console.log(props.col.jointable, props.filter) diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index a419c0b6..ecf39263 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -252,7 +252,7 @@ export default defineComponent({ isalreadyReg.value = await tools.registeredusername(signup.username); signup.profile.username_telegram = signup.username if (!!$route.params.idteleg) { - signup.profile.teleg_id = $route.params.idteleg ? parseInt($route.params.idteleg.toString()) : 0 + signup.profile.teleg_id = $route.params.idteleg ? parseInt($route.params.idteleg.toString(), 10) : 0 } console.log('1) aportador_solidario', signup.aportador_solidario) diff --git a/src/db/static_data.ts b/src/db/static_data.ts index a650c7d6..dba16c14 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -199,6 +199,34 @@ const routes_manager: IListRoutes[] = [ onlyManager: true, onlyTutor: true }, + { + active: true, + order: 11, + path: '/admin/circuitslist', + materialIcon: 'fas fa-users', + name: 'otherpages.admin.circuitslist', + component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyTutor: true + }, + { + active: true, + order: 12, + path: '/admin/accountslist', + materialIcon: 'fas fa-users', + name: 'otherpages.admin.accountslist', + component: () => import('@/rootgen/admin/accountsList/accountsList.vue'), + inmenu: true, + submenu: true, + level_parent: 0, + level_child: 0.5, + onlyManager: true, + onlyTutor: true + }, /* { active: true, diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 1380eef3..6c2e135e 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -847,6 +847,7 @@ export interface IMyHosp { typeHosp: number numMaxPeopleHosp: number accomodation: IAccomodation[] + photos: IGallery[] preferences: number[] idContribType: string[] idCity: number[] @@ -858,3 +859,32 @@ export interface IMyHosp { } +export interface ICircuit { + _id: number + name: string + subname: string + descr: string + systemUserDescr: string + systemUserId: string + founderUserId: string + totCircolante?: number + totTransato?: number + nome_valuta: string + symbol: string + abbrev: string + compara_valuta?: number + compara_euro?: number + valuta_per_euro?: number + fido_scoperto_default?: number + data_costituz?: Date + deperimento: boolean + freq_deper?: string + minuto_deper?: string + ora_deper?: string + giorno_deper?: string + mese_deper?: string + ultimo_deper?: Date + durata_deper?: number + img_logo?: string +} + diff --git a/src/rootgen/admin/accountsList/accountsList.scss b/src/rootgen/admin/accountsList/accountsList.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/rootgen/admin/accountsList/accountsList.ts b/src/rootgen/admin/accountsList/accountsList.ts new file mode 100755 index 00000000..aff73e08 --- /dev/null +++ b/src/rootgen/admin/accountsList/accountsList.ts @@ -0,0 +1,35 @@ +import { defineComponent, onMounted, ref } from 'vue' + +import { CMyPage } from '@/components/CMyPage' +import { CGridTableRec } from '@/components/CGridTableRec' +import { tools } from '@store/Modules/tools' +import { static_data } from '@/db/static_data' + +import { fieldsTable } from '@src/store/Modules/fieldsTable' +import { shared_consts } from '@/common/shared_vuejs' + +export default defineComponent({ + name: 'accountsList', + // @ts-ignore + components: { CGridTableRec, CMyPage }, + setup() { + + const arrfilterand: any = ref([]) + + function mounted() { + if (tools.appid() === tools.IDAPP_RISO) { + arrfilterand.value = [ + ] + } + } + + onMounted(mounted) + + return { + arrfilterand, + fieldsTable, + } + } +}) + + diff --git a/src/rootgen/admin/accountsList/accountsList.vue b/src/rootgen/admin/accountsList/accountsList.vue new file mode 100755 index 00000000..9cf4d043 --- /dev/null +++ b/src/rootgen/admin/accountsList/accountsList.vue @@ -0,0 +1,22 @@ + + + + + + diff --git a/src/rootgen/admin/accountsList/index.ts b/src/rootgen/admin/accountsList/index.ts new file mode 100755 index 00000000..307acac7 --- /dev/null +++ b/src/rootgen/admin/accountsList/index.ts @@ -0,0 +1 @@ +export {default as accountsList} from './accountsList.vue' diff --git a/src/rootgen/admin/circuitsList/circuitsList.scss b/src/rootgen/admin/circuitsList/circuitsList.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/rootgen/admin/circuitsList/circuitsList.ts b/src/rootgen/admin/circuitsList/circuitsList.ts new file mode 100755 index 00000000..98cfed21 --- /dev/null +++ b/src/rootgen/admin/circuitsList/circuitsList.ts @@ -0,0 +1,35 @@ +import { defineComponent, onMounted, ref } from 'vue' + +import { CMyPage } from '@/components/CMyPage' +import { CGridTableRec } from '@/components/CGridTableRec' +import { tools } from '@store/Modules/tools' +import { static_data } from '@/db/static_data' + +import { fieldsTable } from '@src/store/Modules/fieldsTable' +import { shared_consts } from '@/common/shared_vuejs' + +export default defineComponent({ + name: 'circuitsList', + // @ts-ignore + components: { CGridTableRec, CMyPage }, + setup() { + + const arrfilterand: any = ref([]) + + function mounted() { + if (tools.appid() === tools.IDAPP_RISO) { + arrfilterand.value = [ + ] + } + } + + onMounted(mounted) + + return { + arrfilterand, + fieldsTable, + } + } +}) + + diff --git a/src/rootgen/admin/circuitsList/circuitsList.vue b/src/rootgen/admin/circuitsList/circuitsList.vue new file mode 100755 index 00000000..cee65a69 --- /dev/null +++ b/src/rootgen/admin/circuitsList/circuitsList.vue @@ -0,0 +1,22 @@ + + + + + + diff --git a/src/rootgen/admin/circuitsList/index.ts b/src/rootgen/admin/circuitsList/index.ts new file mode 100755 index 00000000..685399d4 --- /dev/null +++ b/src/rootgen/admin/circuitsList/index.ts @@ -0,0 +1 @@ +export {default as circuitsList} from './circuitsList.vue' diff --git a/src/statics/lang/enUs.js b/src/statics/lang/enUs.js index b7780697..e85b1fb6 100755 --- a/src/statics/lang/enUs.js +++ b/src/statics/lang/enUs.js @@ -877,10 +877,10 @@ const msg_enUs = { goods: 'Beni', test: 'Test', groups: 'Gruppi', - request_friends: 'Rich. Amicizia', - request_sent_friends: 'Rich. Inviate', - request_sent_groups: 'Rich. Inviate', - request_trust: 'Rich. Fiducia', + request_friends: 'Richieste Amicizia', + request_sent_friends: 'Richieste Inviate', + request_sent_groups: 'Richieste Inviate', + request_trust: 'Richieste Fiducia', trusted: 'Fiducia Accettata', rejected: 'Rifiutati', }, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 1cc9ab4b..7d11139a 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1,3 +1,5 @@ +import { costanti } from '@costanti' + const msg_it = { it: { words: { @@ -45,6 +47,8 @@ const msg_it = { eventlist: 'Le tue Prenotazioni', usereventlist: 'Prenotazioni Utenti', userlist: 'Lista Utenti', + circuitslist: 'Lista Circuiti', + accountslist: 'Lista Conti', iscritticonacreis: 'Iscritti Conacreis', zoomlist: 'Calendario Zoom', extralist: 'Lista Extra', @@ -905,10 +909,10 @@ const msg_it = { goods: 'Beni', test: 'Test', groups: 'Gruppi', - request_friends: 'Rich. Amicizia', - request_sent_friends: 'Rich. Inviate', - request_sent_groups: 'Rich. Inviate', - request_trust: 'Rich. Fiducia', + request_friends: 'Richieste Amicizia', + request_sent_friends: 'Richieste Inviate', + request_sent_groups: 'Richieste Inviate', + request_trust: 'Richieste Fiducia', trusted: 'Fiducia Accettata', rejected: 'Rifiutati', }, @@ -967,6 +971,53 @@ const msg_it = { }, preferences: 'Preferenze', }, + circuit: { + name: 'Nome Circuito', + subname: 'SottoNome', + descr: 'Descrizione', + systemUserDescr: 'Descr Utente di Sistema', + systemUserId: 'ID Utente di Sistema', + founderUserId: 'ID Fondatore', + totCircolante: 'Totale Circolante', + totTransato: 'Totale Transato', + nome_valuta: 'Nome Valuta', + symbol: 'Simbolo', + abbrev: 'Abbreviaz.', + compara_valuta: 'Compara Valuta', + compara_euro: 'Compara Euro', + valuta_per_euro: 'Valuta per Euro', + fido_scoperto_default: 'Fido scoperto default', + data_costituz: 'Data Costituzione', + deperimento: 'Deperimento', + freq_deper: 'Frequenza Deperimento', + minuto_deper: 'Minuto Dep.', + ora_deper: 'Ora Dep.', + giorno_deper: 'Giorno Dep.', + mese_deper: 'Mese Dep.', + ultimo_deper: 'Ultimo Dep.', + durata_deper: 'Durata Dep.', + img_logo: 'NomeFile Logo', + }, + + account: { + deperibile: 'Deperibile', + importo_iniziale: 'Importo Iniziale', + saldo: 'Saldo', + user: 'Utente', + }, + + movement: { + transactionDate: '', + accountFromId: '', + accountToId: '', + amount: '', + causal: '', + causal_table: '', + causal_IdRec: '', + residual: '', + expiringDate: '', + + }, }, diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index d2989cd0..ab95c26a 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -264,9 +264,7 @@ export const getcolorderscart = [ AddCol({ name: 'created_at', label_trans: 'order.created_at', fieldtype: costanti.FieldType.date }), AddCol({ name: 'status', label_trans: 'order.status' }), AddCol({ name: 'items', label_trans: 'order.items' }), - AddCol({ - name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.select, jointable: 'users', - }), + AddCol({ name: 'userId', label_trans: 'order.users', fieldtype: costanti.FieldType.select, jointable: 'users', }), AddCol({ name: 'note', label_trans: 'order.note' }), AddCol(DeleteRec), AddCol(DuplicateRec), @@ -1044,8 +1042,9 @@ export const colmyHosp = [ fieldtype: costanti.FieldType.listimages, jointable: '', showpicprofile_ifnotset: true, - showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit, - isadvanced_field: false, + showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, + isadvanced_field: true, + sortable: false, }), AddCol({ name: 'note', label_trans: 'proj.longdescr', fieldtype: costanti.FieldType.html, @@ -2294,8 +2293,8 @@ export const colTableCircuit = [ AddCol({ name: 'subname', label_trans: 'circuit.subname' }), AddCol({ name: 'descr', label_trans: 'circuit.descr' }), AddCol({ name: 'systemUserDescr', label_trans: 'circuit.systemUserDescr' }), - AddCol({ name: 'systemUserId', label_trans: 'order.users', fieldtype: costanti.FieldType.select, jointable: 'users', }), - AddCol({ name: 'founderUserId', label_trans: 'order.users', fieldtype: costanti.FieldType.select, jointable: 'users', }), + AddCol({ name: 'systemUserId', label_trans: 'circuit.systemUserId', fieldtype: costanti.FieldType.select, jointable: 'users', }), + AddCol({ name: 'founderUserId', label_trans: 'circuit.founderUserId', fieldtype: costanti.FieldType.select, jointable: 'users', }), AddCol({ name: 'totCircolante', label_trans: 'circuit.totCircolante', fieldtype: costanti.FieldType.number }), AddCol({ name: 'totTransato', label_trans: 'circuit.totTransato', fieldtype: costanti.FieldType.number }), AddCol({ name: 'nome_valuta', label_trans: 'circuit.nome_valuta' }), @@ -2314,10 +2313,33 @@ export const colTableCircuit = [ AddCol({ name: 'mese_deper', label_trans: 'circuit.mese_deper', fieldtype: costanti.FieldType.number }), AddCol({ name: 'ultimo_deper', label_trans: 'circuit.ultimo_deper', fieldtype: costanti.FieldType.date }), AddCol({ name: 'durata_deper', label_trans: 'circuit.durata_deper', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'img_logo', label_trans: 'circuit.img_logo' }), AddCol(DeleteRec), AddCol(DuplicateRec), ] +export const colTableAccount = [ + AddCol({ name: 'circuitId', label_trans: 'account.circuitId', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'userId', label_trans: 'account.users', fieldtype: costanti.FieldType.select, jointable: 'users', }), + AddCol({ name: 'name', label_trans: 'circuit.name' }), + AddCol({ name: 'deperibile', label_trans: 'account.deperibile', fieldtype: costanti.FieldType.boolean }), + AddCol({ name: 'importo_iniziale', label_trans: 'account.importo_iniziale', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'saldo', label_trans: 'account.saldo', fieldtype: costanti.FieldType.number }), +] + +export const colTableMovement = [ + AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }), + AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'causal', label_trans: 'movement.causal' }), + AddCol({ name: 'causal_table', label_trans: 'movement.causal_table' }), + AddCol({ name: 'causal_IdRec', label_trans: 'movement.causal_IdRec', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'residual', label_trans: 'movement.residual', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'expiringDate', label_trans: 'movement.expiringDate', fieldtype: costanti.FieldType.date }), + +] + export const fieldsTable = { getrecTableList(mytable: string) { return this.tablesList.find((rec) => rec.value === mytable) @@ -2408,7 +2430,7 @@ export const fieldsTable = { 'myskills', 'mygoods', 'mybachecas', - 'myhosp', + 'myhosps', ], tableRemotePickup: [ @@ -2421,9 +2443,17 @@ export const fieldsTable = { 'myskills', 'mygoods', 'mybachecas', - 'myhosp', + 'myhosps', ], + circuitslist() { + return colTableCircuit + }, + + accountslist() { + return colTableAccount + }, + userlist() { if (static_data.functionality.ENABLE_REG_AYNI) { return colTableUsers diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index efade2ff..6bda29e2 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -3268,7 +3268,7 @@ export const tools = { }, getwidthscale(mythis: any, mywidthpass: string, maxwidth: string): number { - let mywidth = parseInt(mywidthpass) + let mywidth = parseInt(mywidthpass, 10) if (this.isMobile()) { // if (mywidth > this.getwidth(mythis) - 20) mywidth = this.getwidth(mythis, false, false) - 32 @@ -3279,8 +3279,8 @@ export const tools = { // console.log('this.getwidth(mythis) = ', this.getwidth(mythis)) let myw: number = mywidth + ((this.getwidth(mythis, true) - mywidth) * 0.6) // console.log('myw1 = ', myw) - if (myw > parseInt(maxwidth)) - myw = parseInt(maxwidth) + if (myw > parseInt(maxwidth, 10)) + myw = parseInt(maxwidth, 10) if (myw > this.getwidth(mythis) - 24) myw = this.getwidth(mythis) - 24 @@ -3292,7 +3292,7 @@ export const tools = { getheightbywidth(mythis: any, mywidth: string, myheight: string, maxwidth: string) { // console.log('getheightbywidth') const myw = this.getwidthscale(mythis, mywidth, maxwidth) - return myw * (parseInt(myheight) / parseInt(mywidth)) + return myw * (parseInt(myheight, 10) / parseInt(mywidth)) }, isIsoDate(str: string) { @@ -3347,9 +3347,36 @@ export const tools = { else return 'primary' }, - getCookie(mytok: any, def?: any) { + + convstrToNum(myval: any) { + + if (typeof myval == 'number' && !isNaN(myval)) { + if (Number.isInteger(myval)) { + return myval + } else { + // @ts-ignore + return parseFloat(myval) + } + } + }, + + getCookie(mytok: any, def?: any, convertint: any = false) { const ris = Cookies.get(mytok) // console.log('getCookie', mytok, ris) + if (ris === 'null') + return def + + if (ris === '-100') + return -100 + + if (convertint && !!ris) { + return parseInt(ris, 10) + } + + // if (typeof(ris) == 'number') { + // return this.convstrToNum(ris) + // } + if (!!ris) { return ris } else {