fix: ordinamento membri (namecomplete (concat: name, surname, username)

This commit is contained in:
Surya Paolo
2023-04-12 15:37:47 +02:00
parent cfed7552b1
commit fb68df418d
28 changed files with 136 additions and 103 deletions

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

View File

@@ -1,4 +1,4 @@
APP_VERSION="0.6.3"
APP_VERSION="0.6.4"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

View File

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto..."
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

View File

@@ -19,7 +19,7 @@ sleep 1
npm run buildpwa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
cp .env.prod.bak .env.production

View File

@@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto..."
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

View File

@@ -19,7 +19,7 @@ sleep 1
npm run buildspa
echo "Sincronizzazione $SERVERDIR_WEBSITE in remoto..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
cp .env.prod.bak .env.production

View File

@@ -1 +0,0 @@
../../IMGS/upload

View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

View File

@@ -5,7 +5,7 @@ source .env.test.risosrv
cp .env.test.risosrv .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 5522' -a dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/
rsync -e 'ssh -p 5522' -a --exclude 'upload' dist/pwa/ root@risosrv:/home/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

View File

@@ -5,7 +5,7 @@ source ./.env.test
cp .env.test .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

View File

@@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE "
fi

View File

@@ -5,7 +5,7 @@ source ./.env.test
cp .env.test .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/spa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

View File

@@ -1115,6 +1115,9 @@ export const shared_consts = {
TYPEDIR_HANDSHAKE: 10,
ID_HANDSHAKE_ACCEPTED: 2,
TYPEDIR_FAVORITE: 11,
ID_FAVORITE_ADDED: 1,
TYPEDIR_TEST: 444,
ID_TEST_NEW_REC: 1,
},
@@ -1151,6 +1154,18 @@ export const shared_consts = {
}
],
},
{
value: 11, //
labeltrans: 'typenotifs.favorite',
descr: 'typenotifs.favorite_descr',
icon: 'far fa-heart',
list: [
{
value: 1, // ID_FAVORITE_ADDED
labeltrans: 'notifsid.favorite_new',
}
],
},
{
value: 2, //
labeltrans: 'typenotifs.events',
@@ -1260,6 +1275,11 @@ export const shared_consts = {
labeltrans: 'notifsid.circuits_new',
directory: 5,
},
{
value: 1, //
labeltrans: 'notifsid.favorite_new',
directory: 11,
},
],
CIRCUIT_STATUS: {
@@ -1585,6 +1605,8 @@ export const shared_consts = {
reported: 1,
date_report: 1,
username_who_report: 1,
namecomplete: 1,
date_reg: 1,
};
if (proj_add)
@@ -1593,4 +1615,26 @@ export const shared_consts = {
return proj;
},
getDirectoryByTable(table: string, barre?: boolean) {
let add = '';
if (barre)
add = '/';
if (table === 'myskills') {
return add + 'myservice' + add
} else if (table === 'mybachecas') {
return add + 'mypage' + add
} else if (table === 'myhosps') {
return add + 'myhosps' + add
} else if (table === 'mygoods') {
return add + 'mygood' + add
} else if (table === 'mygroups') {
return add + 'grp' + add
} else if (table === 'circuits') {
return add + 'circuit' + add
}
return ''
},
}

View File

