surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

InfiniteScroll 3

Browse Source 
fix user list
send telegram text
invited show in profile
This commit is contained in:
paoloar77
2022-08-18 05:26:21 +02:00
parent 8a41aff739
commit ed6abf2b07
23 changed files with 131 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<!--<q-layout view="lHh Lpr lFf" class="shadow-2 rounded-borders">--->
<q-layout view="hHh lpR fFf" class="shadow-2 rounded-borders">
<q-layout view="hHh lpr fFf" class="shadow-2 rounded-borders">
<app-header></app-header>
<q-ajax-bar></q-ajax-bar>

4
src/common/shared_vuejs.ts
View File

@@ -661,6 +661,7 @@ export const shared_consts = {
CmdToSend: {
SHARE_MSGREG: 1,
SHARE_TEXT: 2,
},
TypeMsg: {
@@ -848,7 +849,8 @@ export const shared_consts = {
},
MsgTeleg: {
SHARE_MSGREG: 1
SHARE_MSGREG: 1,
SHARE_TEXT: 2,
},
TypeMsgTemplate: {

12
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -850,7 +850,7 @@ export default defineComponent({
// calculate starting row of data
const startRow = numRecLoaded.value
const endRow = startRow + fetchCount
console.log('startRow', startRow, 'endRow', endRow, 'rowsNumber', pagination.value.rowsNumber)
// console.log('startRow', startRow, 'endRow', endRow, 'rowsNumber', pagination.value.rowsNumber)
if ((startRow < pagination.value.rowsNumber) || clickbuttsearch.value) {
@@ -859,14 +859,14 @@ export default defineComponent({
return fetchFromServer(startRow, endRow, myfilternow, myfilterandnow, sortBy, descending).then((ris: any) => {
pagination.value.rowsNumber = getRowsNumberCount(myfilter)
console.log(' ...rowsNumber', pagination.value.rowsNumber)
// console.log(' ...rowsNumber', pagination.value.rowsNumber)
if (returnedData.value === []) {
// no more data
} else {
try {
numRecLoaded.value = numRecLoaded.value + (returnedData.value ? returnedData.value.length : 0)
console.log(' ...numRecLoaded.value', numRecLoaded.value)
// console.log(' ...numRecLoaded.value', numRecLoaded.value)
serverData.value = [...serverData.value, ...returnedData.value]
} catch (e) {
serverData.value = []
@@ -890,7 +890,7 @@ export default defineComponent({
myinfscroll.value.resume()
}
console.log(' ...DONE ')
// console.log(' ...DONE ')
done(pagination.value.rowsNumber === 0 ? true : false)
})
} else {
@@ -1869,7 +1869,7 @@ export default defineComponent({
}
function onLoadScroll (index: number, done: any) {
if (index > 0) {
if (index > 1) {
console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) {
if (pagination.value.rowsNumber === 0) {
@@ -1881,6 +1881,8 @@ export default defineComponent({
} else {
done(true)
}
} else{
done()
}
}
// onMounted(mounted)

80
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -35,7 +35,7 @@
</q-inner-loading>
<div v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)">
<div v-if="(prop_search || canEdit)" class="q-my-xs text-right">
<div v-if="(prop_search || canEdit) && finder" class="q-my-xs text-right">
<q-btn size="sm" dense icon="fas fa-filter" :label="!showfilter ? $t('grid.showfilters') : $t('grid.hidefilters')"
@click="showfilter = !showfilter"></q-btn>
</div>
@@ -169,7 +169,7 @@
<template v-slot:prepend>
<q-icon name="search"/>
</template>
<template v-if="searchList" v-slot:after>
<template v-if="searchList && finder" v-slot:after>
<q-btn dense label="" color="primary" @click="showfilter = !showfilter" icon="fas fa-filter"></q-btn>
</template>
</q-input>
@@ -199,6 +199,7 @@
<div v-if="pagination.rowsNumber > 1 && prop_search">{{ pagination.rowsNumber }} elementi trovati</div>
</div>
<q-infinite-scroll
ref="myinfscroll"
v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"
@@ -209,36 +210,73 @@
>
<div v-for="(row, index) in serverData" :key="index" class="caption">
<div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
<div
v-if="showType === costanti.SHOW_MYCARD || (myvertical !== costanti.VISUTABLE_USER_TABGROUP && myvertical === costanti.VISUTABLE_LISTA && shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel)) ">
<div v-if="row.dateTimeStart && (tools.getstrVeryShortDate(row.dateTimeStart) !== actual)" class="actualdate">
<span style="display: none">{{ actual = tools.getstrVeryShortDate(row.dateTimeStart) }}</span>
<q-chip class="text-center shadow-5 glossy bg-orange" icon="fas fa-calendar-day">{{ tools.getstrDateLong(row.dateTimeStart) }}</q-chip>
<div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
<div v-if="row.dateTimeStart && (tools.getstrVeryShortDate(row.dateTimeStart) !== actual)" class="actualdate">
<span style="display: none">{{ actual = tools.getstrVeryShortDate(row.dateTimeStart) }}</span>
<q-chip class="text-center shadow-5 glossy bg-orange" icon="fas fa-calendar-day">{{ tools.getstrDateLong(row.dateTimeStart) }}</q-chip>
</div>
</div>
<CMyRecGrpCard
v-if="tablesel === toolsext.TABMYGROUPS"
:table="tablesel"
:prop_myrec="row"
@cmdext="cmdExt"
>
</CMyRecGrpCard>
<CMyRecCard
v-else
:table="tablesel"
:prop_myrec="row"
@cmdext="cmdExt"
>
</CMyRecCard>
</div>
<div
v-else-if="((showType === costanti.SHOW_USERINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_USER) || ((myvertical === 2) && (shared_consts.TABLES_VISU_LISTA_USER.includes(tablesel)))"
class="fill-all-width">
<div>
<CMyUser
:notsetcmd="true"
:mycontact="row"
:visu="visufind"
:groupname="extrafield"
:labelextra="col_title ? row[col_title] : ''"
:labelFooter="col_footer ? getLabelFooterByRow(row) : ''"
>
</CMyUser>
<q-separator></q-separator>
</div>
</div>
<div
v-else-if="((showType === costanti.SHOW_GROUPINFO) && myvertical !== costanti.VISUTABLE_SCHEDA_GROUP) || ((myvertical === 2) && (tablesel === 'mygroups'))"
class="fill-all-width">
<div>
<CMyGroups
v-model="filtergrp"
:finder="false"
:mygrp="row"
:visu="costanti.FIND_GROUP"
/>
</div>
</div>
<CMyRecGrpCard
v-if="tablesel === toolsext.TABMYGROUPS"
:table="tablesel"
:prop_myrec="row"
@cmdext="cmdExt"
>
</CMyRecGrpCard>
<CMyRecCard
v-else
:table="tablesel"
:prop_myrec="row"
@cmdext="cmdExt"
>
</CMyRecCard>
</div>
<template v-slot:loading>
<div class="row justify-center q-my-md">
<q-spinner-dots color="primary" size="40px"/>
</div>
</template>
</q-infinite-scroll>
<q-table
v-else
:grid="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"

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

@@ -13,8 +13,10 @@
<template v-slot:control>
<div class="self-center full-width no-outline" tabindex="0">
{{ value }}
<slot></slot>
</div>
</template>
</q-field>
</div>
</template>

7
src/components/CMyCardGrpPopup/CMyCardGrpPopup.vue
View File

@@ -72,14 +72,15 @@
<div class="row q-ma-sm q-pa-sm justify-center">
<div class="q-ma-sm">
<q-btn
icon="far fa-file-alt" label="Apri Pagina" color="primary" text-color="white"
icon="far fa-file-alt" label="Apri" color="primary" text-color="white"
:to="tools.getToByCol(col, table, myrec)"
/>
</div>
<div class="q-ma-sm">
<q-btn
color="primary" text-color="white" icon="fas fa-copy" label="Condividi Pagina"
v-if="myrec._id"
text-color="black" icon="fas fa-share-alt"
label="Condividi"
@click="condividipag"></q-btn>
</div>
</div>

5
src/components/CMyCardPopup/CMyCardPopup.ts
View File

@@ -88,7 +88,10 @@ export default defineComponent({
}
function condividipag() {
return tools.copyStringToClipboard($q, self.location.host + tools.getPathByTable(props.table, myrec.value._id), true)
const mystr = self.location.host + tools.getPathByTable(props.table, myrec.value._id)
tools.copyStringToClipboard($q, mystr, true)
tools.sendMsgTelegramCmd($q, t, shared_consts.MsgTeleg.SHARE_TEXT, false, mystr)
return true
}
function showBadge() {

12
src/components/CMyCardPopup/CMyCardPopup.vue
View File

@@ -51,7 +51,7 @@
</div>
<div v-else-if="mycol.name === 'numMaxPeopleHosp'">
<div class="text-bacheca">
<span class="accom_maxosp">{{tools.getValue(myrec, mycol.field, mycol.subfield) }}</span>{{ t('hosps.numMaxPeopleHosp') }}
<span class="accom_maxosp">{{ tools.getValue(myrec, mycol.field, mycol.subfield) }}</span>{{ t('hosps.numMaxPeopleHosp') }}
</div>
</div>
<div v-else-if="mycol.name === 'dateTimeStart'" class="text-center cal">
@@ -105,17 +105,15 @@
class="row q-ma-sm q-pa-sm justify-center">
<div class="q-ma-sm">
<q-btn
icon="far fa-file-alt" label="Apri Pagina" color="primary" text-color="white"
icon="far fa-file-alt" label="Apri" color="primary" text-color="white"
:to="tools.getToByCol(col, table, myrec)"
/>
</div>
</div>
<div v-if="myrec._id"
class="row q-ma-sm q-pa-sm justify-center">
<div class="q-ma-sm">
<q-btn
color="primary" text-color="white" icon="fas fa-copy" label="Condividi Pagina"
v-if="myrec._id"
text-color="black" icon="fas fa-share-alt"
label="Condividi"
@click="condividipag"></q-btn>
</div>
</div>

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

@@ -47,7 +47,7 @@
<!--<span class="dateevent" v-if="myrec.dateTimeStart">dal <span class="datainizio">{{tools.getstrVeryShortDate(myrec.dateStart) }}</span> al <span class="datafine">{{ tools.getstrVeryShortDate(myrec.dateEnd) }}</span>
</span>-->
</q-item-label>
<q-item-label lines="3" v-if="myrec.descr">{{ myrec.descr }}<br>
<q-item-label lines="4" v-if="myrec.descr">{{ myrec.descr }}<br>
</q-item-label>
<q-item-label lines="1" style="text-align: right" class="text_user_city">
<span class="text-weight-bold">{{ myrec.username }}</span> -

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

@@ -1,6 +1,6 @@
<template>
<div>
<div class="q-ma-sm q-gutter-sm q-pa-xs">
<div class="q-my-sm q-gutter-xs q-py-xs">
<CGridTableRec
v-if="filtercustom.length > 0 && col && col.length > 0"
:prop_mytable="table"

6
src/model/UserStore.ts
View File

@@ -107,6 +107,11 @@ export interface IPaymentType {
label: string
}
export interface IUserAport {
username: string
profile?: IUserProfile
}
export interface IUserFields {
_id: string
@@ -126,6 +131,7 @@ export interface IUserFields {
notask_verif?: boolean
trust_modified?: Date
aportador_solidario?: string
useraport?: IUserAport
made_gift?: boolean
tokens?: IToken[]

2
src/root/eventi/eventi.vue
View File

@@ -12,8 +12,6 @@
</CFinder>
<br />
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>

2
src/root/goods/goods.vue
View File

@@ -11,8 +11,6 @@
:table="toolsext.TABMYGOODS"
/>
<br />
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>

2
src/root/hosp/hosp.vue
View File

@@ -12,8 +12,6 @@
</CFinder>
<br />
</div>
<div v-else>
<CUserNonVerif></CUserNonVerif>

2
src/root/mainview/mainview.vue
View File

@@ -64,7 +64,7 @@
size="md"
rounded
:label="$t('reg.link_reg_and_msg')"
@click="tools.sendMsgTelegramCmd($q, $t, shared_consts.MsgTeleg.SHARE_MSGREG)">
@click="tools.sendMsgTelegramCmd($q, $t, shared_consts.MsgTeleg.SHARE_MSGREG, true)">
</q-btn>
</div>

1
src/root/services/services.vue
View File

@@ -11,7 +11,6 @@
:table="toolsext.TABMYSKILLS"
/>
<br />
<!--<CDashboard></CDashboard>-->
</div>

3
src/statics/lang/it.js
View File

@@ -34,6 +34,8 @@ const msg_it = {
iltuoimpegno: 'Quale è stato il tuo impegno per salvare il pianeta ad oggi?',
come_aiutare: 'Cosa vorresti fare per aiutare il pianeta?',
skills: 'Competenze e Talenti',
aportador: 'Chi ti ha invitato',
aportador_him: 'Invitato da',
},
otherpages: {
product: 'Prodotto',
@@ -1107,6 +1109,7 @@ const msg_it = {
ultimo_deper: 'Ultimo Dep.',
durata_deper: 'Durata Dep.',
img_logo: 'NomeFile Logo',
regulation: 'Regolamento',
},
account: {

1
src/store/Modules/fieldsTable.ts
View File

@@ -2393,6 +2393,7 @@ export const colTableCircuitComplete = [
AddCol({ name: 'name', label_trans: 'circuit.name' }),
AddCol({ name: 'subname', label_trans: 'circuit.subname' }),
AddCol({ name: 'longdescr', label_trans: 'circuit.descr', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'regulation', label_trans: 'circuit.regulation', fieldtype: costanti.FieldType.html }),
AddCol({ name: 'systemUserDescr', label_trans: 'circuit.systemUserDescr' }),
AddCol({ name: 'systemUserId', label_trans: 'circuit.systemUserId', fieldtype: costanti.FieldType.select, jointable: 'users', }),
AddCol({ name: 'founderUserId', label_trans: 'circuit.founderUserId', fieldtype: costanti.FieldType.select, jointable: 'users', }),

14
src/store/Modules/tools.ts
View File

@@ -5611,25 +5611,29 @@ export const tools = {
return window.location.pathname.indexOf('signup') >= 0
},
async sendMsgTelegram($q: any, $t: any, mydata: IMsgGlobParam) {
async sendMsgTelegram($q: any, $t: any, mydata: IMsgGlobParam, showmsgsent: boolean) {
const userStore = useUserStore()
return userStore.sendMsgToBotTelegram($q, $t, mydata)
return userStore.sendMsgToBotTelegram($q, $t, mydata, showmsgsent)
},
async sendMsgTelegramCmd($q: any, $t: any, cmd: number) {
async sendMsgTelegramCmd($q: any, $t: any, cmd: number, showmsgsent: boolean, text?: string, title?: string) {
let mydata: IMsgGlobParam = {
typemsg: 0,
typesend: shared_consts.TypeSend.TELEGRAM,
cmd,
content: text,
title,
}
if (cmd === shared_consts.CmdToSend.SHARE_MSGREG) {
if ((cmd === shared_consts.CmdToSend.SHARE_MSGREG) || (cmd === shared_consts.CmdToSend.SHARE_TEXT)) {
mydata.typemsg = shared_consts.TypeMsg.SEND_TO_MYSELF
// if yourself , don't need to say I send to me
showmsgsent = false
}
return this.sendMsgTelegram($q, $t, mydata)
return this.sendMsgTelegram($q, $t, mydata, showmsgsent)
},

4
src/store/UserStore.ts
View File

@@ -1140,7 +1140,7 @@ export const useUserStore = defineStore('UserStore', {
},
async sendMsgToBotTelegram($q: any, t: any, mydata: IMsgGlobParam) {
async sendMsgToBotTelegram($q: any, t: any, mydata: IMsgGlobParam, showmsgsent: boolean) {
return Api.SendReq('/users/mgt', 'POST', { mydata })
.then((res) => {
console.log('res', res)
@@ -1148,7 +1148,7 @@ export const useUserStore = defineStore('UserStore', {
if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
msgok = t('cal.sendmsg_sent_sharedlink') + ' ' + tools.getBotName()
}
if (res.data.nummsgsent >= 0) {
if (showmsgsent && res.data.nummsgsent >= 0) {
tools.showPositiveNotif($q, msgok)
return true
}

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

@@ -125,7 +125,7 @@
date: tools.getstrDateYY(mygrp.date_created), })
}}
</div>
<div class="element">
<div v-if="!!mygrp.date_updated && mygrp.date_updated !== mygrp.createdBy" class="element">
<q-icon name="fas fa-pencil-alt"></q-icon>
{{ $t('groups.lastmodify', {
date: tools.getstrDateYY(mygrp.date_updated), })
@@ -240,7 +240,9 @@
</q-tab-panel>
<q-tab-panel name="members" style="max-width: 400px;" v-if="tools.iCanShowGroupsMember(mygrp)">
<q-tabs v-model="tabmembers" class="text-blue">
<q-tabs
v-show="tools.iAmAdminGroup(groupname)"
v-model="tabmembers" class="text-blue">
<q-tab label="Tutti" name="all" icon="fas fa-users"></q-tab>
<q-tab v-if="tools.iAmAdminGroup(groupname)" label="Richieste" name="rich" icon="fas fa-user-plus"></q-tab>
<q-tab v-if="tools.iAmAdminGroup(groupname)" label="Rifiutati" name="refused" icon="fas fa-user-minus"></q-tab>

3
src/views/user/myprofile/myprofile.ts
View File

@@ -7,6 +7,7 @@ import { CCopyBtn } from '@/components/CCopyBtn'
import { CSkill } from '@/components/CSkill'
import { CDateTime } from '@/components/CDateTime'
import { CMyGroup } from '@/components/CMyGroup'
import { CMyUser } from '@/components/CMyUser'
import { CUserNonVerif } from '@/components/CUserNonVerif'
import { tools } from '@store/Modules/tools'
import { computed, defineComponent, onMounted, ref, watch } from 'vue'
@@ -28,7 +29,7 @@ import MixinUsers from '@/mixins/mixin-users'
export default defineComponent({
name: 'myprofile',
components: {
CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec,
CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CCopyBtn, CUserNonVerif, CMyFieldRec, CMyUser,
CMyGroup, CLabel
},
props: {},

18
src/views/user/myprofile/myprofile.vue
View File

@@ -172,7 +172,7 @@
size="md"
rounded
:label="$t('reg.link_reg_and_msg')"
@click="tools.sendMsgTelegramCmd($q, $t, shared_consts.MsgTeleg.SHARE_MSGREG)">
@click="tools.sendMsgTelegramCmd($q, $t, shared_consts.MsgTeleg.SHARE_MSGREG, true)">
</q-btn>
</div>
</div>
@@ -194,7 +194,7 @@
<div v-if="card.table === 'mygroups'">
<q-list>
<span v-for="(grp, index) in listgroupsfiltered" :key="index" class="q-my-sm" clickable>
<span v-for="(grp, index) in listgroupsfiltered" :key="index" class="q-my-sm q-mx-none" clickable>
<CMyGroup
:mygrp="grp"
:visu="costanti.USER_GROUPS"
@@ -258,8 +258,22 @@
</div>
<div class="col-md-6 col-sm-6 q-ma-xs col-xs-12">
<CLabel
v-if="!!myuser.useraport"
:label="t('profile.aportador_him')"
>
<CMyUser
:mycontact="myuser.useraport"
:visu="costanti.FIND_PEOPLE"
@setCmd="tools.setCmd"
>
</CMyUser>
</CLabel>
</div>
</div>
</CTitleBanner>
</div>