surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Conti Collettivi + messaggi

Browse Source
This commit is contained in:
Surya Paolo
2023-02-02 13:53:09 +01:00
parent f79c3b1d77
commit 0234e2323a
16 changed files with 140 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/views/user/mycircuit/mycircuit.ts
View File

@@ -125,77 +125,77 @@ export default defineComponent({
];
filterextra.value = [ {
$match: {
idapp: process.env.APP_ID,
'profile.mycircuits': {
$elemMatch: { circuitname: { $eq: circuit.value.name } },
filterextra.value = [{
$match: {
idapp: process.env.APP_ID,
'profile.mycircuits': {
$elemMatch: { circuitname: { $eq: circuit.value.name } },
},
},
},
{
$lookup: {
from: 'circuits',
as: 'circuit',
let: { circuitname: circuit.value.name, idapp: '$idapp' },
pipeline: [
{
$match:
{
$expr:
{
$and:
[
{ $eq: ['$name', '$$circuitname'] },
{ $eq: ['$idapp', '$$idapp'] },
],
},
},
},
},
],
},
{
$lookup: {
from: 'circuits',
as: 'circuit',
let: { circuitname: circuit.value.name, idapp: '$idapp' },
pipeline: [
{
$match:
{
$expr:
{
$and:
[
{ $eq: ['$name', '$$circuitname'] },
{ $eq: ['$idapp', '$$idapp'] },
},
{ $unwind: '$circuit' },
{
$project: {
username: 1,
name: 1,
surname: 1,
profile: 1, idapp: 1, 'circuit.name': 1, 'circuit._id': 1
}
],
},
},
{
$lookup: {
from: 'accounts',
as: 'account',
let: { username: '$username', idapp: '$idapp', circuitId: '$circuit._id' },
pipeline: [
{
$match:
{
$expr:
{
$and:
[
{ $eq: ['$$username', '$username'] },
{ $eq: ['$$idapp', '$idapp'] },
{ $eq: ['$$circuitId', '$circuitId'] },
],
},
},
],
},
},
],
},
{ $unwind: '$circuit' },
{
$project: {
username: 1,
name: 1,
surname: 1,
profile: 1, idapp: 1, 'circuit.name': 1, 'circuit._id': 1
}
},
{
$lookup: {
from: 'accounts',
as: 'account',
let: { username: '$username', idapp: '$idapp', circuitId: '$circuit._id' },
pipeline: [
{
$match:
{
$expr:
{
$and:
[
{ $eq: ['$$username', '$username'] },
{ $eq: ['$$idapp', '$idapp'] },
{ $eq: ['$$circuitId', '$circuitId'] },
],
},
},
},
],
},
},
{ $unwind: '$account' },
},
{ $unwind: '$account' },
]
filterextra_group.value = [ {
filterextra_group.value = [{
$match: {
idapp: process.env.APP_ID,
'mycircuits': {
@@ -245,7 +245,7 @@ export default defineComponent({
$lookup: {
from: 'accounts',
as: 'account',
let: { groupname: '$groupname', idapp: '$idapp', circuitId: '$circuit._id' },
let: { groupname: '$groupname', idapp: '$idapp', circuitId: '$circuit._id' },
pipeline: [
{
$match:
@@ -269,12 +269,17 @@ export default defineComponent({
{
$unwind: '$account',
},
{ $match: { 'account.groupname': { $exists: true, $ne: '' } }
{
$match: { 'account.groupname': { $exists: true, $ne: '' } }
},
]
]
}
arrfilterand.value = []
filtercustom_rich.value = []
if (userStore.my.username && circuit.value)
groupsListAdmin.value = userStore.GroupsListWhereIAmAdmin()
// filtroutente.value = [{ userId: userStore.my._id }]
})
@@ -287,9 +292,6 @@ export default defineComponent({
await loadCircuit()
if (userStore.my.username && circuit.value)
groupsListAdmin.value = userStore.GroupsListWhereIAmAdmin(circuit.value.name)
}
function getImgCircuit() {

6
src/views/user/mycircuit/mycircuit.vue
View File

@@ -141,6 +141,7 @@
$q,
userStore.my.username,
circuit.name,
'',
$t('circuit.domanda_exit_fromcircuit', {
circuitname: circuit.name,
})
@@ -252,7 +253,10 @@
:key="ind"
class="q-pa-sm"
>
<q-item>
<q-item v-if="!userStore.IsMyCircuitByNameAndGroup(
circuit.name,
group.groupname
)">
<q-item-section>
<q-btn
v-if="

9
src/views/user/mygroup/mygroup.vue
View File

@@ -101,6 +101,7 @@
}}</q-item-section>
</q-item>
<q-list
v-if="tools.iAmAdminGroup(mygrp.groupname)"
style="min-width: 200px"
@@ -483,13 +484,17 @@
</q-tab-panel>
<q-tab-panel name="circuits">
<div v-for="(circuit, ind) of circuitslist" :key="ind">
<div class="circuit_name">{{circuit.name}}: </div>
<div class="circuit_name">{{ circuit.name }}:</div>
<CSaldo
:account="circuit.account"
:symbol="circuit.symbol"
:color="circuit.color"
:saldo="circuit.account.saldo"
:qtarem="circuit.account ? circuitStore.getRemainingCoinsToSend(circuit.account) : 0"
:qtarem="
circuit.account
? circuitStore.getRemainingCoinsToSend(circuit.account)
: 0
"
>
</CSaldo>
</div>