Entra circuito se hai aggiunto bene o servizio

This commit is contained in:
Surya Paolo
2022-12-04 19:50:07 +01:00
parent 0498ba891a
commit 077c2dbd9e
8 changed files with 348 additions and 142 deletions

View File

@@ -1093,6 +1093,7 @@
v-model="newRecordBool" v-model="newRecordBool"
@hide="hidewindow" @hide="hidewindow"
:maximized="$q.screen.lt.sm" :maximized="$q.screen.lt.sm"
permanent
> >
<q-card class="dialog_card"> <q-card class="dialog_card">
<q-bar dense class="bg-primary text-white"> <q-bar dense class="bg-primary text-white">

View File

@@ -12,6 +12,7 @@ import { useQuasar } from 'quasar'
import { useI18n } from '@/boot/i18n' import { useI18n } from '@/boot/i18n'
import { CMyCardPopup } from '@/components/CMyCardPopup' import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CCurrencyValue } from '@/components/CCurrencyValue' import { CCurrencyValue } from '@/components/CCurrencyValue'
import { useRouter } from 'vue-router'
// import { useRouter } from 'vue-router' // import { useRouter } from 'vue-router'
export default defineComponent({ export default defineComponent({
@@ -43,6 +44,8 @@ export default defineComponent({
const showingtooltip = ref(false) const showingtooltip = ref(false)
const $router = useRouter()
watch(() => props.prop_myrec, (newval, oldval) => { watch(() => props.prop_myrec, (newval, oldval) => {
mounted() mounted()
@@ -62,13 +65,17 @@ export default defineComponent({
emit('cmdext', cmd, val1, val2) emit('cmdext', cmd, val1, val2)
} }
function naviga(path: string) {
$router.push(path)
}
onMounted(mounted) onMounted(mounted)
return { return {
t, t,
circuit, circuit,
costanti, costanti,
// naviga, naviga,
setCmd, setCmd,
shared_consts, shared_consts,
userStore, userStore,

View File

@@ -102,6 +102,10 @@
<div> <div>
<div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home"> <div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home">
<q-btn
v-if="site.confpages.enableReg && site.confpages.enableRegByBot"
type="a" rounded size="lg" color="primary" href="/bot" :label="$t('reg.submit')" class="buttreg">
</q-btn>
<q-btn <q-btn
rounded size="lg" color="primary" @click="PagLogin" rounded size="lg" color="primary" @click="PagLogin"
class="btn-start"> class="btn-start">
@@ -174,6 +178,10 @@
<div> <div>
<div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home"> <div v-if="!tools.isLogged()" style="margin: 5px; padding: 5px;" class="home">
<q-btn
v-if="site.confpages.enableReg && site.confpages.enableRegByBot"
type="a" rounded size="lg" color="primary" href="/bot" :label="$t('reg.submit')" class="buttreg">
</q-btn>
<q-btn <q-btn
rounded size="lg" color="primary" @click="PagLogin" rounded size="lg" color="primary" @click="PagLogin"
class="btn-start"> class="btn-start">

View File

@@ -85,8 +85,8 @@ export default defineComponent({
function checkifpolling() { function checkifpolling() {
if (userStore.my.profile) { if (userStore.my.profile) {
if (!tools.isUserOk() && tools.appid() === tools.IDAPP_RISO) //if (!tools.isUserOk() && tools.appid() === tools.IDAPP_RISO)
NUMSEC_TO_POLLING.value = 10 // NUMSEC_TO_POLLING.value = 10
} }
if (eseguipolling.value) { if (eseguipolling.value) {

View File

@@ -218,6 +218,7 @@ const msg_it = {
youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)', youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)',
youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)', youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)',
insertgoodorservices_to_start_circuit: 'Per poter inviare monete è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.', insertgoodorservices_to_start_circuit: 'Per poter inviare monete è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
insertgoodorservices_to_enter_circuit: 'Per poter entrare nel Circuito è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
deletedgroup: 'Gruppo Eliminato', deletedgroup: 'Gruppo Eliminato',
domanda_addtofriend: 'Aggiungere agli amici {username}?', domanda_addtofriend: 'Aggiungere agli amici {username}?',
domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?', domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?',

View File

@@ -3,9 +3,11 @@
<div class="q-gutter-sm q-pa-sm q-pb-md"> <div class="q-gutter-sm q-pa-sm q-pb-md">
<div v-if="!circuit && !loading"> <div v-if="!circuit && !loading">
<div v-if="mystatus === 403"> <div v-if="mystatus === 403">
<h3>Non hai i permessi per accedere al Circuito.<br> <h3>
Non hai i permessi per accedere al Circuito.<br />
Occorre prima registrarsi alla App </h3> Occorre prima registrarsi ed accedere alla App
</h3>
</div> </div>
<div v-else-if="tools.isLogged() && path"> <div v-else-if="tools.isLogged() && path">
<h3>Circuito non Esistente</h3> <h3>Circuito non Esistente</h3>
@@ -14,21 +16,26 @@
<div v-if="!tools.isLogged()"> <div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged> <CCheckIfIsLogged></CCheckIfIsLogged>
</div> </div>
</div> </div>
</div> </div>
<div v-else> <div v-else>
<div v-if="!tools.isLogged()"> <div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged> <CCheckIfIsLogged></CCheckIfIsLogged>
</div> </div>
<div v-if="circuit"> <div v-if="circuit">
<div
<div v-if="circuit.name" class="fit column no-wrap justify-evenly items-center content-start"> v-if="circuit.name"
class="fit column no-wrap justify-evenly items-center content-start"
>
<div class=""> <div class="">
<q-avatar size="140px"> <q-avatar size="140px">
<q-img :src="getImgCircuit()" :alt="circuit.name" img-class="imgprofile" height="140px" @click="showPic = true"/> <q-img
:src="getImgCircuit()"
:alt="circuit.name"
img-class="imgprofile"
height="140px"
@click="showPic = true"
/>
</q-avatar> </q-avatar>
</div> </div>
@@ -40,17 +47,31 @@
v-if="userStore.IsRefusedCircuitByName(circuit.name)" v-if="userStore.IsRefusedCircuitByName(circuit.name)"
rounded rounded
class="bg-red text-white" class="bg-red text-white"
style="text-align: center;" style="text-align: center"
> >
<em style="font-weight: bold">{{ $t('db.youarerefusedcircuit') }}</em><br> <em style="font-weight: bold">{{
$t('db.youarerefusedcircuit')
}}</em
><br />
</q-banner> </q-banner>
<br />
<CSaldo
:symbol="circuit.symbol"
:account="account"
:color="circuit.color"
:saldo="saldo"
:qtarem="account ? qtarem : 0"
>
</CSaldo>
<div>
<q-banner <q-banner
v-if="userStore.my.profile.calc.numGoodsAndServices <= 0" v-if="userStore.my.profile.calc.numGoodsAndServices <= 0 &&
userStore.IsMyCircuitByName(circuit.name)"
rounded rounded
class="bg-orange text-white" class="bg-orange text-white"
style="text-align: center;" style="text-align: center"
> >
<template v-slot:avatar> <template v-slot:avatar>
<q-icon <q-icon
@@ -60,75 +81,154 @@
/> />
</template> </template>
<em style="font-weight: bold">{{ $t('db.insertgoodorservices_to_start_circuit') }}</em><br> <em style="font-weight: bold">{{
$t('db.insertgoodorservices_to_start_circuit')
}}</em
><br />
</q-banner>
<q-banner
v-else-if="userStore.my.profile.calc.numGoodsAndServices <= 0"
rounded
class="bg-orange text-white"
style="text-align: center"
>
<template v-slot:avatar>
<q-icon
name="fas fa-exclamation-triangle"
color="yellow"
size="xs"
/>
</template>
<em style="font-weight: bold">{{
$t('db.insertgoodorservices_to_enter_circuit')
}}</em
><br />
</q-banner> </q-banner>
<br>
<CSaldo
:symbol="circuit.symbol"
:account="account"
:color="circuit.color"
:saldo="saldo"
:qtarem="account ? qtarem : 0">
</CSaldo>
<div>
<q-btn <q-btn
v-if="!userStore.IsMyCircuitByName(circuit.name) && !userStore.IsAskedCircuitByName(circuit.name) && !userStore.IsRefusedCircuitByName(circuit.name)" v-if="userStore.my.profile.calc.numGoodsAndServices > 0 &&
!userStore.IsMyCircuitByName(circuit.name) &&
!userStore.IsAskedCircuitByName(circuit.name) &&
!userStore.IsRefusedCircuitByName(circuit.name)
"
icon="fas fa-user-plus" icon="fas fa-user-plus"
color="primary" :label="$t('circuit.ask')" color="primary"
:label="$t('circuit.ask')"
@click="requestToEnterCircuit = true" @click="requestToEnterCircuit = true"
/> />
<q-btn <q-btn
v-if="userStore.IsMyCircuitByName(circuit.name)" v-if="userStore.IsMyCircuitByName(circuit.name)"
rounded icon="fas fa-ellipsis-h"> rounded
icon="fas fa-ellipsis-h"
>
<q-menu> <q-menu>
<q-list v-if="true" style="min-width: 150px"> <q-list v-if="true" style="min-width: 150px">
<q-item clickable v-close-popup <q-item
clickable
v-close-popup
v-if="saldo === 0" v-if="saldo === 0"
@click="tools.removeFromMyCircuits($q, userStore.my.username, circuit.name, $t('circuit.domanda_exit_fromcircuit', {circuitname: circuit.name }))"> @click="
tools.removeFromMyCircuits(
$q,
userStore.my.username,
circuit.name,
$t('circuit.domanda_exit_fromcircuit', {
circuitname: circuit.name,
})
)
"
>
<q-item-section avatar> <q-item-section avatar>
<q-icon color="negative" name="fas fa-user-minus" /> <q-icon color="negative" name="fas fa-user-minus" />
</q-item-section> </q-item-section>
<q-item-section>{{ $t('circuit.exit_circuit') }}</q-item-section> <q-item-section>{{
$t('circuit.exit_circuit')
}}</q-item-section>
</q-item> </q-item>
<q-list v-if="tools.iAmAdminCircuit(circuit.name)" style="min-width: 200px"> <q-list
<q-item clickable v-close-popup @click="tools.setCmd($q, shared_consts.CIRCUITCMD.DELETE, userStore.my.username, '', circuit.name)"> v-if="tools.iAmAdminCircuit(circuit.name)"
style="min-width: 200px"
>
<q-item
clickable
v-close-popup
@click="
tools.setCmd(
$q,
shared_consts.CIRCUITCMD.DELETE,
userStore.my.username,
'',
circuit.name
)
"
>
<q-item-section avatar> <q-item-section avatar>
<q-icon color="negative" name="fas fa-trash-alt" /> <q-icon color="negative" name="fas fa-trash-alt" />
</q-item-section> </q-item-section>
<q-item-section>{{ $t('circuit.delete') }}</q-item-section> <q-item-section>{{
$t('circuit.delete')
}}</q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-list> </q-list>
</q-menu> </q-menu>
</q-btn> </q-btn>
<q-btn <q-btn
v-if="userStore.IsAskedCircuitByName(circuit.name) && !userStore.IsMyCircuitByName(circuit.name)" v-if="
userStore.IsAskedCircuitByName(circuit.name) &&
!userStore.IsMyCircuitByName(circuit.name)
"
icon="fas fa-user-minus" icon="fas fa-user-minus"
flat :label="$t('shared.cancel_ask_short')" flat
@click="tools.cancelReqCircuit($q, userStore.my.username, circuit.name)" :label="$t('shared.cancel_ask_short')"
@click="
tools.cancelReqCircuit($q, userStore.my.username, circuit.name)
"
/> />
</div> </div>
</div> </div>
<div v-if="circuit.name" class="no-wrap justify-evenly items-center content-start"> <div
v-if="circuit.name"
class="no-wrap justify-evenly items-center content-start"
>
<q-tabs v-model="tabgrp" class="text-blue"> <q-tabs v-model="tabgrp" class="text-blue">
<q-tab :label="t('shared.info1')" name="info" icon="fas fa-info"></q-tab> <q-tab
<q-tab v-if="tools.iCanShowCircuitsMember(circuit) || tools.iAmAdminCircuit(circuit.name)" :label="t('shared.info1')"
:label="t('shared.subscribes')" name="members" icon="fas fa-users"></q-tab> name="info"
<q-tab v-if="userStore.IsMyCircuitByName(circuit.name)" :label="t('circuit.movements')" name="mov" icon="fas fa-coins"></q-tab> icon="fas fa-info"
<q-tab v-if="!!circuit.note" :label="t('circuit.page')" name="page" icon="fas fa-file-word"></q-tab> ></q-tab>
<q-tab
v-if="
tools.iCanShowCircuitsMember(circuit) ||
tools.iAmAdminCircuit(circuit.name)
"
:label="t('shared.subscribes')"
name="members"
icon="fas fa-users"
></q-tab>
<q-tab
v-if="userStore.IsMyCircuitByName(circuit.name)"
:label="t('circuit.movements')"
name="mov"
icon="fas fa-coins"
></q-tab>
<q-tab
v-if="!!circuit.note"
:label="t('circuit.page')"
name="page"
icon="fas fa-file-word"
></q-tab>
</q-tabs> </q-tabs>
<q-tab-panels v-model="tabgrp" animated> <q-tab-panels v-model="tabgrp" animated>
<q-tab-panel name="mov"> <q-tab-panel name="mov">
<q-toggle
<q-toggle v-model="showonlymine" :label="t('movement.onlymymov')"></q-toggle> v-model="showonlymine"
:label="t('movement.onlymymov')"
></q-toggle>
<q-toggle v-model="tabellare" label="Tabella"></q-toggle> <q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec <CGridTableRec
@@ -154,7 +254,13 @@
filterextra="" filterextra=""
:filterextra2="filterextra2" :filterextra2="filterextra2"
:prop_searchList="searchList" :prop_searchList="searchList"
:prop_pagination="{ sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }" :prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS" :showType="costanti.SHOW_MOVEMENTS"
keyMain="" keyMain=""
:showCol="true" :showCol="true"
@@ -163,7 +269,6 @@
extrafield="" extrafield=""
:visufind="costanti.FRIENDS" :visufind="costanti.FRIENDS"
> >
</CGridTableRec> </CGridTableRec>
<CGridTableRec <CGridTableRec
v-else-if="!loading" v-else-if="!loading"
@@ -186,7 +291,13 @@
:arrfilters="arrfilterand" :arrfilters="arrfilterand"
:filtercustom="filtercustom_rich" :filtercustom="filtercustom_rich"
:prop_searchList="searchList" :prop_searchList="searchList"
:prop_pagination="{ sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 20, rowsPerPage: 20 }" :prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS" :showType="costanti.SHOW_MOVEMENTS"
keyMain="" keyMain=""
:showCol="false" :showCol="false"
@@ -195,9 +306,7 @@
extrafield="" extrafield=""
:visufind="costanti.FRIENDS" :visufind="costanti.FRIENDS"
> >
</CGridTableRec> </CGridTableRec>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="info"> <q-tab-panel name="info">
<div> <div>
@@ -218,8 +327,18 @@
}) })
}} }}
</div> </div>
<div v-if="!!circuit.date_updated && tools.getstrDate(circuit.date_updated) !== tools.getstrDate(circuit.date_created)" class="container"> <div
<q-icon name="fas fa-pencil-alt" class="iconcirc"></q-icon> v-if="
!!circuit.date_updated &&
tools.getstrDate(circuit.date_updated) !==
tools.getstrDate(circuit.date_created)
"
class="container"
>
<q-icon
name="fas fa-pencil-alt"
class="iconcirc"
></q-icon>
<span class="element">{{ <span class="element">{{
$t('shared.lastmodify', { $t('shared.lastmodify', {
date: tools.getstrDateYY(circuit.date_updated), date: tools.getstrDateYY(circuit.date_updated),
@@ -229,11 +348,21 @@
<div class="container"> <div class="container">
<q-icon name="fas fa-users" class="iconcirc"></q-icon> <q-icon name="fas fa-users" class="iconcirc"></q-icon>
<span class="element">{{ numUsers() }}</span> {{ numUsers() === 1 ? t('shared.member') : t('shared.members') }} <span class="element">{{ numUsers() }}</span>
{{
numUsers() === 1
? t('shared.member')
: t('shared.members')
}}
</div> </div>
<div class="container"> <div class="container">
<q-icon name="fas fa-user-cog" class="iconcirc"></q-icon> <q-icon name="fas fa-user-cog" class="iconcirc"></q-icon>
<span class="element">{{ numAdmins() }}</span> {{ numAdmins() === 1 ? t('shared.admin') : t('shared.admins') }} <span class="element">{{ numAdmins() }}</span>
{{
numAdmins() === 1
? t('shared.admin')
: t('shared.admins')
}}
</div> </div>
<div v-for="(user, index) of circuit.admins" :key="index"> <div v-for="(user, index) of circuit.admins" :key="index">
<CMyUser <CMyUser
@@ -247,8 +376,14 @@
<q-icon name="fas fa-coins" class="iconcirc"></q-icon> <q-icon name="fas fa-coins" class="iconcirc"></q-icon>
{{ t('circuit.symbol') }}: {{ t('circuit.symbol') }}:
<span class="text-h5"> <span class="text-h5">
<em class="q-px-sm text-black rounded-borders" <em
:style="`background-color: ` + tools.getColorByCircuit(circuit)">{{ tools.getSymbolByCircuit(circuit) }}</em> class="q-px-sm text-black rounded-borders"
:style="
`background-color: ` +
tools.getColorByCircuit(circuit)
"
>{{ tools.getSymbolByCircuit(circuit) }}</em
>
</span> </span>
</div> </div>
<div :class="$q.screen.lt.sm ? '' : 'row'"> <div :class="$q.screen.lt.sm ? '' : 'row'">
@@ -279,7 +414,7 @@
</div> </div>
<div class="sezioni"> <div class="sezioni">
<q-icon name="fas fa-stats" class="iconcirc"></q-icon> <q-icon name="fas fa-stats" class="iconcirc"></q-icon>
{{ t('circuit.stats') }}:<br> {{ t('circuit.stats') }}:<br />
</div> </div>
<div :class="$q.screen.lt.sm ? '' : 'row'"> <div :class="$q.screen.lt.sm ? '' : 'row'">
<div v-if="circuit.totTransato" class="sezioni"> <div v-if="circuit.totTransato" class="sezioni">
@@ -309,17 +444,36 @@
</div> </div>
<div class="sezioni"> <div class="sezioni">
<q-icon name="fas fa-toggle-on" class="iconcirc"></q-icon> <q-icon name="fas fa-toggle-on" class="iconcirc"></q-icon>
{{ t('circuit.transactionsEnabled') }}: <span class="text-section">{{ circuit.transactionsEnabled ? t('dialog.yes') : t('dialog.no') }} {{ }}</span> {{ t('circuit.transactionsEnabled') }}:
<span class="text-section"
>{{
circuit.transactionsEnabled
? t('dialog.yes')
: t('dialog.no')
}}
{{
}}</span>
</div> </div>
<div class="sezioni" v-if="circuit.deperimento !== undefined"> <div
<q-icon name="fas fa-battery-full" class="iconcirc"></q-icon> class="sezioni"
{{ t('circuit.deperimento') }}: <span class="text-section">{{ circuit.deperimento ? t('dialog.yes') : t('dialog.no') }} {{ }}</span> v-if="circuit.deperimento !== undefined"
>
<q-icon
name="fas fa-battery-full"
class="iconcirc"
></q-icon>
{{ t('circuit.deperimento') }}:
<span class="text-section"
>{{
circuit.deperimento ? t('dialog.yes') : t('dialog.no')
}}
{{
}}</span>
</div> </div>
</q-card-section> </q-card-section>
</q-card> </q-card>
<br> <br />
</div> </div>
<q-card v-if="circuit.name"> <q-card v-if="circuit.name">
<q-card-section> <q-card-section>
@@ -329,7 +483,10 @@
<q-card-section> <q-card-section>
<div class="col-12 text-h7"> <div class="col-12 text-h7">
<span v-if="checkifShow('descr')" v-html="circuit.longdescr"></span> <span
v-if="checkifShow('descr')"
v-html="circuit.longdescr"
></span>
</div> </div>
</q-card-section> </q-card-section>
</q-card> </q-card>
@@ -342,36 +499,51 @@
<q-card-section> <q-card-section>
<div class="col-12 text-h7"> <div class="col-12 text-h7">
<span v-if="checkifShow('descr')" v-html="circuit.regulation"></span> <span
v-if="checkifShow('descr')"
v-html="circuit.regulation"
></span>
</div> </div>
</q-card-section> </q-card-section>
</q-card> </q-card>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="page"> <q-tab-panel name="page">
<div v-if="circuit.note"> <div v-if="circuit.note">
<br> <br />
<div class="q-ma-sm q-gutter-sm q-pa-xs"> <div class="q-ma-sm q-gutter-sm q-pa-xs">
<div v-if="circuit.note" v-html="circuit.note"> <div v-if="circuit.note" v-html="circuit.note"></div>
</div>
</div> </div>
</div> </div>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="members" style="max-width: 500px;" v-if="tools.iCanShowCircuitsMember(circuit)"> <q-tab-panel
name="members"
style="max-width: 500px"
v-if="tools.iCanShowCircuitsMember(circuit)"
>
<q-tabs <q-tabs
v-show="tools.iAmAdminCircuit(circuit.name)" v-show="tools.iAmAdminCircuit(circuit.name)"
v-model="tabmembers" class="text-blue"> v-model="tabmembers"
class="text-blue"
>
<q-tab label="Iscritti" name="all" icon="fas fa-users"></q-tab> <q-tab label="Iscritti" name="all" icon="fas fa-users"></q-tab>
<q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab> <q-tab
<q-tab v-if="tools.iAmAdminCircuit(circuit.name)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab> v-if="tools.iAmAdminCircuit(circuit.name)"
label="Richieste"
name="rich"
icon="fas fa-user-plus"
></q-tab>
<q-tab
v-if="tools.iAmAdminCircuit(circuit.name)"
label="Rifiutati"
name="refused"
icon="fas fa-user-minus"
></q-tab>
</q-tabs> </q-tabs>
<q-tab-panels v-model="tabmembers" animated> <q-tab-panels v-model="tabmembers" animated>
<q-tab-panel name="all"> <q-tab-panel name="all">
<!--<q-toggle v-model="showsaldi" :label="t('movement.showsaldi')"></q-toggle>--> <!--<q-toggle v-model="showsaldi" :label="t('movement.showsaldi')"></q-toggle>-->
<CGridTableRec <CGridTableRec
@@ -379,7 +551,9 @@
ref="tabMembri" ref="tabMembri"
prop_mytable="users" prop_mytable="users"
prop_mytitle="" prop_mytitle=""
:prop_mycolumns="showsaldi ? colmyUserPeopleSaldi : colmyUserPeople" :prop_mycolumns="
showsaldi ? colmyUserPeopleSaldi : colmyUserPeople
"
prop_colkey="_id" prop_colkey="_id"
col_title="username" col_title="username"
:vertical="costanti.VISUTABLE_LISTA" :vertical="costanti.VISUTABLE_LISTA"
@@ -401,13 +575,15 @@
:showCol="false" :showCol="false"
:circuitname="circuit.name" :circuitname="circuit.name"
:extraparams="extraparams()" :extraparams="extraparams()"
:visufind="tools.iAmAdminCircuit(circuit.name) ? costanti.REQ_REMOVE_USER_TO_CIRCUIT : costanti.FIND_PEOPLE" :visufind="
tools.iAmAdminCircuit(circuit.name)
? costanti.REQ_REMOVE_USER_TO_CIRCUIT
: costanti.FIND_PEOPLE
"
> >
</CGridTableRec> </CGridTableRec>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="rich"> <q-tab-panel name="rich">
<CGridTableRec <CGridTableRec
v-if="!loading" v-if="!loading"
prop_mytable="circuits" prop_mytable="circuits"
@@ -437,11 +613,9 @@
:circuitname="circuit.name" :circuitname="circuit.name"
:visufind="costanti.REQ_ADD_USER_TO_CIRCUIT" :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
> >
</CGridTableRec> </CGridTableRec>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="refused"> <q-tab-panel name="refused">
<CGridTableRec <CGridTableRec
prop_mytable="circuits" prop_mytable="circuits"
prop_mytitle="" prop_mytitle=""
@@ -470,20 +644,23 @@
:circuitname="circuit.name" :circuitname="circuit.name"
:visufind="costanti.REQ_ADD_USER_TO_CIRCUIT" :visufind="costanti.REQ_ADD_USER_TO_CIRCUIT"
> >
</CGridTableRec> </CGridTableRec>
</q-tab-panel> </q-tab-panel>
</q-tab-panels> </q-tab-panels>
</q-tab-panel>
<q-tab-panel name="mov">
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="mov"> </q-tab-panel>
</q-tab-panels> </q-tab-panels>
</div> </div>
<div v-else class="fit column no-wrap justify-evenly items-center content-start"> <div
<q-skeleton type="QAvatar" size="140px" height="140px" animation="fade"/> v-else
class="fit column no-wrap justify-evenly items-center content-start"
>
<q-skeleton
type="QAvatar"
size="140px"
height="140px"
animation="fade"
/>
<q-card flat bordered style="width: 250px"> <q-card flat bordered style="width: 250px">
<div class="text-h6"> <div class="text-h6">
<q-skeleton :animation="animation" /> <q-skeleton :animation="animation" />
@@ -503,19 +680,17 @@
</div> </div>
</q-card> </q-card>
</div> </div>
</div> </div>
<q-dialog <q-dialog v-model="showPic" full-height full-width>
v-model="showPic" <img :src="getImgCircuit()" :alt="circuit.name" class="full-width" />
full-height full-width
>
<img :src="getImgCircuit()" :alt="circuit.name" class="full-width">
</q-dialog> </q-dialog>
<q-dialog v-model="requestToEnterCircuit" maximized transition-show="slide-up" <q-dialog
transition-hide="slide-down"> v-model="requestToEnterCircuit"
maximized
transition-show="slide-up"
transition-hide="slide-down"
>
<q-card v-if="circuit" class="dialog_card"> <q-card v-if="circuit" class="dialog_card">
<q-toolbar class="bg-primary text-white" dense> <q-toolbar class="bg-primary text-white" dense>
<!--<q-toolbar :class="tools.displayClasses(myevent)"--> <!--<q-toolbar :class="tools.displayClasses(myevent)"-->
@@ -529,42 +704,51 @@
<q-banner <q-banner
rounded rounded
class="bg-green text-white" class="bg-green text-white"
style="text-align: center;" style="text-align: center"
> >
<em style="font-weight: bold">Disclaimer:</em><br> <em style="font-weight: bold">Disclaimer:</em><br />
</q-banner> </q-banner>
<div v-html="t('circuit.disclaimer')"> <div v-html="t('circuit.disclaimer')"></div>
</div>
</q-card-section> </q-card-section>
<q-card-section class="inset-shadow"> <q-card-section class="inset-shadow">
<q-banner <q-banner
rounded rounded
class="bg-green text-white" class="bg-green text-white"
style="text-align: center;" style="text-align: center"
> >
<em style="font-weight: bold">Regolamento interno:</em><br> <em style="font-weight: bold">Regolamento interno:</em><br />
</q-banner> </q-banner>
<div v-html="circuit.regulation"> <div v-html="circuit.regulation"></div>
</div>
</q-card-section> </q-card-section>
<q-card-actions align="center"> <q-card-actions align="center">
<q-btn <q-btn
class="centeritems" class="centeritems"
icon="fas fa-user-plus" icon="fas fa-user-plus"
color="positive" :label="$t('circuit.acceptregulation')" color="positive"
@click="requestToEnterCircuit = false; tools.setRequestCircuit($q, userStore.my.username, circuit.name, true)" :label="$t('circuit.acceptregulation')"
@click="
requestToEnterCircuit = false;
tools.setRequestCircuit(
$q,
userStore.my.username,
circuit.name,
true
);
"
/> />
<q-btn flat round color="negative" <q-btn
flat
round
color="negative"
:label="$t('friends.refuse')" :label="$t('friends.refuse')"
icon="close" v-close-popup></q-btn> icon="close"
v-close-popup
></q-btn>
</q-card-actions> </q-card-actions>
</q-card> </q-card>
</q-dialog> </q-dialog>
</div> </div>
</div> </div>
</template> </template>
<script lang="ts" src="./mycircuit.ts"> <script lang="ts" src="./mycircuit.ts">

View File

@@ -12,6 +12,7 @@ import { CNotifAtTop } from '@src/components/CNotifAtTop'
import { CSendCoins } from '@/components/CSendCoins' import { CSendCoins } from '@/components/CSendCoins'
import { CMyUser } from '@/components/CMyUser' import { CMyUser } from '@/components/CMyUser'
import { CUserNonVerif } from '@/components/CUserNonVerif' import { CUserNonVerif } from '@/components/CUserNonVerif'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { tools } from '@store/Modules/tools' import { tools } from '@store/Modules/tools'
import { computed, defineComponent, onMounted, ref, watch } from 'vue' import { computed, defineComponent, onMounted, ref, watch } from 'vue'
import { useUserStore } from '@store/UserStore' import { useUserStore } from '@store/UserStore'
@@ -33,7 +34,8 @@ export default defineComponent({
name: 'myprofile', name: 'myprofile',
components: { components: {
CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CMyUser, CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CMyUser,
CMyGroup, CLabel, CMyCircuit, CSendCoins, CNotifAtTop CMyGroup, CLabel, CMyCircuit, CSendCoins, CNotifAtTop,
CCheckIfIsLogged
}, },
props: {}, props: {},
setup() { setup() {

View File

@@ -1,4 +1,7 @@
<template> <template>
<div v-if="!tools.isLogged()">
<CCheckIfIsLogged></CCheckIfIsLogged>
</div>
<div v-if="!caricato" class="fit column no-wrap justify-evenly items-center content-start"> <div v-if="!caricato" class="fit column no-wrap justify-evenly items-center content-start">
<q-skeleton type="QAvatar" size="140px" height="140px" animation="fade"/> <q-skeleton type="QAvatar" size="140px" height="140px" animation="fade"/>
<q-card flat bordered style="width: 250px"> <q-card flat bordered style="width: 250px">