- 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,
''
)
"
>

View File

@@ -1,9 +1,9 @@
const msg_website_it = {
ws: {
sitename: 'Gruppo Macro',
siteshortname: 'Gruppo Macro',
description: '',
keywords: '',
sitename: 'Riso',
siteshortname: 'RISO',
description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
},
hours: {
descr: 'Descrizione',
@@ -16,20 +16,29 @@ const msg_website_it = {
pages: {
home: 'Home',
profile: 'Profilo',
install_site: 'Installa Sito',
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
myhosps2: 'myhosps2',
mygood2: 'mygood2',
catalogo: 'Catalogo',
fundraising: 'Sostieni il Progetto',
notifs: 'Configura le Notifiche',
unsubscribe: 'Disiscriviti',
unsubscribe_user: 'Disiscriviti User',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
producer: 'Produttore',
orderinfo: 'Ordini Effettuati',
products: 'Prodotti',
productslist: 'Lista Prodotti',
collabora: 'Collabora',
storehouses: 'Magazzino',
departments: 'Uffici',
orders: 'Ordini Ricevuti',
orders2: 'Ordini Ricevuti',
sharewithus: 'Condividi con Noi',
checkout: 'Carrello',
payment: 'Pagamenti',
regok: 'Registrazione Confermata',
presentazione: 'Presentazione',
presentazione2: 'Presentazione',
@@ -75,12 +84,14 @@ const msg_website_it = {
eventodef: 'Evento:',
prova: 'prova',
dbop: 'Operazioni',
dbopmacro: 'Operazioni Macro',
projall: 'Comunitari',
groups: 'Lista Gruppi',
projectsShared: 'Condivisi da me',
myprojects: 'Privati',
favproj: 'Favoriti',
admin_ecommerce: 'ECommerce',
ecommerce: 'Prodotti',
ecommerce_menu: 'ECommerce1',
hours: 'Ore',
department: 'Uffici',
title: 'Titolo',
@@ -109,11 +120,16 @@ const msg_website_it = {
onlyif_logged: 'Solo se Loggati',
only_residenti: 'Solo Residenti',
only_consiglio: 'Solo Consiglieri',
only_collab: 'Solo Collaboratori',
color: 'Colore',
mainMenu: 'Menu Principale',
subtitle: 'Sottotitolo',
lang: 'Lingua',
keywords: 'Parole Chiave',
desctiption: 'Descrizione',
heightimg: 'Altezza Immagine',
},
msg: {
myAppName: 'Più che Buono',
myAppName: 'Riso',
myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
underconstruction: 'App in costruzione...',
myDescriz: '',

View File

@@ -1,6 +1,6 @@
/* GRUPPOMACRO APP
/* RISO APP
*/
import {
import type {
IListRoutes,
ILang,
IPreloadImages,
@@ -44,7 +44,6 @@ const firstPage = {
infooter: true,
}
function getDynamicPages(site: ISites): IListRoutes[] {
const baseroutes: IListRoutes[] = [
@@ -71,11 +70,34 @@ function getDynamicPages(site: ISites): IListRoutes[] {
},
{
active: true,
order: 400,
path: '/test-lungo',
materialIcon: 'fas fa-test',
name: 'mypages.test_lungo',
component: () => import('@src/views/testLungo/testLungo.vue'),
order: 12,
path: '/goods',
materialIcon: 'fas fa-tshirt',
name: 'mypages.goods',
component: () => import('@src/root/goods/goods.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/services',
materialIcon: 'fas fa-house-user',
name: 'mypages.services',
component: () => import('@src/root/services/services.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/activities',
materialIcon: 'fas fa-house-user',
name: 'mypages.activities',
component: () => import('@src/root/activities/activities.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
},
@@ -90,6 +112,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: false,
infooter: false,
},
{
active: true,
order: 15,
path: '/hosps',
materialIcon: 'fas fa-bed',
name: 'mypages.hosp',
component: () => import('@src/root/hosp/hosp.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: site.confpages && site.confpages.enableCircuits,
order: 16,
@@ -102,7 +135,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: true,
},
{
active: site.confpages && site.confpages.enableEvents,
active: true,
order: 20,
path: '/events',
materialIcon: 'fas fa-bullhorn',
@@ -124,7 +157,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: false,
},
{
active: site.confpages && site.confpages.showProfile,
active: true,
order: 120,
path: '/myprofile',
materialIcon: 'fas fa-user',
@@ -135,7 +168,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: true,
},
{
active: site.confpages && site.confpages.showProfile,
active: true,
order: 120,
path: '/editprofile',
materialIcon: 'fas fa-user',
@@ -146,7 +179,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: false,
},
{
active: site.confpages && site.confpages.showiscrittiMenu,
active: true,
order: 130,
path: '/friends',
materialIcon: 'fas fa-user-friends',
@@ -241,6 +274,16 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: false,
infooter: false,
},
{
active: true,
order: 150,
path: '/sostieniilprogetto',
materialIcon: 'fas fa-hand-holding-heart',
name: 'pages.fundraising',
component: () => import('@src/root/fundraising/fundraising.vue'),
inmenu: false,
infooter: false,
},
{
active: true,
order: 80,
@@ -259,7 +302,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
export function firstimagehome() {
let img = 'statics/images/background.jpg'
const img = 'statics/images/background.jpg'
return img
}

View File

@@ -224,6 +224,7 @@ export interface IUserFields {
password?: string
ipaddr?: string
perm?: number
lang?: string
verified_email?: boolean
verified_by_aportador?: boolean
idMyGroup?: string

View File

@@ -193,8 +193,8 @@ const msg_enUs = {
domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?',
addedfriend: 'Aggiunto alla lista di Amici',
addedgroup: 'Aggiunto al Gruppo',
domanda_trusted: 'Accettare la Fiducia a {username}?',
trusted: 'Accettato la Fiducia',
domanda_trusted: 'Ammetti {username}?',
trusted: '{username} Ammesso',
domanda_ask_friend: 'Chiedere l\'Amicizia a {username}?',
domanda_ask_group: 'Chiedere l\'invito al Gruppo {groupname}?',
askedtofriend: 'Chiesto l\'Amicizia a {username}',

View File

@@ -357,7 +357,7 @@ const msg_it = {
addedgroup: 'Aggiunto all\'Organizzazione',
addedfidocircuit: 'Fiducia abilitata al {circuitname}',
addedcircuit: 'Aggiunto al {circuitname}',
domanda_trusted: 'Accettare la Fiducia a {username}?',
domanda_trusted: 'Ammetti {username}?',
domanda_reject: 'Non lo conosci? Vuoi rifiutare l\'accesso a {username}?',
trusted: 'Hai Accettato la Fiducia a {username}',
domanda_ask_friend: 'Chiedere l\'Amicizia a {username}?',
@@ -1454,6 +1454,9 @@ const msg_it = {
preferences: 'Preferenze',
},
circuit: {
add_circuit: 'Entra nel Circuito',
select_circuit: 'Scegli il Circuito cui abilitare il conto RIS',
select_circuit_hint: '',
show_next_mov: 'Vedi altri ...',
nessun_movimento_ricevuto: 'Nessun movimento ricevuto. Proponi uno scambio in RIS e conosci altre persone!',
nessun_movimento_inviato: 'Nessun movimento Inviato. Sperimenta l\'utilizzo dei RIS proponendoti in qualcosa!',

View File

@@ -2,7 +2,8 @@ import { defineStore } from 'pinia'
import type {
IAccount,
ICircuit, ICircuitState, IGroupShort, IMyCircuit, IMyGroup, IUserFields
ICircuit, ICircuitState, IGroupShort, IMyCircuit, IMyGroup, IUserFields,
IUserProfile
} from '@src/model';
import {
IGlobalState
@@ -126,6 +127,16 @@ export const useCircuitStore = defineStore('CircuitStore', {
},
getFidoConcessoByUsername(myuser: IUserFields, circuitId: string, username: string): number|string {
const userStore = useUserStore()
if (myuser && myuser.profile.useraccounts) {
const account = myuser.profile.useraccounts.find((rec: IAccount) => rec.username === username || (rec.groupname === username && username !== '') && rec.circuitId === circuitId)
return account ? account.fidoConcesso : 0
} else {
return ''
}
},
SonoDentroAdAlmeno1CircuitoConFido(): boolean {
const userStore = useUserStore()

File diff suppressed because it is too large Load Diff

View File

@@ -1,261 +1,313 @@
import { CGridTableRec } from '@src/components/CGridTableRec'
import { CMyFriends } from '@src/components/CMyFriends'
import { CMyUser } from '@src/components/CMyUser'
import { CNotifAtTop } from '@src/components/CNotifAtTop'
import { CTitleBanner } from '@src/components/CTitleBanner'
import { CProfile } from '@src/components/CProfile'
import { CCheckIfIsLogged } from '@src/components/CCheckIfIsLogged'
import { CMyFieldRec } from '@src/components/CMyFieldRec'
import { CSkill } from '@src/components/CSkill'
import { CDateTime } from '@src/components/CDateTime'
import { CInfoAccount } from '@src/components/CInfoAccount'
import { CSendCoins } from '@src/components/CSendCoins'
import { tools } from '@tools'
import { computed, defineComponent, onMounted, ref, watch } from 'vue'
import { useUserStore } from '@store/UserStore'
import { useRoute, useRouter } from 'vue-router'
import { useGlobalStore } from '@store/globalStore'
import { useI18n } from 'vue-i18n'
import { toolsext } from '@store/Modules/toolsext'
import { useQuasar } from 'quasar'
import { costanti } from '@costanti'
import { CGridTableRec } from '@src/components/CGridTableRec';
import { CMyFriends } from '@src/components/CMyFriends';
import { CMyUser } from '@src/components/CMyUser';
import { CNotifAtTop } from '@src/components/CNotifAtTop';
import { CTitleBanner } from '@src/components/CTitleBanner';
import { CProfile } from '@src/components/CProfile';
import { CCheckIfIsLogged } from '@src/components/CCheckIfIsLogged';
import { CMyFieldRec } from '@src/components/CMyFieldRec';
import { CSkill } from '@src/components/CSkill';
import { CMyCircuit } from '@src/components/CMyCircuit';
import { CDateTime } from '@src/components/CDateTime';
import { CInfoAccount } from '@src/components/CInfoAccount';
import { CSendCoins } from '@src/components/CSendCoins';
import { tools } from '@tools';
import { computed, defineComponent, onMounted, ref, watch } from 'vue';
import { useUserStore } from '@store/UserStore';
import { useRoute, useRouter } from 'vue-router';
import { useGlobalStore } from '@store/globalStore';
import { useI18n } from 'vue-i18n';
import { toolsext } from '@store/Modules/toolsext';
import { useQuasar } from 'quasar';
import { costanti } from '@costanti';
import type { ICircuit, ICity, IFriends, IMyCircuit, IMyGroup, ISearchList } from 'model';
import { IUserFields } from 'model'
import { shared_consts } from '@src/common/shared_vuejs'
import { colmyUserPeople, colmyUserGroup, colmyMovementTable, colmyMovement } from '@store/Modules/fieldsTable'
import { useNotifStore } from '@store/NotifStore'
import { useCircuitStore } from '@src/store/CircuitStore'
import { IUserFields } from 'model';
import { shared_consts } from '@src/common/shared_vuejs';
import {
colmyUserPeople,
colmyUserGroup,
colmyMovementTable,
colmyMovement,
} from '@store/Modules/fieldsTable';
import { useNotifStore } from '@store/NotifStore';
import { useCircuitStore } from '@src/store/CircuitStore';
export default defineComponent({
name: 'mygroup',
components: {
CProfile, CTitleBanner, CMyFieldRec,
CInfoAccount, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged,
CNotifAtTop, CSendCoins
CProfile,
CTitleBanner,
CMyFieldRec,
CInfoAccount,
CSkill,
CDateTime,
CMyFriends,
CGridTableRec,
CMyUser,
CCheckIfIsLogged,
CNotifAtTop,
CSendCoins,
CMyCircuit,
},
props: {},
setup() {
const userStore = useUserStore()
const notifStore = useNotifStore()
const circuitStore = useCircuitStore()
const $route = useRoute()
const $q = useQuasar()
const { t } = useI18n()
const userStore = useUserStore();
const notifStore = useNotifStore();
const circuitStore = useCircuitStore();
const $route = useRoute();
const $q = useQuasar();
const { t } = useI18n();
const animation = ref(<any>'fade')
const tabevents = ref('new')
const animation = ref(<any>'fade');
const tabevents = ref('new');
const circuitSel = ref('');
const showrules = ref(false);
const requestToEnterCircuit = ref(false);
const mycards = computed(() => {
return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile)
})
return costanti.MAINCARDS.filter((rec: any) => rec.table && rec.showinprofile);
});
const groupname = computed(() => $route.params?.groupname ? $route.params?.groupname.toString() : '')
const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '')
const groupname = computed(() =>
$route.params?.groupname ? $route.params?.groupname.toString() : ''
);
const idnotif = computed(() =>
$route.query.idnotif ? $route.query.idnotif.toString() : ''
);
const filtroutente = ref(<any[]>[])
const showPic = ref(false)
const filtroutente = ref(<any[]>[]);
const showPic = ref(false);
const showsendCoinTo = ref(false)
const showsendCoinTo = ref(false);
const tabcircuit = ref('info')
const filtro_eventi = ref(<any[]>[])
const tabcircuit = ref('info');
const filtro_eventi = ref(<any[]>[]);
const mygrp = ref(<IMyGroup>{})
const mystatus = ref(<number>0)
const users_in_group = ref(<IFriends[]>[])
const mygrp = ref(<IMyGroup>{});
const mystatus = ref(<number>0);
const users_in_group = ref(<IFriends[]>[]);
const tabellare = ref(false)
const circuitIndex = ref(0)
const tabellare = ref(false);
const circuitIndex = ref(0);
const loading = ref(false)
const loading = ref(false);
const tabgrp = ref('info')
const tabmembers = ref('all')
const tab = ref('membri')
const tabgrp = ref('info');
const tabmembers = ref('all');
const tab = ref('membri');
const arrfilterand: any = ref([])
const filtercustom: any = ref([])
const filtercustom_rich: any = ref([])
const searchList = ref(<ISearchList[]>[])
const arrfilterand: any = ref([]);
const filtercustom: any = ref([]);
const filtercustom_rich: any = ref([]);
const searchList = ref(<ISearchList[]>[]);
const cities = ref(<ICity[]>[])
const cities = ref(<ICity[]>[]);
const circuitslist = ref(<ICircuit[]>[])
const circuitslistOpt = ref(<any[]>[])
const circuitslist = ref(<ICircuit[]>[]);
const circuitslistOpt = ref(<any[]>[]);
const circuit = ref(<ICircuit>{});
function profile() {
return userStore.my.profile
return userStore.my.profile;
}
function mygrpname() {
return userStore.my.username
return userStore.my.username;
}
async function loadGroup() {
console.log('loadGroup')
console.log('loadGroup');
// Carica il profilo di quest'utente
if (groupname.value) {
await userStore.loadGroup(groupname.value, idnotif.value).then(({ data, status }: { data: any, status: number }) => {
// console.log('data', data)
circuitslist.value = []
if (data) {
mygrp.value = data.mygroup
cities.value = data.cities
notifStore.setAsRead(idnotif.value)
users_in_group.value = data.users_in_group
await userStore
.loadGroup(groupname.value, idnotif.value)
.then(({ data, status }: { data: any; status: number }) => {
// console.log('data', data)
circuitslist.value = [];
if (data) {
mygrp.value = data.mygroup;
cities.value = data.cities;
notifStore.setAsRead(idnotif.value);
users_in_group.value = data.users_in_group;
if (mygrp.value)
circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value)
if (mygrp.value)
circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value);
/*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
/*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
}*/
if (circuitslist.value) {
circuitslistOpt.value = []
for (let i = 0; i < circuitslist.value.length; i++) {
circuitslistOpt.value.push({ label: circuitslist.value[i].name, value: i })
const myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name)
if (myc) {
circuitslist.value[i].account = myc.account
if (circuitslist.value) {
circuitslistOpt.value = [];
for (let i = 0; i < circuitslist.value.length; i++) {
circuitslistOpt.value.push({
label: circuitslist.value[i].name,
value: i,
});
const myc = data.mygroup.mycircuits.find(
(circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name
);
if (myc) {
circuitslist.value[i].account = myc.account;
}
}
}
} else {
mygrp.value = null;
users_in_group.value = [];
}
} else {
mygrp.value = null
users_in_group.value = []
}
mystatus.value = status
loading.value = false
// filtroutente.value = [{ userId: userStore.my._id }]
})
mystatus.value = status;
loading.value = false;
// filtroutente.value = [{ userId: userStore.my._id }]
});
}
}
watch(() => groupname.value, (to: any, from: any) => {
loadGroup()
})
watch(
() => groupname.value,
(to: any, from: any) => {
loadGroup();
}
);
watch(
() => circuitSel.value,
(to: any, from: any) => {
circuit.value = circuitStore.getCircuitByName(circuitSel.value);
}
);
async function mounted() {
loading.value = true
await loadGroup()
loading.value = true;
await loadGroup();
searchList.value = []
filtercustom.value = [{ 'profile.mygroups': { $elemMatch: { groupname: { $eq: groupname.value } } } }]
searchList.value = [];
filtercustom.value = [
{ 'profile.mygroups': { $elemMatch: { groupname: { $eq: groupname.value } } } },
];
arrfilterand.value = []
filtercustom_rich.value = []
arrfilterand.value = [];
filtercustom_rich.value = [];
//++TODO: sistemare la filtercustom ... richieste...
}
function getImgGrp() {
if (mygrp.value)
return userStore.getImgByGroup(mygrp.value)
else
return ''
if (mygrp.value) return userStore.getImgByGroup(mygrp.value);
else return '';
}
function checkifShow(col: string) {
//++Todo: checkifShow Permessi !
return true
return true;
}
function getLinkGrpTelegram() {
if (mygrp.value) {
if (mygrp.value.link_telegram) {
return (!mygrp.value.link_telegram.startsWith('http') ? 'https://' : '') + mygrp.value.link_telegram
return (
(!mygrp.value.link_telegram.startsWith('http') ? 'https://' : '') +
mygrp.value.link_telegram
);
}
} else {
return ''
return '';
}
}
function getLinkWebSite() {
if (!mygrp.value) {
return ''
return '';
}
let site = mygrp.value.website!
let site = mygrp.value.website!;
if (site) {
if (!site.startsWith('http')) {
site = 'https://' + site
site = 'https://' + site;
}
}
return site
return site;
}
function extraparams_rich() {
return {
querytype: shared_consts.QUERYTYPE_MYGROUP,
myid: mygrp.value ? mygrp.value._id : '',
}
};
}
function extraparams_refused() {
return {
querytype: shared_consts.QUERYTYPE_REFUSED_USER_GRP,
myid: mygrp.value ? mygrp.value._id : '',
}
};
}
function numUsers() {
return users_in_group.value ? users_in_group.value.length : 0
return users_in_group.value ? users_in_group.value.length : 0;
}
function numAdmins() {
return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.length : 0
return mygrp.value && mygrp.value.admins ? mygrp.value.admins.length : 0;
}
function listaAdmins() {
return (mygrp.value && mygrp.value.admins) ? mygrp.value.admins.map((rec) => rec.username).join(', ') : ''
return mygrp.value && mygrp.value.admins
? mygrp.value.admins.map((rec) => rec.username).join(', ')
: '';
}
function getExtraparams_movs_grp(circuit: ICircuit): any {
return {
querytype: shared_consts.QUERYTYPE_LIST_MOVEMENTS_GROUPNAME,
myid: circuit ? circuit._id : '',
groupname: mygrp.value ? mygrp.value.groupname : '',
}
};
}
function filtrotables(table: string, quale: string) {
const out = []
if (mygrp.value)
out.push({ groupname: mygrp.value.groupname })
const out = [];
if (mygrp.value) out.push({ groupname: mygrp.value.groupname });
if (table === shared_consts.TABLES_MYBACHECAS) {
let mydate = tools.addDays(tools.getDateNow(), -1)
let mydateend = tools.addDays(mydate, 180)
mydate = tools.getstrYYMMDDDate(mydate)
mydateend = tools.getstrYYMMDDDate(mydateend)
let mydate = tools.addDays(tools.getDateNow(), -1);
let mydateend = tools.addDays(mydate, 180);
mydate = tools.getstrYYMMDDDate(mydate);
mydateend = tools.getstrYYMMDDDate(mydateend);
if (quale === 'new') {
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }]
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }];
} else {
mydate = tools.addDays(tools.getDateNow(), -365)
mydateend = tools.addDays(tools.getDateNow(), 0)
mydate = tools.getstrYYMMDDDate(mydate)
mydateend = tools.getstrYYMMDDDate(mydateend)
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }]
mydate = tools.addDays(tools.getDateNow(), -365);
mydateend = tools.addDays(tools.getDateNow(), 0);
mydate = tools.getstrYYMMDDDate(mydate);
mydateend = tools.getstrYYMMDDDate(mydateend);
filtro_eventi.value = [{ dateTimeStart: { $gte: mydate, $lte: mydateend } }];
}
filtro_eventi.value.forEach((rec: any) => [
out.push({ ...rec })
])
filtro_eventi.value.forEach((rec: any) => [out.push({ ...rec })]);
}
return out
return out;
}
function getlinkpage() {
return tools.getFullCurrentUrl()
return tools.getFullCurrentUrl();
}
onMounted(mounted)
function getRegulation(reg: string) {
const strreg = reg + '';
if (!reg) {
let name = CircuitSel.value
const mystringa = t('circuit.regolamento', { nomecircuito: name });
return mystringa;
} else {
return reg;
}
}
onMounted(mounted);
return {
groupname,
@@ -306,6 +358,12 @@ export default defineComponent({
showsendCoinTo,
mycards,
tabevents,
}
}
})
requestToEnterCircuit,
circuitSel,
loadGroup,
showrules,
circuit,
getRegulation,
};
},
});

File diff suppressed because it is too large Load Diff