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

++ aggiunta la prenotazione negli eventi. con la lista degli utenti.

Browse Source
This commit is contained in:
Surya Paolo
2023-04-17 00:11:45 +02:00
parent 6f1f962c0a
commit 3cf4562285
38 changed files with 2016 additions and 1278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/messages/messages.ts
View File

@@ -68,7 +68,7 @@ export default defineComponent({
const lastmsg: IMessage = messageStore.getlasts_messages().slice(-1)[0]
console.log('lastmsg', lastmsg)
if (lastmsg) {
return (lastmsg.origin!.username !== Username()) ? lastmsg.origin!.username : lastmsg.origin!.username
return (lastmsg.origin !== Username()) ? lastmsg.origin : lastmsg.origin
} else {
return ''
}
@@ -180,8 +180,8 @@ export default defineComponent({
}
function selChat(mymsg: IMessage) {
if (chatsel.value.username !== mymsg.dest!.username)
$router.replace('/messages/' + mymsg.dest!.username)
if (chatsel.value.username !== mymsg.dest)
$router.replace('/messages/' + mymsg.dest)
else {
// refresh
refreshdata(chatsel.value.username)
@@ -205,13 +205,11 @@ export default defineComponent({
function sendMsg() {
const data: IMessage = {
dest: {
idapp: process.env.APP_ID,
username: chatsel.value.username
},
origin: '',
dest: chatsel.value.username,
message: mytexttosend.value
}
data.dest!.username = chatsel.value.username
data.dest = chatsel.value.username
data.message = mytexttosend.value
mytexttosend.value = ''

4
src/views/messages/messages.vue
View File

@@ -31,7 +31,7 @@
<q-item
clickable
:active="isMenuActive(msg.dest.username)"
:active="isMenuActive(msg.dest)"
active-class="active-user"
v-for="(msg, index) in lasts_messages()"
:key="index"
@@ -117,7 +117,7 @@
<div>
<div
class="chat_dest"
v-if="msg.dest.username === Username()"
v-if="msg.dest === Username()"
>
<q-chat-message
:name="getUsernameChatByMsg(msg)"

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

@@ -487,7 +487,6 @@ export default defineComponent({
showonlymine,
tabellare,
showsaldi,
extraparams_groups,
filterextra_group,
groupsListAdmin,
groupnameSel,

5
src/views/user/myfriends/myfriends.ts
View File

@@ -71,11 +71,6 @@ export default defineComponent({
})
function extraparams() {
let lk_tab = 'users'
let lk_LF = 'userId'
let lk_FF = '_id'
let lk_as = 'user'
let af_objId_tab = 'myId'
return {
lookup1: {

39
src/views/user/mygroup/mygroup.ts
View File

@@ -175,37 +175,6 @@ export default defineComponent({
}
return site
}
function extraparams() {
let lk_tab = 'users'
let lk_LF = 'userId'
let lk_FF = '_id'
let lk_as = 'user'
let af_objId_tab = 'myId'
return {
lookup1: {
lk_tab,
lk_LF,
lk_FF,
lk_as,
af_objId_tab,
lk_proj: {
username: 1,
name: 1,
surname: 1,
'profile.img': 1,
'profile.mygroups': 1,
'profile.qualifica': 1,
'profile.resid_province': 1,
reported: 1,
date_report: 1,
username_who_report: 1,
}
},
}
}
function extraparams_rich() {
return {
querytype: shared_consts.QUERYTYPE_MYGROUP,
@@ -239,6 +208,12 @@ export default defineComponent({
}
}
function filtroeventsgroup() {
if (mygrp.value)
return [{ groupname: mygrp.value.groupname }]
else
return null
}
onMounted(mounted)
@@ -265,7 +240,6 @@ export default defineComponent({
searchList,
colmyUserPeople,
colmyUserGroup,
extraparams,
extraparams_rich,
extraparams_refused,
tab,
@@ -287,6 +261,7 @@ export default defineComponent({
tabcircuit,
circuitIndex,
circuitslistOpt,
filtroeventsgroup,
}
}
})

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

@@ -173,12 +173,6 @@
name="info"
icon="fas fa-info"
></q-tab>
<q-tab
v-if="!!mygrp.note"
:label="t('groups.page')"
name="page"
icon="fas fa-file-word"
></q-tab>
<q-tab
v-if="
tools.iCanShowGroupsMember(mygrp) ||
@@ -197,6 +191,11 @@
name="circuits"
icon="fas fa-coins"
></q-tab>
<q-tab
:label="t('groups.events')"
name="events"
icon="fas fa-bullhorn"
></q-tab>
</q-tabs>
<q-tab-panels v-model="tabgrp" animated>
@@ -356,15 +355,21 @@
</div>
</q-card-section>
</q-card>
</q-tab-panel>
<q-card v-if="mygrp.note">
<q-card-section>
<div class="text-h6">Pagina:</div>
</q-card-section>
<q-separator />
<q-tab-panel name="page">
<div v-if="mygrp.note">
<br />
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div v-if="mygrp.note" v-html="mygrp.note"></div>
</div>
</div>
<q-card-section>
<div v-if="mygrp.note">
<br />
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div v-if="mygrp.note" v-html="mygrp.note"></div>
</div>
</div>
</q-card-section>
</q-card>
</q-tab-panel>
<q-tab-panel
@@ -394,39 +399,6 @@
</q-tabs>
<q-tab-panels v-model="tabmembers" animated>
<q-tab-panel name="all">
<CGridTableRec
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
:prop_mycolumns="colmyUserPeople"
prop_colkey="_id"
col_title="username"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Iscritto"
:prop_search="true"
hint="Username da trovare"
:finder="false"
:choose_visutype="true"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="Username non trovato"
:arrfilters="arrfilterand"
:filtercustom="filtercustom"
:prop_searchList="searchList"
:showType="costanti.SHOW_USERINFO"
:showCol="false"
:extrafield="groupname"
:extraparams="extraparams()"
:visufind="
tools.iAmAdminGroup(groupname)
? costanti.REQ_REMOVE_USER_TO_GROUP
: costanti.FIND_PEOPLE
"
>
</CGridTableRec>
</q-tab-panel>
<q-tab-panel name="rich">
<CGridTableRec
prop_mytable="mygroups"
@@ -520,8 +492,10 @@
></q-tab>
</q-tabs>
</q-tab-panel>
<q-tab-panel name="events"> </q-tab-panel>
</q-tab-panels>
<div v-if="tabgrp === 'circuits' && tabcircuit === 'info'">
<q-tab-panels v-model="tabcircuit" animated>
<q-tab-panel name="info" style="max-width: 500px">
<div v-for="(circuit, ind) of circuitslist" :key="ind">
@@ -534,80 +508,130 @@
/>
</div>
</q-tab-panel>
<q-tab-panel name="mov">
<div v-if="circuitslist && circuitslist.length > 0">
<q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec
v-if="tabellare && !loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovementTable"
prop_colkey="_id"
col_title="Lista Movimenti"
:vertical="0"
nodataLabel="Nessun Movimento effettuato"
:prop_search="true"
:enableExport="true"
hint="nota da trovare (tabella)"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="movimenti non trovati con questa ricerca"
filterextra=""
:prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS"
:showCol="true"
:showHeaderCol="true"
:extraparams="getExtraparams_movs_grp(circuitslist[circuitIndex])"
extrafield=""
:visufind="costanti.FRIENDS"
>
</CGridTableRec>
<CGridTableRec
v-else-if="!loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovement"
prop_colkey="_id"
col_title="Lista Movimenti"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Movimento effettuato"
:enableExport="true"
:prop_search="true"
hint="nota da trovare"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="movimenti non trovati con questa ricerca"
:prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS"
:showCol="false"
:showHeaderCol="false"
:extraparams="getExtraparams_movs_grp(circuitslist[circuitIndex])"
extrafield=""
:visufind="costanti.FRIENDS"
>
</CGridTableRec>
</div>
</q-tab-panel>
</q-tab-panels>
</div>
<div v-if="tabgrp === 'circuits' && tabcircuit === 'mov'">
<div v-if="circuitslist && circuitslist.length > 0">
<q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec
v-if="tabellare && !loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovementTable"
prop_colkey="_id"
col_title="Lista Movimenti"
:vertical="0"
nodataLabel="Nessun Movimento effettuato"
:prop_search="true"
:enableExport="true"
hint="nota da trovare (tabella)"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="movimenti non trovati con questa ricerca"
filterextra=""
:prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS"
:showCol="true"
:showHeaderCol="true"
:extraparams="
getExtraparams_movs_grp(circuitslist[circuitIndex])
"
extrafield=""
:visufind="costanti.FRIENDS"
>
</CGridTableRec>
<CGridTableRec
v-else-if="!loading"
prop_mytable="movements"
prop_mytitle=""
:prop_mycolumns="colmyMovement"
prop_colkey="_id"
col_title="Lista Movimenti"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Movimento effettuato"
:enableExport="true"
:prop_search="true"
hint="nota da trovare"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="movimenti non trovati con questa ricerca"
:prop_pagination="{
sortBy: 'transactionDate',
descending: true,
page: 1,
rowsNumber: 20,
rowsPerPage: 20,
}"
:showType="costanti.SHOW_MOVEMENTS"
:showCol="false"
:showHeaderCol="false"
:extraparams="
getExtraparams_movs_grp(circuitslist[circuitIndex])
"
extrafield=""
:visufind="costanti.FRIENDS"
>
</CGridTableRec>
</div>
</div>
<div v-if="tabgrp === 'events'">
<CSkill
v-if="filtroeventsgroup()"
:groupname="mygrp.groupname"
:table="shared_consts.TABLES_MYBACHECAS"
:filtercustom="filtroeventsgroup()"
:butt_modif_new="true"
:visuinpage="true"
:noaut="false"
:title="$t('groups.events')"
/>
</div>
<div v-if="tabgrp === 'members' && tabmembers === 'all'">
<CGridTableRec
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
:prop_mycolumns="colmyUserPeople"
prop_colkey="_id"
col_title="username"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Iscritto"
:prop_search="true"
hint="Username da trovare"
:finder="false"
:choose_visutype="true"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="Username non trovato"
:arrfilters="arrfilterand"
:filtercustom="filtercustom"
:prop_searchList="searchList"
:showType="costanti.SHOW_USERINFO"
:showCol="false"
:extrafield="groupname"
:extraparams="tools.extraparams(shared_consts.TABMYGROUPS)"
:visufind="
tools.iAmAdminGroup(groupname)
? costanti.REQ_REMOVE_USER_TO_GROUP
: costanti.FIND_PEOPLE
"
>
</CGridTableRec>
</div>
</div>
<div
v-else