@@ -440,7 +440,7 @@ export default defineComponent({
watch(() => ordinam.value, (to: any, from: any) => {
if (pagination.value.sortBy !== ordinam.value) {
tools.setCookie('s_ordinam_' + props.prop_mytable, ordinam.value)
tools.setCookie('s_ordinamnew_' + props.prop_mytable, ordinam.value)
// pagination.value.sortBy = getObjSort(ordinam.value, ordinam_desc.value)
// refresh()
}
@@ -628,6 +628,9 @@ export default defineComponent({
if ((field === 'date_reg') || (field === 'numMembers')) {
return -1;
}
if (field === 'namecomplete') {
return 1;
}
return precorder ? precorder : 1;
}
@@ -1038,7 +1041,7 @@ export default defineComponent({
pagination.value.rowsPerPage = rowsPerPage
//pagination.value.sortBy = getObjSort(sortBy, descending)
pagination.value.sortBy = sortBy
ordinam.value = sortBy
// ordinam.value = sortBy
ordinam_desc.value = descending
pagination.value.descending = descending
@@ -1115,7 +1118,7 @@ export default defineComponent({
pagination.value.page = page
pagination.value.rowsPerPage = rowsPerPage
pagination.value.sortBy = getObjSort(sortBy, descending)
ordinam.value = sortBy
// ordinam.value = sortBy
ordinam_desc.value = descending
pagination.value.descending = descending
@@ -1159,7 +1162,7 @@ export default defineComponent({
}
function refresh_infscroll(done: any) {
// console.log('refresh_infscroll')
// console.log('refresh_infscroll', 'pag', pagination.value.rowsNumber)
rowclicksel.value = null
onUpdateData(0,
@@ -1511,10 +1514,10 @@ export default defineComponent({
if (!shared_consts.TABLES_ORDER_DATE_UPDATED.includes(tablesel.value) &&
!shared_consts.TABLES_ORDER_DESCR.includes(tablesel.value)) {
console.log('get cookie)')
let v1 = tools.getCookie('s_ordinam_' + tablesel.value, null)
let v1 = tools.getCookie('s_ordinamnew_' + tablesel.value, null)
if (v1)
ordinam.value = v1
let v2 = tools.getCookie('s_ordinam_des_' + tablesel.value, null)
let v2 = tools.getCookie('s_ordinamnew_des_' + tablesel.value, null)
if (v2)
ordinam_desc.value = v2
}
@@ -2130,7 +2133,7 @@ export default defineComponent({
function onLoadScroll(index: number, done: any) {
if (index > 1) {
// console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
// console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber, 'PAGE: ', pagination.value.page)
if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) {
if (pagination.value.rowsNumber === 0) {
pagination.value.page = 0
@@ -2142,6 +2145,7 @@ export default defineComponent({
done(true)
}
} else {
// console.log('DONE .....................')
done()
}
}

View File

@@ -105,7 +105,6 @@
<q-tab-panels
v-model="mytab"
animated
swipeable
vertical
transition-prev="jump-up"
transition-next="jump-up"

View File

@@ -136,15 +136,15 @@ export default defineComponent({
return null
}
function clicca(tipo: any, set: any, title: string) {
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
function clicca(tipo: any, myset: any, title: string) {
if (myset && tipo === costanti.TIPOFAVBOOK.FAVORITE) {
userStore.setFavorite($q, t, myrec.value._id, props.table, myrec.value);
}
if (set && myrec.value.username !== userStore.my.username && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
if (myset && tipo === costanti.TIPOFAVBOOK.BOOKMARK) {
userStore.setBookmark($q, t, myrec.value._id, props.table, myrec.value);
}
if (!set) {
if (!myset) {
usersList.value.show = true;
usersList.value.title = title;
usersList.value.list = myrec.value.myfav;

View File

@@ -86,7 +86,7 @@ export default defineComponent({
function navigaExt(obj: any) {
cmdExt(costanti.CMD_SHOW_PAGE, obj, null)
//let link = tools.getDirectoryByTable(props.table) + '/' + obj._id
//let link = shared_consts.getDirectoryByTable(props.table) + '/' + obj._id
//console.log('link', link)
//$router.push(link)
}

View File

@@ -178,6 +178,10 @@ export default function () {
if (notif.status === shared_consts.StatusNotifs.STATUS_HANDSHAKE_ACCEPTED) {
descr += '<br><em>' + $t('handshake.accepted') + '</em>'
}
} else if (notif.typedir === shared_consts.TypeNotifs.TYPEDIR_FAVORITE) {
// if (notif.status === shared_consts.StatusNotifs.STATUS_HANDSHAKE_ACCEPTED) {
// descr += '<br><em>' + $t('handshake.accepted') + '</em>'
// }
} else if (notif.typedir === shared_consts.TypeNotifs.TYPEDIR_CIRCUITS) {
if (notif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ) {
// console.log('notif.extrarec', notif.extrarec)

View File

@@ -816,6 +816,7 @@ export interface IMsgGlobParam {
text?: string
typesend: number
sendreally?: boolean
textaddTelegram?: string
}
export interface IDataToSet {

View File

@@ -873,6 +873,8 @@ const msg_it = {
booking: 'Prenotazioni',
test: 'Test',
test_descr: 'Test descr',
favorite: 'Preferiti',
favorite_descr: 'Notificami se una persona mette "Mi Piace" su un tuo annuncio o post',
},
notifsid: {
bacheca_new_good: 'Nuovo Bene',
@@ -882,6 +884,7 @@ const msg_it = {
groups_new: 'Si creano Nuovi Gruppi',
circuits_new: 'Si creano Nuovi Circuiti',
test_new: 'Nuovo Test',
favorite_new: '"Mi Piace" su un tuo annuncio o post',
},
event: {
_id: 'id',

View File

@@ -6981,23 +6981,6 @@ export const tools = {
}
},
getDirectoryByTable(table: string) {
if (table === toolsext.TABMYSKILLS) {
return 'myservice'
} else if (table === toolsext.TABMYBACHECAS) {
return 'mypage'
} else if (table === toolsext.TABMYHOSPS) {
return 'myhosps'
} else if (table === toolsext.TABMYGOODS) {
return 'mygood'
} else if (table === toolsext.TABMYGROUPS) {
return 'grp'
} else if (table === toolsext.TABCIRCUITS) {
return 'circuit'
}
return ''
},
getFullFileName(arrimage: IImgGallery[], table: string, username: string, groupname: string) {
// console.log('arrimage', arrimage)
@@ -7052,21 +7035,21 @@ export const tools = {
},
getPathByGroup(grp: any, table: string) {
return '/' + tools.getDirectoryByTable(table) + '/' + grp.groupname
return '/' + shared_consts.getDirectoryByTable(table) + '/' + grp.groupname
},
getPathByCircuit(circuit: any, table: string) {
return '/' + tools.getDirectoryByTable(table) + '/' + circuit.path
return '/' + shared_consts.getDirectoryByTable(table) + '/' + circuit.path
},
getPathByTable(table: string, pagename: string) {
return '/' + tools.getDirectoryByTable(table) + '/' + pagename
return '/' + shared_consts.getDirectoryByTable(table) + '/' + pagename
},
getPathByTableAndRec(table: string, rec: any) {
if (shared_consts.TABLES_REC_ID.includes(table)) {
return '/' + tools.getDirectoryByTable(table) + '/' + rec['_id']
return '/' + shared_consts.getDirectoryByTable(table) + '/' + rec['_id']
} else if (table === toolsext.TABMYGROUPS) {
return this.getPathByGroup(rec, table)
} else if (table === toolsext.TABCIRCUITS) {

View File

@@ -246,10 +246,10 @@ export const useUserStore = defineStore('UserStore', {
getMypaginationMembers(): any {
return { sortBy: 'name,username', descending: '1,1', page: 1, rowsNumber: 0, rowsPerPage: 10 }
return { sortBy: 'namecomplete', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 15 }
},
getSortFieldsAvailable(): any[] {
return [{ label: 'Username', value: { 'username': 1, 'name': 1 } }, { label: 'Nome', value: { 'name': 1, 'username': 1 } }, { label: 'Ultimi reg.', value: { 'date_reg': -1, 'username': 1 } }]
return [{ label: 'Name e User', value: { 'namecomplete': 1 } }, { label: 'Ultimi entrati', value: { 'date_reg': -1} }]
},
IsMyFriendByUsername(username: string): boolean {

View File

@@ -339,6 +339,8 @@ export default defineComponent({
reported: 1,
date_report: 1,
username_who_report: 1,
namecomplete: 1,
date_reg: 1,
}
},
}

View File

@@ -868,7 +868,6 @@
<q-tab-panel
name="members"
style="max-width: 500px"
v-if="tools.iCanShowCircuitsMember(circuit)"
>
<q-tabs
@@ -892,51 +891,9 @@
></q-tab>
</q-tabs>
<q-tab-panels v-model="tabmembers" animated>
<q-tab-panels v-model="tabmembers">
<q-tab-panel name="all">
<!--<q-toggle v-model="showsaldi" :label="t('movement.showsaldi')"></q-toggle>-->
<CGridTableRec
v-if="!loading"
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
:prop_mycolumns="
showsaldi ? colmyUserPeopleSaldi : colmyUserPeople
"
prop_colkey="_id"
col_title="username"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Iscritto"
:prop_search="true"
hint="Username o nome da trovare"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="Username non trovato"
:arrfilters="arrfilterand"
:filtercustom="filtercustom"
:filterextra="filterextra"
:filterextra2="filterextra2"
:prop_searchList="searchList"
:showType="costanti.SHOW_USERINFO"
:prop_pagination="userStore.getMypaginationMembers()"
:prop_SortFieldsAvailable="
userStore.getSortFieldsAvailable()
"
:showCol="false"
:labelElemFind="$t('circuit.iscritti')"
:circuitname="circuit.name"
:extraparams="extraparams()"
:visufind="
tools.iAmAdminCircuit(circuit.name)
? costanti.REQ_ADD_USER_TO_CIRCUIT
: costanti.FIND_PEOPLE
"
>
</CGridTableRec>
</q-tab-panel>
<q-tab-panel name="rich">
<CGridTableRec
@@ -1002,6 +959,43 @@
</q-tab-panel>
<q-tab-panel name="mov"> </q-tab-panel>
</q-tab-panels>
<CGridTableRec
v-if="!loading && tabmembers === 'all' && tabcircuit === 'members'"
ref="tabMembri"
prop_mytable="users"
prop_mytitle=""
:prop_mycolumns="showsaldi ? colmyUserPeopleSaldi : colmyUserPeople"
prop_colkey="_id"
col_title="username"
:vertical="costanti.VISUTABLE_LISTA"
nodataLabel="Nessun Iscritto"
:prop_search="true"
hint="Username o nome da trovare"
:finder="false"
:choose_visutype="false"
:finder_noNull="false"
:options="shared_consts.OPTIONS_SEARCH_USER_ALL_WORDS"
:butt_modif_new="false"
noresultLabel="Username non trovato"
:arrfilters="arrfilterand"
:filtercustom="filtercustom"
:filterextra="filterextra"
:filterextra2="filterextra2"
:prop_searchList="searchList"
:showType="costanti.SHOW_USERINFO"
:prop_pagination="userStore.getMypaginationMembers()"
:prop_SortFieldsAvailable="userStore.getSortFieldsAvailable()"
:showCol="false"
:labelElemFind="$t('circuit.iscritti')"
:circuitname="circuit.name"
:extraparams="extraparams()"
:visufind="
tools.iAmAdminCircuit(circuit.name)
? costanti.REQ_ADD_USER_TO_CIRCUIT
: costanti.FIND_PEOPLE
"
>
</CGridTableRec>
</div>
<div
v-else