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

2
src/components/CContactUser/CContactUser.vue
View File

@@ -43,7 +43,7 @@
<q-btn
v-if="
userStore.getMyCircuitsInCommonByUser(myuser).length > 0 &&
((myuser.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare())
((myuser.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare() || userStore.hoContiComunitariDaAmministrare())
"
icon="fas fa-coins"
color="green"

27
src/components/CMyGroup/CMyGroup.vue
View File

@@ -37,7 +37,9 @@
<q-item-label>
<q-btn
v-if="userStore.my.profile.calc.numGoodsAndServices > 0 && circuitname"
v-if="
userStore.my.profile.calc.numGoodsAndServices > 0 && circuitname
"
icon="fas fa-coins"
color="green"
size="md"
@@ -410,6 +412,29 @@
$t('groups.exit_group')
}}</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-list
v-if="tools.iAmAdminGroup(grp.groupname)"

5
src/components/CMyUser/CMyUser.vue
View File

@@ -59,7 +59,7 @@
<q-btn
v-if="
userStore.getMyCircuitsInCommonByUser(contact).length > 0 &&
((contact.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare())
((contact.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare() || userStore.hoContiComunitariDaAmministrare())
"
icon="fas fa-coins"
color="green"
@@ -492,7 +492,8 @@
tools.removeFromMyCircuits(
$q,
contact.username,
circuitname
circuitname,
'',
)
"
>

2
src/components/CMyUserOnlyView/CMyUserOnlyView.vue
View File

@@ -181,7 +181,7 @@
</q-item-section>
<q-item-section>{{ $t('circuit.remove_as_admin') }}</q-item-section>
</q-item>
<q-item clickable v-if="!tools.isUserTheCreatorOfTheCircuit(circuitname, contact.username)" v-close-popup @click="tools.removeFromMyCircuits($q, contact.username, circuitname)">
<q-item clickable v-if="!tools.isUserTheCreatorOfTheCircuit(circuitname, contact.username)" v-close-popup @click="tools.removeFromMyCircuits($q, contact.username, circuitname, '')">
<q-item-section avatar>
<q-icon color="negative" name="fas fa-user-minus"/>
</q-item-section>

2
src/components/CSendCoins/CSendCoins.ts
View File

@@ -148,7 +148,7 @@ export default defineComponent({
accountloaded.value = circuitloaded.value ? circuitloaded.value.account : null
}
groupsListAdmin.value = userStore.GroupsListWhereIAmAdmin(circuitloaded.value.name)
groupsListAdmin.value = userStore.GroupsListWhereIAmAdminInTheCircuit(circuitloaded.value.name)
console.log('groupsListAdmin.value', groupsListAdmin.value)
arrGroupsList.value = []

2
src/components/CSendCoins/CSendCoins.vue
View File

@@ -36,7 +36,7 @@
</div>
<div>
<q-btn-toggle
v-if="arrGroupsList.length > 0"
v-if="arrTypesAccounts.length > 0"
v-model="tipoConto"
class="my-custom-toggle"
no-caps