- Non funziona l'ammetti il nuovo registrato, sulla App.

- All'interno di una Organizzazione, mostrare se non si è ancora entrati in un Circuito, mettere bottone per Entrare.
This commit is contained in:
Surya Paolo
2025-07-08 10:24:58 +02:00
parent ee5ac4e554
commit 7f5ff3da64
64 changed files with 1818 additions and 3593424 deletions

View File

@@ -28,7 +28,7 @@
<div class="">
<q-avatar size="140px">
<q-img
:src="myuser.profile ? getImgUser(myuser.profile) : ''"
:src="myuser.profile ? getImgUser() : ''"
:alt="username"
img-class="imgprofile"
height="140px"
@@ -142,6 +142,7 @@
:visu="costanti.USER_CIRCUITS"
:noaut="true"
:username="myuser.username"
:myuser="myuser"
>
</CMyCircuit>
</span>

View File

@@ -16,6 +16,7 @@ import { CSaldo } from '@src/components/CSaldo'
import { CTitleBanner } from '@src/components/CTitleBanner'
import { toolsext } from '@store/Modules/toolsext'
import { useGlobalStore } from '@store/globalStore'
import { userPanel } from 'app/src/rootgen/admin/userPanel';
export default defineComponent({
name: 'CMyCircuit',
@@ -50,6 +51,11 @@ export default defineComponent({
type: String,
required: false,
default: '',
},
myuser: {
type: Object as PropType<IUserFields | null>,
required: false,
default: null,
}
},
@@ -71,6 +77,8 @@ export default defineComponent({
const saldo_pend = computed(() => account.value ? account.value.saldo_pend : 0)
const saldo = computed(() => account.value ? account.value.saldo : 0)
const fidoConcessoUtente = computed(() => circuitStore.getFidoConcessoByUsername(props.myuser, circuit.value._id, props.username))
const table = ref(shared_consts.TABLES_CIRCUITS)
const showingtooltip = ref(false)
@@ -167,6 +175,7 @@ export default defineComponent({
showrules,
requestToEnterCircuit,
groupnameSel,
fidoConcessoUtente,
}
},
})

View File

@@ -24,14 +24,19 @@
</q-avatar>
<div :class="`q-ma-xs q-px-xs shadow-2 rounded-borders `">
<span
:class="
`q-ma-sm ` + ($q.dark.isActive ? `text-white` : `text-black`)
"
:class="`q-ma-sm ` + ($q.dark.isActive ? `text-white` : `text-black`)"
>{{ circuit.numMembers }}</span
>
<q-icon name="fas fa-users" size="xs" color="blue"></q-icon>
<q-icon
name="fas fa-users"
size="xs"
color="blue"
></q-icon>
</div>
<div v-if="circuit.link_group" :class="` `">
<div
v-if="circuit.link_group"
:class="` `"
>
<q-btn
icon="fab fa-telegram"
size="xs"
@@ -57,7 +62,10 @@
lines="3"
><em>{{ circuit.longdescr }}</em>
</q-item-label>-->
<q-item-label v-if="visu === costanti.ENTER_TO_THE_CIRCUIT" caption>
<q-item-label
v-if="visu === costanti.ENTER_TO_THE_CIRCUIT"
caption
>
<span>Membri: {{ circuit.numMembers }}</span>
</q-item-label>
<!--<q-item-label caption lines="3">
@@ -101,8 +109,7 @@
<q-item-label
v-if="
!circuit.transactionsEnabled &&
circuit.status ===
shared_consts.CIRCUIT_STATUS.FASE3_MONETA_ABILITATA
circuit.status === shared_consts.CIRCUIT_STATUS.FASE3_MONETA_ABILITATA
"
caption
lines="1"
@@ -145,11 +152,13 @@
inline-actions
class="bg-blue text-white"
>
<span
v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"
></span>
<span v-html="$t('circuit.entra_italia_solo_dopo_aver_fido')"></span>
</q-banner>
<q-banner v-else inline-actions class="bg-blue text-white">
<q-banner
v-else
inline-actions
class="bg-blue text-white"
>
<span v-html="$t('circuit.non_entrato')"></span>
<template v-slot:action>
<q-btn
@@ -160,9 +169,7 @@
"
color="positive"
:label="
circuit.askManagerToEnter
? $t('circuit.ask')
: $t('circuit.apri')
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.apri')
"
@click="
requestToEnterCircuit = true;
@@ -179,6 +186,8 @@
side
v-if="visu === costanti.USER_CIRCUITS && tools.isUserOk()"
>
fidoConcessoUtente: {{ fidoConcessoUtente }}
myuser: {{ myuser }}
<q-item-label>
<q-btn
rounded
@@ -211,9 +220,7 @@
"
>
<q-item-section>{{
circuit.askManagerToEnter
? $t('circuit.ask')
: $t('circuit.enter')
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')
}}</q-item-section>
</q-item>
</q-list>
@@ -262,8 +269,7 @@
</q-list>
<q-list
v-else-if="
userStore.IsMyCircuitByName(circuit.name) &&
(saldo === 0 || !saldo)
userStore.IsMyCircuitByName(circuit.name) && (saldo === 0 || !saldo)
"
style="min-width: 200px"
>
@@ -283,7 +289,10 @@
<q-item-section>{{ $t('circuit.exit') }}</q-item-section>
</q-item>
</q-list>
<q-list v-if="userStore.isAdmin" style="min-width: 200px">
<q-list
v-if="userStore.isAdmin"
style="min-width: 200px"
>
<q-item
clickable
v-close-popup
@@ -302,6 +311,16 @@
</q-list>
</q-menu>
</q-btn>
<q-btn
v-if="fidoConcessoUtente !== ''"
icon="fas fa-house-user"
class="q-ml-sm"
:color="Number(fidoConcessoUtente) > 0 ? 'primary' : 'grey'"
text-color="white"
round
size="sm"
>
</q-btn>
</q-item-label>
</q-item-section>
<q-item-section
@@ -309,7 +328,10 @@
v-if="visu === costanti.REQ_CIRCUIT && tools.isUserOk()"
>
<q-item-label>
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -341,7 +363,10 @@
v-if="visu === costanti.ASK_SENT_CIRCUIT && tools.isUserOk()"
>
<q-item-label>
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -401,9 +426,7 @@
"
icon="fas fa-user-plus"
color="primary"
:label="
circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')
"
:label="circuit.askManagerToEnter ? $t('circuit.ask') : $t('circuit.enter')"
rounded
@click="
requestToEnterCircuit = true;
@@ -416,19 +439,21 @@
icon="fas fa-ellipsis-h"
>
<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
v-if="true"
@click="
(saldo < 0)
saldo < 0
? tools.showNegativeNotif(
$q,
t(
'circuit.per_uscire_dal_circuito_occorre_essere_a_zero',
{ symbol: circuit.symbol }
),
t('circuit.per_uscire_dal_circuito_occorre_essere_a_zero', {
symbol: circuit.symbol,
}),
30000
)
: tools.removeFromMyCircuits(
@@ -443,14 +468,20 @@
"
>
<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>
{{ $t('circuit.exit_circuit') }}
</q-item-section>
</q-item>
<q-list v-if="userStore.isAdmin" style="min-width: 200px">
<q-list
v-if="userStore.isAdmin"
style="min-width: 200px"
>
<q-item
clickable
v-close-popup
@@ -465,7 +496,10 @@
"
>
<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>{{ $t('circuit.delete') }}</q-item-section>
</q-item>
@@ -483,9 +517,7 @@
flat
outline
:label="$t('shared.cancel_ask_short')"
@click="
tools.cancelReqCircuit($q, userStore.my.username, circuit.name)
"
@click="tools.cancelReqCircuit($q, userStore.my.username, circuit.name)"
/>
</div>
</div>
@@ -495,17 +527,32 @@
transition-show="slide-up"
transition-hide="slide-down"
>
<q-card v-if="circuit" class="dialog_card">
<q-toolbar class="bg-primary text-white" dense>
<q-card
v-if="circuit"
class="dialog_card"
>
<q-toolbar
class="bg-primary text-white"
dense
>
<!--<q-toolbar :class="tools.displayClasses(myevent)"-->
<!--:style="tools.displayStyles(myevent) + ` min-width: `+ tools.myheight_dialog() + `px;`">-->
<q-toolbar-title>
{{ circuit.name }}
<div v-if="groupnameSel">Gruppo: {{ groupnameSel.groupname }}</div>
</q-toolbar-title>
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
<q-btn
flat
round
color="white"
icon="close"
v-close-popup
></q-btn>
</q-toolbar>
<q-card-section v-if="circuit.symbol === 'RIS'" class="inset-shadow">
<q-card-section
v-if="circuit.symbol === 'RIS'"
class="inset-shadow"
>
<div v-html="t('circuit.disclaimer')"></div>
</q-card-section>
<q-card-section class="inset-shadow">
@@ -551,8 +598,7 @@
</div>
</template>
<script lang="ts" src="./CMyCircuit.ts">
</script>
<script lang="ts" src="./CMyCircuit.ts"></script>
<style lang="scss" scoped>
@import './CMyCircuit.scss';

View File

@@ -221,7 +221,7 @@ export default defineComponent({
listTrusted.value = listTrusted.value.filter((rec: IUserFields) => rec.username !== usernameDest)
}
}
tools.showPositiveNotif($q, t('db.trusted'))
tools.showPositiveNotif($q, t('db.trusted', { username: username.value }))
} else {
tools.showNegativeNotif($q, t('db.recfailed'))

View File

@@ -1,8 +1,14 @@
<template>
<div v-if="tools.isUserOk()">
<div v-if="grp">
<q-item class="q-my-sm" clickable>
<q-item-section avatar @click="naviga(tools.getPathByGroup(grp))">
<q-item
class="q-my-sm"
clickable
>
<q-item-section
avatar
@click="naviga(tools.getPathByGroup(grp))"
>
<q-avatar size="60px">
<q-img
:src="getImgGroup(grp)"
@@ -17,10 +23,17 @@
<q-item-label
><strong>{{ grp.title }}</strong> ({{ grp.groupname }})
</q-item-label>
<q-item-label v-if="grp.descr" caption lines="3"
<q-item-label
v-if="grp.descr"
caption
lines="3"
><em>{{ grp.descr }}</em></q-item-label
>
<q-item-label v-if="grp.account && circuitname" caption lines="2">
<q-item-label
v-if="grp.account && circuitname"
caption
lines="2"
>
<CSaldo
:small="true"
:account="grp.account"
@@ -45,7 +58,10 @@
</q-item-label>
<q-item-section side>
<q-item-label v-if="visu === costanti.MY_GROUPS">
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -85,9 +101,7 @@
)
"
>
<q-item-section>{{
$t('groups.delete_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
</q-item>
</q-list>
<q-list style="min-width: 150px">
@@ -106,16 +120,17 @@
)
"
>
<q-item-section>{{
$t('groups.block_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.block_group') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-item-label>
<q-item-label v-if="visu === costanti.REQ_ADD_USER_TO_CIRCUIT">
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -125,11 +140,12 @@
@click="showsendCoinTo = true"
>
<q-item-section avatar>
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
<q-icon
color="positive"
name="img: /images/1ris_rosso_100.png"
/>
</q-item-section>
<q-item-section>{{
$t('circuit.sendcoins')
}}</q-item-section>
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
</q-item>
<q-item
v-if="tools.iAmAdminGroup(grp.groupname)"
@@ -139,11 +155,12 @@
@click="tools.receiveRisGroup(grp.groupname, $q, $t)"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-download" />
<q-icon
color="positive"
name="fas fa-download"
/>
</q-item-section>
<q-item-section>{{
$t('circuit.receive_coins')
}}</q-item-section>
<q-item-section>{{ $t('circuit.receive_coins') }}</q-item-section>
</q-item>
<q-item
clickable
@@ -153,9 +170,30 @@
<q-item-section avatar>
<q-icon name="fas fa-info" />
</q-item-section>
<q-item-section>{{
$t('groups.infoaccount')
}}</q-item-section>
<q-item-section>{{ $t('groups.infoaccount') }}</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="
tools.removeFromMyCircuits(
$q,
userStore.my.username,
circuitname,
grp.groupname,
$t('circuit.domanda_exit_fromcircuit', {
circuitname,
})
)
"
>
<q-item-section avatar>
<q-icon
color="negative"
name="fas fa-user-minus"
/>
</q-item-section>
<q-item-section>{{ $t('circuit.exit_circuit') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
@@ -192,9 +230,7 @@
)
"
>
<q-item-section>{{
$t('groups.ask_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.ask_group') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -218,9 +254,7 @@
)
"
>
<q-item-section>{{
$t('shared.refuse_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
</q-item>
<q-item
clickable
@@ -235,9 +269,7 @@
)
"
>
<q-item-section>{{
$t('shared.cancel_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -257,9 +289,7 @@
)
"
>
<q-item-section>{{
$t('groups.exit_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.exit_group') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -279,16 +309,17 @@
)
"
>
<q-item-section>{{
$t('groups.delete_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-item-label>
<q-item-label v-else-if="visu === costanti.REQ_GROUP">
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -306,16 +337,17 @@
)
"
>
<q-item-section>{{
$t('groups.reject_ask_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.reject_ask_group') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-item-label>
<q-item-label v-else-if="visu === costanti.ASK_SENT_GROUP">
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<q-menu>
<q-list style="min-width: 150px">
<q-item
@@ -333,9 +365,7 @@
)
"
>
<q-item-section>{{
$t('shared.refuse_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
</q-item>
<q-item
clickable
@@ -352,9 +382,7 @@
)
"
>
<q-item-section>{{
$t('shared.cancel_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
@@ -378,11 +406,12 @@
@click="showsendCoinTo = true"
>
<q-item-section avatar>
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
<q-icon
color="positive"
name="img: /images/1ris_rosso_100.png"
/>
</q-item-section>
<q-item-section>{{
$t('circuit.sendcoins')
}}</q-item-section>
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -405,9 +434,7 @@
)
"
>
<q-item-section>{{
$t('groups.ask_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.ask_group') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -430,9 +457,7 @@
)
"
>
<q-item-section>{{
$t('shared.refuse_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
</q-item>
<q-item
clickable
@@ -447,9 +472,7 @@
)
"
>
<q-item-section>{{
$t('shared.cancel_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.cancel_ask') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -469,9 +492,7 @@
)
"
>
<q-item-section>{{
$t('groups.exit_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.exit_group') }}</q-item-section>
</q-item>
<q-item
@@ -490,11 +511,12 @@
"
>
<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>{{
$t('circuit.exit_circuit')
}}</q-item-section>
<q-item-section>{{ $t('circuit.exit_circuit') }}</q-item-section>
</q-item>
</q-list>
<q-list
@@ -514,27 +536,32 @@
)
"
>
<q-item-section>{{
$t('groups.delete_group')
}}</q-item-section>
<q-item-section>{{ $t('groups.delete_group') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
</q-btn>
</q-item-label>
<q-item-label v-else-if="visu === costanti.REQ_ADD_GROUP_TO_CIRCUIT">
<q-btn rounded icon="fas fa-ellipsis-h">
<q-btn
rounded
icon="fas fa-ellipsis-h"
>
<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
@click="
tools.addGroupToMyCircuits($q, grp.groupname, circuitname)
"
@click="tools.addGroupToMyCircuits($q, grp.groupname, circuitname)"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-user-plus" />
<q-icon
color="positive"
name="fas fa-user-plus"
/>
</q-item-section>
<q-item-section>
{{ $t('circuit.accept') }}
@@ -544,15 +571,14 @@
clickable
v-close-popup
@click="
tools.addFidoGroupToMyCircuits(
$q,
grp.groupname,
circuitname
)
tools.addFidoGroupToMyCircuits($q, grp.groupname, circuitname)
"
>
<q-item-section avatar>
<q-icon color="positive" name="img: /images/1ris_rosso_100.png" />
<q-icon
color="positive"
name="img: /images/1ris_rosso_100.png"
/>
</q-item-section>
<q-item-section>
{{ $t('circuit.enablefido') }}
@@ -564,41 +590,33 @@
clickable
v-close-popup
@click="
tools.refuseReqCircuit(
$q,
myusername(),
circuitname,
grp.groupname
)
tools.refuseReqCircuit($q, myusername(), circuitname, grp.groupname)
"
>
<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>{{
$t('shared.refuse_ask')
}}</q-item-section>
<q-item-section>{{ $t('shared.refuse_ask') }}</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
@click="
tools.cancelReqCircuit(
$q,
myusername(),
circuitname,
grp.groupname
)
tools.cancelReqCircuit($q, myusername(), circuitname, grp.groupname)
"
>
<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>{{
$t('shared.cancel_ask_short')
}}</q-item-section>
<q-item-section>{{ $t('shared.cancel_ask_short') }}</q-item-section>
</q-item>
</q-list>
</q-menu>
@@ -620,13 +638,23 @@
>
</CSendCoins>
</div>
<q-dialog v-model="showAccountInfo" full-height full-width>
<q-dialog
v-model="showAccountInfo"
full-height
full-width
>
<q-card v-if="circuit">
<q-toolbar class="bg-primary text-white">
<q-toolbar-title>
{{ grp.title }}
</q-toolbar-title>
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
<q-btn
flat
round
color="white"
icon="close"
v-close-popup
></q-btn>
</q-toolbar>
<CInfoAccount
:grp="grp"
@@ -637,8 +665,7 @@
</q-dialog>
</template>
<script lang="ts" src="./CMyGroup.ts">
</script>
<script lang="ts" src="./CMyGroup.ts"></script>
<style lang="scss" scoped>
@import './CMyGroup.scss';

View File

@@ -428,12 +428,14 @@ export default defineComponent({
myarrvalue.value = []
const myarr = props.arrvalue
for (const val of myarr) {
rec = arrtempOpt.value.find((myrec: any) => val === (myrec[`${props.optval}`]))
if (rec) {
myarrvalue.value.push(rec[`${props.optval}`])
} else {
myarrvalue.value.push(val)
if (tools.isArray(myarr)) {
for (const val of myarr) {
rec = arrtempOpt.value.find((myrec: any) => val === (myrec[`${props.optval}`]))
if (rec) {
myarrvalue.value.push(rec[`${props.optval}`])
} else {
myarrvalue.value.push(val)
}
}
}
} else {

View File

@@ -115,11 +115,11 @@ export default defineComponent({
$router.push(path)
}
function setCmd($q: any, cmd: number, myusername: string, value: any, dest: string) {
function setCmd($qpar: any, cmd: number, myusername: string, value: any, dest: string) {
if (props.notsetcmd) {
tools.setCmd($q, cmd, myusername, value, dest)
tools.setCmd($qpar, cmd, myusername, value, dest)
} else {
emit('setCmd', $q, cmd, myusername, value, dest)
emit('setCmd', $qpar, cmd, myusername, value, dest)
}
}
@@ -153,6 +153,7 @@ export default defineComponent({
showsendCoinTo,
showsendCoin,
clickToUser,
$q,
}
},
})

View File

@@ -221,7 +221,6 @@
userStore.my.username,
false,
contact.username,
false
)
"
>
@@ -701,7 +700,6 @@
userStore.my.username,
'',
contact.username,
''
)
"
>