diff --git a/.env.development b/.env.development index 7413cafb..07a0ec9e 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 97b9b3d0..6aeb4c52 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 2fb1ed9e..01868c3b 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 1bf69bc3..ff55c988 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index aaf8256f..4a78b5bf 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 6a368852..18f157d3 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 7ec76fb5..18af4aec 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index 5ba21319..93a12b7b 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.13" +APP_VERSION="0.5.15" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index a42b9604..794c9733 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -1086,6 +1086,7 @@ export default defineComponent({ nome_valuta: 1, fido_scoperto_default: 1, qta_max_default: 1, + valuta_per_euro: 1, symbol: 1, idCity: 1, pub_to_share: 1, diff --git a/src/components/CGallery/CGallery.ts b/src/components/CGallery/CGallery.ts index 4c69f250..1b17f742 100755 --- a/src/components/CGallery/CGallery.ts +++ b/src/components/CGallery/CGallery.ts @@ -355,6 +355,7 @@ export default defineComponent({ function onRejected (rejectedEntries: any) { // Notify plugin needs to be installed // https://quasar.dev/quasar-plugins/notify#Installation + console.log('rejectedEntries', rejectedEntries) $q.notify({ type: 'negative', message: 'La Dimensione massima dell\'immagine è di 2 MB' diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts index 2549c031..5d7bb2a5 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.ts +++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts @@ -669,31 +669,37 @@ export default defineComponent({ } function getDirectoryGall() { - let ris = '' - let username = myrow.value.hasOwnProperty('username') ? myrow.value['username'] : '' - let userId = myrow.value.hasOwnProperty('userId') ? myrow.value['userId'] : '' + console.log('getDirectoryGall', myrow.value) - if (username === '') { - if (userId === userStore.my._id) + let ris = '' + try { + let username = myrow.value.hasOwnProperty('username') ? myrow.value['username'] : '' + let userId = myrow.value.hasOwnProperty('userId') ? myrow.value['userId'] : '' + + if (username === '') { + if (userId === userStore.my._id) + username = userStore.my.username + } + if (username === '') { username = userStore.my.username - } - if (username === '') { - username = userStore.my.username - } - if (fieldsTable.tableForUsers.includes(props.table)) { - ris = 'profile/' + username + '/' + props.table - } else if (props.table === 'users') { - ris = 'profile/' + userStore.my.username - } else if (props.table === 'mygroups') { - if (myrow.value.hasOwnProperty('groupname')) - ris = 'mygroups/' + myrow.value['groupname'] - } else if (props.table === 'circuits') { - if (myrow.value.hasOwnProperty('path')) - ris = 'circuits/' + myrow.value['path'] - } else if (!!myrow.value && !!myrow.value.directory) { - ris = myrow.value.directory - } else { - ris = props.table + } + if (fieldsTable.tableForUsers.includes(props.table)) { + ris = 'profile/' + username + '/' + props.table + } else if (props.table === 'users') { + ris = 'profile/' + userStore.my.username + } else if (props.table === 'mygroups') { + if (myrow.value.hasOwnProperty('groupname')) + ris = 'mygroups/' + myrow.value['groupname'] + } else if (props.table === 'circuits') { + if (myrow.value.hasOwnProperty('path')) + ris = 'circuits/' + myrow.value['path'] + } else if (!!myrow.value && !!myrow.value.directory) { + ris = myrow.value.directory + } else { + ris = props.table + } + } catch (e) { + console.error('err getDirectoryGall', e) } console.log('getDirectoryGall', ris) return ris diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 0be4809b..5ad83b67 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -2592,6 +2592,7 @@ export const colTableCircuit = [ fieldtype: costanti.FieldType.currency, required: true, visulabel: true }), AddCol({ name: 'qta_max_default', label_trans: 'circuit.qta_max_default', fieldtype: costanti.FieldType.currency, required: true, visulabel: true }), + AddCol({ name: 'valuta_per_euro', label_trans: 'circuit.valuta_per_euro', fieldtype: costanti.FieldType.number }), AddCol({ name: 'totCircolante', label_trans: 'circuit.totCircolante', fieldtype: costanti.FieldType.currency, visulabel: true, showWhen: costanti.showWhen.InPage + costanti.showWhen.InView, diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 96f2d889..3776e2cb 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -3500,7 +3500,7 @@ export const tools = { return tools.getServerHost() + `/uploadnew/${this.getvers()}/` }, escapeslash(mystr: string) { - return mystr.replace(/\//g, '-') + return mystr.replace(/\//g, 'Ç') }, geturlrelativeprofile() { return costanti.DIR_UPLOAD + 'profile' @@ -5901,6 +5901,7 @@ export const tools = { symbol: 'RIS', fido_scoperto_default: 100, qta_max_default: 500, + valuta_per_euro: 1, totTransato: 0, totCircolante: 0, }