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

se sei sulla pagina, la notifica di "gia letto" non viene settata.

Browse Source 
- aggiunto "RIS" ai tipi di contributi
- Amicizia accettata compare 2 volte nelle notifiche
- Bottone click sull utente non funziona
This commit is contained in:
Paolo Arena
2022-09-18 19:45:26 +02:00
parent da17c2b060
commit 193afa770b
23 changed files with 119 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,15 +21,17 @@ import { CNotifAtTop } from '@src/components/CNotifAtTop'
import { costanti } from '@costanti'
import { ICity, IFriends, ICircuit, ISearchList, IUserFields, IAccount } from 'model'
import { shared_consts } from '@/common/shared_vuejs'
import { colmyUserPeople, colmyUserCircuit, colmyMovement, colmyMovementTable } from '@store/Modules/fieldsTable'
import { colmyUserPeople, colmyUserPeopleSaldi, colmyUserCircuit, colmyMovement, colmyMovementTable } from '@store/Modules/fieldsTable'
import { useNotifStore } from '@store/NotifStore'
import { useCircuitStore } from '@store/CircuitStore'
export default defineComponent({
name: 'mycircuit',
components: { CProfile, CTitleBanner, CMyFieldRec, CSkill, CDateTime, CMyFriends,
CGridTableRec, CMyUser, CCheckIfIsLogged, CCurrencyValue, CSaldo, CNotifAtTop },
components: {
CProfile, CTitleBanner, CMyFieldRec, CSkill, CDateTime, CMyFriends,
CGridTableRec, CMyUser, CCheckIfIsLogged, CCurrencyValue, CSaldo, CNotifAtTop
},
props: {},
setup() {
const userStore = useUserStore()
@@ -50,8 +52,8 @@ export default defineComponent({
const filtroutente = ref(<any[]>[])
const showPic = ref(false)
const circuit = ref(<ICircuit|null>{})
const account = computed(() => circuit.value ? userStore.getAccountByCircuitId(circuit.value._id) : null )
const circuit = ref(<ICircuit | null>{})
const account = computed(() => circuit.value ? userStore.getAccountByCircuitId(circuit.value._id) : null)
const mystatus = ref(<number>0)
const users_in_circuit = ref(<IFriends[]>[])
@@ -63,6 +65,7 @@ export default defineComponent({
const tabgrp = ref('info')
const tabmembers = ref('all')
const showsaldi = ref(false)
const tab = ref('membri')
const arrfilterand: any = ref([])
@@ -110,7 +113,17 @@ export default defineComponent({
searchList.value = []
if (circuit.value) {
filtercustom.value = [{ 'profile.mycircuits': { $elemMatch: { circuitname: { $eq: circuit.value.name } } } }]
filtercustom.value = [
{
'profile.mycircuits':
{
$elemMatch: {
circuitname:
{ $eq: circuit.value.name }
}
}
},
]
}
arrfilterand.value = []
@@ -149,6 +162,7 @@ export default defineComponent({
'profile.img': 1,
'profile.mycircuits': 1,
'profile.qualifica': 1,
'account.saldo': 1,
reported: 1,
date_report: 1,
username_who_report: 1,
@@ -190,14 +204,15 @@ export default defineComponent({
function numUsers() {
return users_in_circuit.value ? users_in_circuit.value.length : 0
}
function numAdmins() {
return (circuit.value && circuit.value.admins) ? circuit.value.admins.length : 0
}
function listaAdmins() {
return (circuit.value && circuit.value.admins) ? circuit.value.admins.map((rec) => rec.username).join(', ') : ''
}
onMounted(mounted)
return {
@@ -222,6 +237,7 @@ export default defineComponent({
colmyMovement,
colmyMovementTable,
colmyUserPeople,
colmyUserPeopleSaldi,
colmyUserCircuit,
extraparams,
extraparams_rich,
@@ -244,6 +260,7 @@ export default defineComponent({
saldo,
showonlymine,
tabellare,
showsaldi,
}
}
})

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

@@ -65,6 +65,7 @@
<q-menu>
<q-list v-if="true" style="min-width: 150px">
<q-item clickable v-close-popup
v-if="saldo === 0"
@click="tools.removeFromMyCircuits($q, userStore.my.username, circuit.name, $t('circuit.domanda_exit_fromcircuit', {circuitname: circuit.name }))">
<q-item-section avatar>
<q-icon color="negative" name="fas fa-user-minus"/>
@@ -108,7 +109,7 @@
<q-tab-panels v-model="tabgrp" animated>
<q-tab-panel name="mov">
<q-toggle v-model="showonlymine" label="Mostra solo i miei movimenti"></q-toggle>
<q-toggle v-model="showonlymine" :label="t('movement.onlymymov')"></q-toggle>
<q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec
@@ -335,11 +336,13 @@
<q-tab-panels v-model="tabmembers" animated>
<q-tab-panel name="all">
<!--<q-toggle v-model="showsaldi" :label="t('movement.showsaldi')"></q-toggle>-->
<CGridTableRec
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
:prop_mycolumns="colmyUserPeople"
:prop_mycolumns="showsaldi ? colmyUserPeopleSaldi : colmyUserPeople"
prop_colkey="_id"
col_title="username"
:vertical="costanti.VISUTABLE_LISTA"