This commit is contained in:
Surya Paolo
2024-01-07 16:03:45 +01:00
parent be6ce49698
commit ecd3154dd8
13 changed files with 69 additions and 14 deletions

View File

@@ -115,7 +115,7 @@
<div v-if="site.confpages && site.confpages.showMsgs">
<message-popover></message-popover>
</div>
<div v-if="site.confpages && site.confpages.showCoins">
<div v-if="site.confpages && site.confpages.showCoins || site.confpages.showRIS">
<coinsPopover v-model="rightCoinsOpen"></coinsPopover>
</div>
<div v-if="site.confpages && site.confpages.showNotif">

View File

@@ -233,6 +233,7 @@ export interface IConfPages {
showMsgs: boolean
showNotif: boolean
showCoins: boolean
showRIS: boolean
showMenuCoins: boolean
showNameSurname: boolean
showCompetenze: boolean

View File

@@ -493,6 +493,16 @@
:type="costanti.FieldType.boolean"
>
</CMyFieldDb>
<CMyFieldDb
table="sites"
:title="$t('confpages.showRIS')"
:id="mysite._id"
:rec="mysite"
mykey="confpages"
mysubkey="showRIS"
:type="costanti.FieldType.boolean"
>
</CMyFieldDb>
<CMyFieldDb
table="sites"
:title="$t('confpages.showMenuCoins')"

View File

@@ -1557,7 +1557,8 @@ const msg_it = {
sendNewsletter: 'Menu Invia Newsletter',
showMsgs: 'Messaggi',
showNotif: 'Notifiche',
showCoins: 'RIS',
showCoins: 'Monete',
showRIS: 'RIS',
showMenuCoins: 'Menu Monete',
showNameSurname: 'Mostra Nome e Cognome',
showCompetenze: 'Mostra Competenze',

View File

@@ -1931,7 +1931,7 @@ export const useUserStore = defineStore('UserStore', {
const globalStore = useGlobalStore()
if (globalStore.site && !globalStore.site.confpages.showCoins) {
if (globalStore.site && (!globalStore.site.confpages.showCoins && !globalStore.site.confpages.showRIS)) {
return false
}

View File

@@ -162,6 +162,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
showMsgs: false,
showNotif: false,
showCoins: false,
showRIS: false,
showMenuCoins: false,
showNameSurname: false,
showCompetenze: false,

View File

@@ -38,6 +38,7 @@ export default defineComponent({
props: {},
setup() {
const userStore = useUserStore()
const globalStore = useGlobalStore()
const notifStore = useNotifStore()
const circuitStore = useCircuitStore()
const $route = useRoute()
@@ -550,6 +551,7 @@ export default defineComponent({
aggiornaSaldo,
loadSaldo,
optionsmov,
globalStore,
}
}
})

View File

@@ -316,6 +316,7 @@
v-if="
userStore.my.profile &&
userStore.my.profile.calc.numGoodsAndServices <= 0 &&
globalStore.site.confpages.showRIS &&
userStore.IsMyCircuitByName(circuit.name)
"
rounded
@@ -332,7 +333,10 @@
><br />
</q-banner>
<q-banner
v-else-if="userStore.my.profile.calc.numGoodsAndServices <= 0"
v-else-if="
globalStore.site.confpages.showRIS &&
userStore.my.profile.calc.numGoodsAndServices <= 0
"
rounded
class="bg-deep-purple text-white"
style="text-align: center"