diff --git a/.env.development b/.env.development
index c4b5774e..21072edb 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
- APP_VERSION="0.3.5"
+APP_VERSION="0.3.6"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"
@@ -11,7 +11,7 @@ PROVA_PAOLO="PROVA ENV FUNZIONA!"
LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="http://192.168.0.200:3000"
+MONGODB_HOST="http://localhost:3000"
LOGO_REG='riso-logo-full.png'
TEST_NAME="Paolo"
TEST_SURNAME="Arena"
diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development
index 115156b0..680e080b 100755
--- a/_ALL_SITES/insiemesipuo.app/.env.development
+++ b/_ALL_SITES/insiemesipuo.app/.env.development
@@ -1,4 +1,4 @@
- APP_VERSION="0.3.5"
+ APP_VERSION="0.3.6"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js
index 550be0f5..80d7a5f2 100755
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_enUs.js
@@ -26,6 +26,7 @@ const msg_website_enUs = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
index 87efa70a..e55ba494 100755
--- a/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
+++ b/_ALL_SITES/insiemesipuo.app/db/lang/ws_it.js
@@ -25,6 +25,7 @@ const msg_website_it = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development
index 33daf0c9..1d5108c7 100755
--- a/_ALL_SITES/popolodelnuovomondo.app/.env.development
+++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development
@@ -1,4 +1,4 @@
- APP_VERSION="0.3.5"
+ APP_VERSION="0.3.6"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="12"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index c4b5774e..4530565b 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
- APP_VERSION="0.3.5"
+ APP_VERSION="0.3.6"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test
index e0199691..d897209f 100755
--- a/_ALL_SITES/riso.app/.env.test
+++ b/_ALL_SITES/riso.app/.env.test
@@ -1,4 +1,4 @@
- APP_VERSION="0.3.5"
+ APP_VERSION="0.3.6"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/riso.app/db/lang/ws_es.js b/_ALL_SITES/riso.app/db/lang/ws_es.js
index fe70b1d5..3468b00e 100755
--- a/_ALL_SITES/riso.app/db/lang/ws_es.js
+++ b/_ALL_SITES/riso.app/db/lang/ws_es.js
@@ -26,6 +26,7 @@ const msg_website_es = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/_ALL_SITES/riso.app/db/lang/ws_it.js b/_ALL_SITES/riso.app/db/lang/ws_it.js
index 8e5d1e70..924b5080 100755
--- a/_ALL_SITES/riso.app/db/lang/ws_it.js
+++ b/_ALL_SITES/riso.app/db/lang/ws_it.js
@@ -25,6 +25,7 @@ const msg_website_it = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/src/common/shared_nodejs.js b/src/common/shared_nodejs.js
index 55eae4fe..0fa7069a 100755
--- a/src/common/shared_nodejs.js
+++ b/src/common/shared_nodejs.js
@@ -79,6 +79,9 @@ module.exports = {
SEND_TO_CONSIGLIO: 5,
SEND_TO_NON_SOCI: 10,
SEND_TO_PAOLO: 20,
+ SEND_TO_USER: 25,
+ SEND_TO_GROUP: 30,
+ SEND_TO_MYSELF: 40,
},
TypeMsg_Actions: {
@@ -116,6 +119,19 @@ module.exports = {
CANCELED: 10,
},
+ MsgTeleg: {
+ SHARE_MSGREG: 1
+ },
+
+ TypeMsgTemplate: {
+ MSG_BENVENUTO_SHARE_LINK: 2000
+ },
+
+ TypeSend: {
+ PUSH_NOTIFICATION: 1,
+ TELEGRAM: 2,
+ },
+
fieldsUserToChange() {
return ['_id', 'index', 'username', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'notask_verif', 'verified_by_aportador', 'ipaddr', 'lasttimeonline', 'profile', 'calcstat', 'news_on', 'aportador_solidario', 'made_gift', 'ind_order', 'old_order', 'numinvitati', 'numinvitatiattivi', 'qualified']
},
diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 021a220a..0a7bc259 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -39,6 +39,7 @@ export const shared_consts = {
FILTER_MISSING_PAYMENT: 262144,
FILTER_TO_MAKE_MEMBERSHIP_CARD: 524288,
FILTER_MEMBERSHIP_CARD_OK: 1048576,
+ FILTER_USER_NO_VERIFIED_APORTADOR: 2097152,
OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
@@ -94,7 +95,7 @@ export const shared_consts = {
TABLES_WITH_DATE: ['mybachecas'],
TABLES_WITH_SORTING: ['mybachecas'],
TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups'],
- TABLES_REC_ID: ['skills', 'goods', 'subskills'],
+ TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'mygoods'],
// costanti.VISUTABLE_SCHEDA_USER, VISUTABLE_SCHEDA_GROUP, VISUTABLE_USER_TABGROUP
VERTIC_SHOW_GRID: [-1, 2, -3, -4],
@@ -667,12 +668,19 @@ export const shared_consts = {
Notify_ByPushNotification: 4,
},
+ CmdToSend: {
+ SHARE_MSGREG: 1,
+ },
+
TypeMsg: {
SEND_TO_ALL: 1,
SEND_TO_SOCI: 2,
SEND_TO_SOCIO_RESIDENTE: 3,
SEND_TO_NON_SOCI: 10,
SEND_TO_PAOLO: 20,
+ SEND_TO_USER: 25,
+ SEND_TO_GROUP: 30,
+ SEND_TO_MYSELF: 40,
},
TypeMsg_Actions: {
@@ -787,6 +795,19 @@ export const shared_consts = {
Need_Aportador_On_DataReg_To_Verify_Reg: 4,
},
+ MsgTeleg: {
+ SHARE_MSGREG: 1
+ },
+
+ TypeMsgTemplate: {
+ MSG_BENVENUTO: 2010,
+ MS_SHARE_LINK: 2000
+ },
+
+ TypeSend: {
+ PUSH_NOTIFICATION: 1,
+ TELEGRAM: 2,
+ },
getStatusStr(status: number) {
const trovatorec = this.OrderStatusStr.find((rec) => rec.value === status)
diff --git a/src/components/CFirstPageApp/CFirstPageApp.vue b/src/components/CFirstPageApp/CFirstPageApp.vue
index 6deedc28..7d614450 100755
--- a/src/components/CFirstPageApp/CFirstPageApp.vue
+++ b/src/components/CFirstPageApp/CFirstPageApp.vue
@@ -13,7 +13,7 @@
{{globalStore.getMsgServerError()}}
Se l'Errore persiste, significa che questo browser non riesce a collegarsi col Server.
Soluzione: Provare ad installare un altro browser:
- 👉🏻 Clicca per installare Opera per Android.
+ 👉🏻 Clicca per installare Opera per Android.
{})
const col = ref({})
function profile() {
@@ -74,6 +79,10 @@ export default defineComponent({
load()
}
+ function condividipag() {
+ return tools.copyStringToClipboard($q, self.location.host + tools.getPathByTable(props.table, myrec.value._id), true)
+ }
+
onMounted(mounted)
return {
@@ -90,6 +99,7 @@ export default defineComponent({
colCitys,
toolsext,
col,
+ condividipag,
}
}
})
diff --git a/src/components/CMyCardPopup/CMyCardPopup.vue b/src/components/CMyCardPopup/CMyCardPopup.vue
index 7ca829b2..b3b60e6d 100644
--- a/src/components/CMyCardPopup/CMyCardPopup.vue
+++ b/src/components/CMyCardPopup/CMyCardPopup.vue
@@ -1,14 +1,16 @@
-
+
+
-
+
{{ myrec.username }}
@@ -77,6 +79,36 @@
+
+
+ {{ $t('reg.pub_created') }}:
+
+
+
+ {{ $t('reg.pub_updated') }}:
+
+
+
+
+
+
+
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 6e0fbbdb..8d447f79 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -523,7 +523,7 @@
-
-
+
+
diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue
index 614b6316..55919d6e 100755
--- a/src/components/CUserNonVerif/CUserNonVerif.vue
+++ b/src/components/CUserNonVerif/CUserNonVerif.vue
@@ -25,6 +25,8 @@
:label="`Profilo di ` + tools.getAportadorSolidario()">
+
+
diff --git a/src/db/lang/ws_es.js b/src/db/lang/ws_es.js
index fe70b1d5..3468b00e 100755
--- a/src/db/lang/ws_es.js
+++ b/src/db/lang/ws_es.js
@@ -26,6 +26,7 @@ const msg_website_es = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 7f532812..e097e507 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -25,6 +25,7 @@ const msg_website_it = {
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
+ mygood2: 'mygood2',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index 9a93d52f..8376da07 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -525,6 +525,17 @@ const baseroutes: IListRoutes[] = [
inmenu: false,
infooter: false,
},
+ {
+ active: true,
+ order: 132,
+ path: '/mygood/:idGood',
+ materialIcon: '',
+ name: 'pages.mygood2',
+ component: () => import('@/views/user/mypagegood/mypagegood.vue'),
+ meta: { requiresAuth: true },
+ inmenu: false,
+ infooter: false,
+ },
{
active: true,
order: 400,
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 19fc8e39..0487e371 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -612,6 +612,22 @@ export interface IDataPass {
fieldsvalue: any
}
+export interface IMsgGlobParam {
+ typemsg: number,
+ title?: string,
+ content?: string,
+ openUrl?: string,
+ openUrl2?: string,
+ tag?: string,
+ actions?: any[],
+ cmd?: number
+ usernameOrig?: string
+ usernameDest?: string
+ groupnameDest?: string
+ text?: string
+ typesend: number
+}
+
export interface IDataToSet {
id?: string | null
username?: string
diff --git a/src/root/mainview/mainview.ts b/src/root/mainview/mainview.ts
index a1092914..1c0aa1d2 100755
--- a/src/root/mainview/mainview.ts
+++ b/src/root/mainview/mainview.ts
@@ -18,6 +18,7 @@ import { useUserStore } from '@store/UserStore'
import { static_data } from '@/db/static_data'
import MixinBase from '@/mixins/mixin-base'
import MixinUsers from '@/mixins/mixin-users'
+import { shared_consts } from '@/common/shared_vuejs'
export default defineComponent({
@@ -35,6 +36,8 @@ export default defineComponent({
static_data,
getRefLink,
userStore,
+ shared_consts,
+ globalStore,
}
},
})
diff --git a/src/root/mainview/mainview.vue b/src/root/mainview/mainview.vue
index f4c955b2..302f7546 100755
--- a/src/root/mainview/mainview.vue
+++ b/src/root/mainview/mainview.vue
@@ -11,6 +11,20 @@
+
+
+
+
+ Per Aggiornare alla nuova versione, chiudere e riaprire la APP (o il browser)
+
+
+
-
+
+
+
+
-
+
diff --git a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
index 9ca47ef8..574e7f44 100755
--- a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
+++ b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts
@@ -8,6 +8,7 @@ import { useI18n } from '@src/boot/i18n'
import { useUserStore } from '@store/UserStore'
import { useGlobalStore } from '@store/globalStore'
import { useQuasar } from 'quasar'
+import { IMsgGlobParam } from 'model'
export default defineComponent({
name: 'Sendpushnotif',
@@ -66,24 +67,16 @@ export default defineComponent({
}
function SendMsgToParam(typemsg: any) {
- interface IPushParam {
- typemsg: string,
- title: string,
- content: string,
- openUrl: string,
- openUrl2: string,
- tag: string,
- actions: any[],
- }
- let param: IPushParam = {
+ let param: IMsgGlobParam = {
typemsg,
title: title.value,
content: content.value,
openUrl: openUrl.value,
openUrl2: openUrl2.value,
tag: tag.value,
- actions: []
+ actions: [],
+ typesend: shared_consts.TypeSend.PUSH_NOTIFICATION
}
param.actions = []
diff --git a/src/rootgen/admin/usersList/usersList.ts b/src/rootgen/admin/usersList/usersList.ts
index 50aaa3cb..31a59dfe 100755
--- a/src/rootgen/admin/usersList/usersList.ts
+++ b/src/rootgen/admin/usersList/usersList.ts
@@ -30,6 +30,10 @@ export default defineComponent({
label: 'Non hanno l\'Invitante',
value: shared_consts.FILTER_USER_NO_INVITANTE
},
+ {
+ label: 'Non sono stati Approvati dall\'Invitante',
+ value: shared_consts.FILTER_USER_NO_VERIFIED_APORTADOR
+ },
{
label: 'No Telegram ID',
value: shared_consts.FILTER_USER_NO_TELEGRAM_ID
diff --git a/src/statics/lang/de.js b/src/statics/lang/de.js
index b6b16c36..65c89b3f 100755
--- a/src/statics/lang/de.js
+++ b/src/statics/lang/de.js
@@ -306,6 +306,8 @@ const msg_de = {
booked_error: 'Reservation failed. Try again later',
sendmsg_error: 'Message not sent. Try again later',
sendmsg_sent: 'Message sent',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsgs_sent: 'Messages sent',
booking: 'Book the Event',
titlebooking: 'Reservation',
modifybooking: 'Modify Reservation',
diff --git a/src/statics/lang/enUs.js b/src/statics/lang/enUs.js
index 9e7a2a9c..93e61c89 100755
--- a/src/statics/lang/enUs.js
+++ b/src/statics/lang/enUs.js
@@ -383,8 +383,8 @@ const msg_enUs = {
invitante_regalato: 'Inviting Given',
legenda: 'Legend',
aportador_solidario: 'Solidarity Contributor',
- verified_by_aportador: 'Verificato dall\'Invitante',
- notAsk_ToVerify: 'Non chiedere la verifica Registrazione',
+ verified_by_aportador: 'Verificato',
+ notAsk_ToVerify: 'No Verif. Reg',
trust_modified: 'Fiducia Modificata',
blocked: 'Bloccato',
username_who_block: 'Bloccato da',
@@ -498,6 +498,8 @@ const msg_enUs = {
image: 'Immagine',
date: 'Data',
date_created: 'Creato il',
+ pub_created: 'Pubblicato il',
+ pub_updated: 'Aggiornato il',
options: 'Opzioni',
link_telegram: 'Link al Canale/Gruppo Telegram',
err: {
@@ -648,6 +650,8 @@ const msg_enUs = {
booked_error: 'Reservation failed. Try again later',
sendmsg_error: 'Message not sent. Try again later',
sendmsg_sent: 'Message sent',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsgs_sent: 'Messages sent',
booking: 'Book the Event',
titlebooking: 'Reservation',
modifybooking: 'Modify Reservation',
diff --git a/src/statics/lang/es.js b/src/statics/lang/es.js
index 50407583..c452bf8d 100755
--- a/src/statics/lang/es.js
+++ b/src/statics/lang/es.js
@@ -353,8 +353,8 @@ const msg_es = {
invitante_regalato: 'Invitando Regalato',
legenda: 'Legenda',
aportador_solidario: 'Aportador Solidario',
- verified_by_aportador: 'Verificato dall\'Invitante',
- notAsk_ToVerify: 'Non chiedere la verifica Registrazione',
+ verified_by_aportador: 'Verificato',
+ notAsk_ToVerify: 'No Verif. Reg',
trust_modified: 'Fiducia Modificata',
blocked: 'Bloccato',
username_who_block: 'Bloccato da',
@@ -399,7 +399,6 @@ const msg_es = {
select: 'selecciona',
img: 'File image',
date_reg: 'Fecha Reg.',
- deleted: 'Cancellato',
requirement: 'Requisitos',
perm: 'Permisos',
elimina: 'Elimina',
@@ -466,6 +465,8 @@ const msg_es = {
image: 'Immagine',
date: 'Data',
date_created: 'Creato il',
+ pub_created: 'Pubblicato il',
+ pub_updated: 'Aggiornato il',
options: 'Opzioni',
link_telegram: 'Link al Canale/Gruppo Telegram',
err: {
@@ -601,6 +602,8 @@ const msg_es = {
booked_error: 'Reserva fallida. Intenta nuevamente más tarde',
sendmsg_error: 'Mensaje no enviado Intenta nuevamente más tarde',
sendmsg_sent: 'Mensaje enviado',
+ sendmsgs_sent: 'Mensajes enviados',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
booking: 'Reserva Evento',
titlebooking: 'Reserva',
modifybooking: 'Edita Reserva',
diff --git a/src/statics/lang/fr.js b/src/statics/lang/fr.js
index 57b0a738..3229f40e 100755
--- a/src/statics/lang/fr.js
+++ b/src/statics/lang/fr.js
@@ -505,6 +505,8 @@ const msg_fr = {
booked_error: 'La réservation a échoué. Réessayez plus tard',
sendmsg_error: 'Message non envoyé. Réessayez plus tard',
sendmsg_sent: 'Message envoyé',
+ sendmsgs_sent: 'Messages envoyé',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
booking: 'Réserver l\'événement',
titlebooking: 'Réservation',
modifybooking: 'changement de réservation',
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index c03fbf4e..a8b2f16a 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -87,8 +87,8 @@ const msg_it = {
email_not_verif: 'Email non Verificate',
telegram_non_attivi: 'Telegram Non Attivi',
telegram_pendenti: 'Telegram Pendenti',
- reg_daily: 'Registrazioni Giornaliere',
- reg_weekly: 'Registrazioni Settimanali',
+ reg_daily: 'Registrazioni',
+ reg_weekly: 'Settimanali',
reg_total: 'Registrazioni Totali',
},
steps: {
@@ -396,8 +396,8 @@ const msg_it = {
invitante_regalato: 'Invitante Regalato',
legenda: 'Legenda',
aportador_solidario: 'Chi ti ha Invitato',
- verified_by_aportador: 'Verificato dall\'Invitante',
- notAsk_ToVerify: 'Non chiedere la verifica Registrazione',
+ verified_by_aportador: 'Verificato',
+ notAsk_ToVerify: 'No Verif. Reg',
trust_modified: 'Fiducia Modificata',
blocked: 'Bloccato',
username_who_block: 'Bloccato da',
@@ -437,6 +437,7 @@ const msg_it = {
teleg_auth: 'Codice Autorizzazione',
click_per_copiare: 'Cliccaci sopra per copiarlo sugli appunti',
link_reg: 'Clicca per copiare il link da condividere agli Amici',
+ link_reg_and_msg: 'Condividi Link ad Amici',
copia_messaggio: 'Copia Messaggio',
teleg_torna_sul_bot: '1) Copia il codice cliccando sul bottone qui sopra
2) torna su {botname} cliccando qui sotto 👇 ed incolla (o scrivi) il codice',
teleg_checkcode: 'Codice Telegram',
@@ -516,6 +517,8 @@ const msg_it = {
image: 'Immagine',
date: 'Data',
date_created: 'Creato il',
+ pub_created: 'Pubblicato il',
+ pub_updated: 'Aggiornato il',
options: 'Opzioni',
link_telegram: 'Link al Canale/Gruppo Telegram',
err: {
@@ -669,6 +672,9 @@ const msg_it = {
booked_error: 'Prenotazione non avvenuta. Riprovare più tardi',
sendmsg_error: 'Messaggio non inviato. Riprovare più tardi',
sendmsg_sent: 'Messaggio Inviato',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsgs_sent: 'Messaggi Inviati',
+ err_sendmsg: 'Errore durante l\'invio del Messaggio',
booking: 'Prenota Evento',
titlebooking: 'Prenotazione',
modifybooking: 'Modifica Prenotazione',
diff --git a/src/statics/lang/pt.js b/src/statics/lang/pt.js
index 7392b63d..01e3dcae 100755
--- a/src/statics/lang/pt.js
+++ b/src/statics/lang/pt.js
@@ -516,6 +516,8 @@ const msg_pt = {
booked_error: 'Prenotazione non avvenuta. Riprovare più tardi',
sendmsg_error: 'Messaggio non inviato. Riprovare più tardi',
sendmsg_sent: 'Messaggio Inviato',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsgs_sent: 'Messaggi Inviati',
booking: 'Prenota Evento',
titlebooking: 'Prenotazione',
modifybooking: 'Modifica Prenotazione',
diff --git a/src/statics/lang/si.js b/src/statics/lang/si.js
index 2e745104..65f5633b 100755
--- a/src/statics/lang/si.js
+++ b/src/statics/lang/si.js
@@ -465,6 +465,8 @@ const msg_si = {
booked_error: 'Rezervacija ni možna. Poskusi kasneje.',
sendmsg_error: 'Sporočilo ni bilo poslano. Poskusi kasneje.',
sendmsg_sent: 'Sporočilo Poslano',
+ sendmsg_sent_sharedlink: 'Il Messaggio da inviare lo trovi nella Chat Telegram',
+ sendmsgs_sent: 'Messaggi Inviati',
booking: 'Rezerviraj Dogodek',
titlebooking: 'Rezervacija',
modifybooking: 'Popravilo rezervacije',
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index 8811db81..43960472 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -130,6 +130,7 @@ export const costanti = {
visible: false,
title: 'Gruppi',
to: '',
+ table: 'mygroups',
icon: 'fas fa-users',
color: 'blue-6',
hint: '',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 473e89bb..71e5a078 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -573,7 +573,12 @@ export const colmyUserGroup = [
jointable: 'friendsandme',
field_outtype: costanti.FieldType.object,
}),
- AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+ AddCol({ name: 'date_created', label_trans: 'reg.pub_created', fieldtype: costanti.FieldType.onlydate,
+ required: false,
+ visible: false,
+ sortable: true,
+ showWhen: 0}),
+ AddCol({ name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
required: false,
visible: false,
sortable: true,
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index fe8ec5dd..453ef9d8 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -12,7 +12,7 @@ import {
ITodo,
IUserFields,
Privacy,
- TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery,
+ TipoVisu, IGroup, IMySkill, IMyBacheca, IImgGallery, IMsgGlobParam,
} from '@model'
import { addToDate } from '@quasar/quasar-ui-qcalendar'
@@ -5167,6 +5167,8 @@ export const tools = {
return 'myservice'
} else if (table === toolsext.TABMYBACHECAS) {
return 'mypage'
+ } else if (table === toolsext.TABMYGOODS) {
+ return 'mygood'
} else if (table === toolsext.TABMYGROUPS) {
return 'grp'
}
@@ -5231,6 +5233,10 @@ export const tools = {
return '/' + tools.getDirectoryByTable(table) + '/' + grp.groupname
},
+ getPathByTable(table: string, pagename: string) {
+ return '/' + tools.getDirectoryByTable(table) + '/' + pagename
+ },
+
getAportadorSolidario() {
const userStore = useUserStore()
return userStore.my ? userStore.my.aportador_solidario : ''
@@ -5264,6 +5270,28 @@ export const tools = {
return window.location.pathname.indexOf('signup') >= 0
},
+ async sendMsgTelegram($q: any, $t: any, mydata: IMsgGlobParam) {
+ const userStore = useUserStore()
+
+ return userStore.sendMsgToBotTelegram($q, $t, mydata)
+ },
+
+ async sendMsgTelegramCmd($q: any, $t: any, cmd: number) {
+
+ let mydata: IMsgGlobParam = {
+ typemsg: 0,
+ typesend: shared_consts.TypeSend.TELEGRAM,
+ cmd,
+ }
+
+ if (cmd === shared_consts.CmdToSend.SHARE_MSGREG) {
+ mydata.typemsg = shared_consts.TypeMsg.SEND_TO_MYSELF
+ }
+
+ return this.sendMsgTelegram($q, $t, mydata)
+
+ },
+
// getLocale() {
// if (navigator.languages && navigator.languages.length > 0) {
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 201071d2..cd7c757f 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -1,7 +1,7 @@
import { defineStore } from 'pinia'
import {
- IFriends,
+ IFriends, IMsgGlobParam,
ISigninOptions,
ISignupOptions, IUserFields, IUserProfile, IUserState,
} from '@src/model'
@@ -880,7 +880,17 @@ export const useUserStore = defineStore('UserStore', {
verified_by_aportador,
made_gift,
perm,
- profile: { img, teleg_id, myshares: [], friends: [], req_friends: [], asked_friends: [], mygroups: [], asked_groups: [], manage_mygroups: [] },
+ profile: {
+ img,
+ teleg_id,
+ myshares: [],
+ friends: [],
+ req_friends: [],
+ asked_friends: [],
+ mygroups: [],
+ asked_groups: [],
+ manage_mygroups: []
+ },
})
isLogged = true
@@ -1004,6 +1014,25 @@ export const useUserStore = defineStore('UserStore', {
},
+ async sendMsgToBotTelegram($q: any, t: any, mydata: IMsgGlobParam) {
+ 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) {
+ msgok = t('cal.sendmsg_sent_sharedlink') + ' ' + tools.getBotName()
+ }
+ if (res.data.nummsgsent >= 0) {
+ tools.showPositiveNotif($q, msgok)
+ return true
+ }
+ return false
+ }).catch((error) => {
+ tools.showNegativeNotif($q, t('cal.err_sendmsg'))
+ return {}
+ })
+ },
+
async importToServerCmd($q: any, t: any, cmd: number, data: any) {
return Api.SendReq('/admin/import', 'POST', { cmd, data })
.then((res) => {
diff --git a/src/views/user/mygroup/mygroup.ts b/src/views/user/mygroup/mygroup.ts
index 3533a917..6ddee830 100755
--- a/src/views/user/mygroup/mygroup.ts
+++ b/src/views/user/mygroup/mygroup.ts
@@ -128,11 +128,11 @@ export default defineComponent({
}
function extraparams() {
- let lk_tab = ''
- let lk_LF = ''
- let lk_FF = ''
- let lk_as = ''
- let af_objId_tab = ''
+ let lk_tab = 'users'
+ let lk_LF = 'userId'
+ let lk_FF = '_id'
+ let lk_as = 'user'
+ let af_objId_tab = 'myId'
return {
lookup1: {
diff --git a/src/views/user/mypagebacheca/mypagebacheca.vue b/src/views/user/mypagebacheca/mypagebacheca.vue
index b0827d56..72fa2407 100755
--- a/src/views/user/mypagebacheca/mypagebacheca.vue
+++ b/src/views/user/mypagebacheca/mypagebacheca.vue
@@ -1,5 +1,5 @@
-
@@ -10,6 +10,7 @@
diff --git a/src/views/user/mypagegood/mypagegood.scss b/src/views/user/mypagegood/mypagegood.scss
new file mode 100755
index 00000000..558a623b
--- /dev/null
+++ b/src/views/user/mypagegood/mypagegood.scss
@@ -0,0 +1,18 @@
+.profile {
+ width: 100%;
+ margin: 0 auto;
+ max-width: 450px;
+}
+
+.myrow{
+ display: flex;
+ @media (max-width: 600px) {
+ flex-flow: column;
+ }
+}
+
+.qualifica{
+ border: solid 2px #4198ef;
+ border-radius: 1rem;
+ padding: 5px;
+}
diff --git a/src/views/user/mypagegood/mypagegood.ts b/src/views/user/mypagegood/mypagegood.ts
new file mode 100755
index 00000000..2ef7d814
--- /dev/null
+++ b/src/views/user/mypagegood/mypagegood.ts
@@ -0,0 +1,31 @@
+import { computed, defineComponent, onMounted, ref, watch } from 'vue'
+import { useUserStore } from '@store/UserStore'
+import { useRoute, useRouter } from 'vue-router'
+import { useI18n } from '@/boot/i18n'
+import { useQuasar } from 'quasar'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
+import { CMyPage } from '@/components/CMyPage'
+import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
+import { toolsext } from '@store/Modules/toolsext'
+import { tools } from '@store/Modules/tools'
+
+export default defineComponent({
+ name: 'mypagegood',
+ components: { CMyCardPopup, CMyPage, CCheckIfIsLogged },
+ props: {},
+ setup() {
+ const userStore = useUserStore()
+ const $route = useRoute()
+ const $q = useQuasar()
+ const { t } = useI18n()
+
+ const idGood = computed(() => $route.params.idGood ? $route.params.idGood.toString() : 0)
+
+ return {
+ t,
+ idGood,
+ toolsext,
+ tools,
+ }
+ }
+})
diff --git a/src/views/user/mypagegood/mypagegood.vue b/src/views/user/mypagegood/mypagegood.vue
new file mode 100755
index 00000000..c7f7fc0e
--- /dev/null
+++ b/src/views/user/mypagegood/mypagegood.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index 23372d85..931ae7e0 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -122,12 +122,19 @@
:href="getLinkWebSite()" target="__blank">
-
-
-
-
-
+
+
diff --git a/src/views/user/myservice/myservice.ts b/src/views/user/myservice/myservice.ts
index c846e147..62951c6f 100755
--- a/src/views/user/myservice/myservice.ts
+++ b/src/views/user/myservice/myservice.ts
@@ -3,6 +3,7 @@ import { CTitleBanner } from '@/components/CTitleBanner'
import { CProfile } from '@/components/CProfile'
import { CDateTime } from '@/components/CDateTime'
import { CMyPage } from '@/components/CMyPage'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { CSkill } from '@/components/CSkill'
import { tools } from '@store/Modules/tools'
@@ -23,7 +24,7 @@ import { colCitys } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'myservice',
- components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage, CCheckIfIsLogged },
+ components: { CProfile, CTitleBanner, CMyFieldDb, CSkill, CDateTime, CMyPage, CCheckIfIsLogged, CMyCardPopup },
props: {},
setup() {
const userStore = useUserStore()
@@ -43,7 +44,7 @@ export default defineComponent({
const myskill = ref(
{})
- const username = computed(() => (myskill.value && myskill.value.username) ? myskill.value.username : 'Pagina')
+ const username = computed(() => (myskill.value && myskill.value.username) ? myskill.value.username : 'Servizio')
function profile() {
return userStore.my.profile
@@ -56,6 +57,7 @@ export default defineComponent({
function loadSkill() {
// Carica il profilo di quest'utente
if (idSkill.value) {
+ /*
userStore.loadSkill(idSkill.value).then((ris) => {
myskill.value = ris
if (ris.userId) {
@@ -63,7 +65,7 @@ export default defineComponent({
}
})
-
+*/
}
}
@@ -88,6 +90,7 @@ export default defineComponent({
tools,
costanti,
myskill,
+ toolsext,
shared_consts,
checkifShow,
globalStore,
@@ -101,6 +104,7 @@ export default defineComponent({
colCitys,
table,
username,
+ idSkill,
}
}
})
diff --git a/src/views/user/myservice/myservice.vue b/src/views/user/myservice/myservice.vue
index 55159afa..c19659ed 100755
--- a/src/views/user/myservice/myservice.vue
+++ b/src/views/user/myservice/myservice.vue
@@ -6,7 +6,17 @@
+
+
+
+
+
+
-
+ -->