- 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

@@ -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';