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

Aggio App

Browse Source
This commit is contained in:
Surya Paolo
2022-12-09 03:09:16 +01:00
parent 771271fda2
commit 6a42df7861
16 changed files with 736 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

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

2
.env.example.production
View File

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

2
_ALL_SITES/riso.app/.env.development
View File

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

2
_ALL_SITES/riso.app/.env.production
View File

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

2
_ALL_SITES/riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.30"
APP_VERSION="0.5.31"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/terradellavisione.app/.env.development
View File

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

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

@@ -310,8 +310,6 @@
/>
</div>
</div>
<q-page-container>
<q-page>
<q-infinite-scroll
ref="myinfscroll"
v-if="shared_consts.VERTIC_SHOW_GRID.includes(myvertical)"
@@ -344,9 +342,7 @@
shared_consts.TABLES_VISU_CMYSRECCARD.includes(tablesel))
"
>
<div
v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)"
>
<div v-if="row && shared_consts.TABLES_WITH_DATE.includes(tablesel)">
<div
v-if="
row.dateTimeStart &&
@@ -447,10 +443,7 @@
` 100%)`
"
>
<q-toolbar
class="bg-primary text-white"
style="min-height: 30px"
>
<q-toolbar class="bg-primary text-white" style="min-height: 30px">
<q-toolbar-title>
{{
tools.isEntrataByRecMov(row)
@@ -463,13 +456,7 @@
<div v-for="col in mycolumns" :key="col.name">
<div
v-if="
showColCheck(
col,
tools.TIPOVIS_SHOW_RECORD,
true,
1,
row
)
showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true, 1, row)
"
class="tdclass"
>
@@ -550,9 +537,7 @@
class="text-italic text-weight-bold"
>
<span
v-if="
col && showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true)
"
v-if="col && showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true)"
>
{{ col.label }}
</span>
@@ -861,13 +846,7 @@
<q-td v-for="col in mycolumns" :key="col.name" :props="props">
<div
v-if="
showColCheck(
col,
tools.TIPOVIS_SHOW_RECORD,
true,
1,
props.row
)
showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true, 1, props.row)
"
class="tdclass"
>
@@ -875,7 +854,9 @@
<CMyPopupEdit
:table="mytable"
:canEdit="canEdit"
:canModify="tools.canModifyThisRec(props.row, tablesel) || editOn"
:canModify="
tools.canModifyThisRec(props.row, tablesel) || editOn
"
:disable="disabilita()"
:mycol="col"
v-model:row="props.row"
@@ -925,7 +906,8 @@
>
<q-bar
v-if="
!visuinpage && (tools.canModifyThisRec(props.row, tablesel) || editOn)
!visuinpage &&
(tools.canModifyThisRec(props.row, tablesel) || editOn)
"
dense
class="bg-primary text-white full-height"
@@ -961,8 +943,7 @@
clickFunz(
props.row,
prop_mycolumns.find(
(rec) =>
rec.action === lists.MenuAction.CAN_EDIT_TABLE
(rec) => rec.action === lists.MenuAction.CAN_EDIT_TABLE
)
)
"
@@ -978,8 +959,7 @@
clickFunz(
props.row,
prop_mycolumns.find(
(rec) =>
rec.action === lists.MenuAction.DELETE_RECTABLE
(rec) => rec.action === lists.MenuAction.DELETE_RECTABLE
)
)
"
@@ -1024,7 +1004,8 @@
:table="mytable"
:canEdit="canEdit"
:canModify="
tools.canModifyThisRec(props.row, tablesel) || editOn
tools.canModifyThisRec(props.row, tablesel) ||
editOn
"
:disable="disabilita()"
:mycol="col"
@@ -1063,8 +1044,6 @@
@click="createNewRecordDialog"
/>
</q-page-sticky>
</q-page>
</q-page-container>
<q-dialog
v-model="visupagedialog"
@@ -1118,7 +1097,9 @@
<CMyPopupEdit
:table="mytable"
:canEdit="true"
:canModify="tools.canModifyThisRec(rowclicksel, tablesel) || editOn"
:canModify="
tools.canModifyThisRec(rowclicksel, tablesel) || editOn
"
:disable="disabilita()"
:isInModif="mycol.isInModif"
view="field"
@@ -1145,7 +1126,6 @@
:maximized="$q.screen.lt.sm"
permanent
>
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
Nuovo:
@@ -1316,7 +1296,9 @@
<CMyPopupEdit
:table="mytable"
:canEdit="true"
:canModify="tools.canModifyThisRec(recModif, tablesel) || editOn"
:canModify="
tools.canModifyThisRec(recModif, tablesel) || editOn
"
:tablesel="col.tablesel"
:mycol="col"
:isInModif="true"

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

@@ -86,6 +86,10 @@ export default defineComponent({
//$router.push(link)
}
function getNameToShow(user: IUserFields) {
return userStore.getNameToShow(user)
}
onMounted(mounted)
@@ -105,6 +109,7 @@ export default defineComponent({
cmdExt,
visupage,
showBadge,
getNameToShow,
}
},
})

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

@@ -35,7 +35,6 @@
<q-item-section @click="navigaExt(myrec)">
<q-item-label lines="1" class="full-width" >
<span v-for="(rec, ind) of tools.getArrSubSector(table, myrec)" :key="ind">
<q-chip dense class="text-center shadow-5 glossy text-white bg-green">{{ rec.descr }}</q-chip>
</span>
@@ -51,7 +50,7 @@
<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> -
<span class="text-weight-bold">{{ getNameToShow(myrec) }}</span> -
<span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }} ({{ rec.prov }})</span>
</q-item-label>

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

@@ -41,7 +41,7 @@
<q-icon name="fas fa-lock"></q-icon></span>
<span v-if="myrec.visibility.includes(shared_consts.Visibility_Group.HIDDEN)" class="q-mr-xs">
<q-icon name="fas fa-eye-slash"></q-icon></span>
<span class="text-weight-bold">{{ myrec.username }}</span> -
<span class="text-weight-bold">{{ getNameToShow(myrec) }}</span> -
<span v-for="(rec, ind) of myrec.mycities" :key="ind"><span v-if="ind > 0">, </span>{{ rec.comune }}</span>
</q-item-label>

4
src/components/CRegistration/CRegistration.vue
View File

@@ -21,8 +21,8 @@
outline
icon="fas fa-envelope"
size="md"
color="black"
text-color="white"
:color="$q.dark.isActive ? `black` : `white`"
:text-color="$q.dark.isActive ? `white` : `black`"
to="/signup"
:label="$t('reg.byemail')"
>

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

@@ -1,4 +1,4 @@
<template>
ù<template>
<div>
<div class="q-my-sm q-gutter-xs q-py-xs">
<CGridTableRec

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

@@ -219,7 +219,7 @@ const msg_it = {
youarerefusedgroup: 'Ti è stato rifiutata la richiesta di entrare in questo Gruppo (per info chiedi all\'amministratore del gruppo)',
youarerefusedcircuit: 'Ti è stato rifiutata la richiesta di entrare in questo Circuito (per info chiedi all\'amministratore del gruppo)',
insertgoodorservices_to_start_circuit: 'Per poter inviare monete è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
insertgoodorservices_to_enter_circuit: 'Per poter entrare nel Circuito è necessario aggiungere almeno un Bene o Servizio, con la voglia di proporsi ed accettare i RIS come scambio.',
insertgoodorservices_to_enter_circuit: 'Per poter entrare nel Circuito è necessario aggiungere almeno un Bene, Servizio o offrire Ospitalità',
deletedgroup: 'Gruppo Eliminato',
domanda_addtofriend: 'Aggiungere agli amici {username}?',
domanda_addtogroup: 'Aggiungi {username} al gruppo {groupname}?',
@@ -743,6 +743,7 @@ const msg_it = {
sendmsg_error: 'Messaggio non inviato. Riprovare più tardi',
sendmsg_sent: 'Messaggio Inviato',
sendmsg_sent_sharedlink: 'Condividi il messaggio che ti è appena arrivato sulla Chat Telegram',
sendmsg_sent_sharedlink_copied: 'Messaggio copiato. Ora incollalo nel messaggio da inviare.',
sendmsgs_sent: 'Messaggi Inviati',
err_sendmsg: 'Errore durante l\'invio del Messaggio',
booking: 'Prenota Evento',

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

@@ -831,7 +831,7 @@ export const colmyGoods = [
name: 'note', label_trans: 'proj.descrapprof', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
minlength: 50,
// minlength: 50,
isadvanced_field: true,
required: false,
}),

25
src/store/UserStore.ts
View File

@@ -427,6 +427,20 @@ export const useUserStore = defineStore('UserStore', {
return `(${username})`
},
getNameToShow(user: IUserFields): string {
let name = ''
if (!!user.name)
name = user.name
if (!!user.surname)
name += ' ' + user.surname
if (!name) {
name = user.username
}
return name
},
getUserByUserId(userId: string): IUserFields | null {
// Check if is this User!
if (this.my._id === userId) return this.my
@@ -1239,18 +1253,29 @@ export const useUserStore = defineStore('UserStore', {
},
async sendMsgToBotTelegram($q: any, t: any, mydata: IMsgGlobParam, showmsgsent: boolean) {
const globalStore = useGlobalStore()
return Api.SendReq('/users/mgt', 'POST', { mydata })
.then((res) => {
console.log('res', res)
let msgok = (res.data.nummsgsent === 1) ? res.data.nummsgsent + ' ' + t('cal.sendmsg_sent') : res.data.nummsgsent + ' ' + t('cal.sendmsgs_sent')
if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
if (tools.isTelegOk()) {
msgok = t('cal.sendmsg_sent_sharedlink') + ' ' + tools.getBotName()
} else {
msgok = t('cal.sendmsg_sent_sharedlink_copied')
}
showmsgsent = true
}
if (showmsgsent && res.data.nummsgsent >= 0) {
tools.showPositiveNotif($q, msgok)
if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
if (!tools.isTelegOk()) {
// console.log('text', res.data.text)
tools.copyStringToClipboardSilent(res.data.text)
}
if (res.data.textsent) {
return res.data.textsent
}

2
src/views/user/myactivities/myactivities.vue
View File

@@ -92,7 +92,7 @@
:table="card.table"
:filtercustom="filtroutente"
:butt_modif_new="isMyRecord(myuser.username)"
visuinpage="true"
:visuinpage="true"
/>
</div>
</div>