From c6539f4378e4769d14b6bdd41dde053edf38e5db Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Sun, 6 Mar 2022 00:48:14 +0100 Subject: [PATCH] =?UTF-8?q?vedere=20le=20Richieste=20di=20Fiducia=20solo?= =?UTF-8?q?=20se=20si=20=C3=A8=20verificati=20Telegram=20Corretto=20il=20m?= =?UTF-8?q?io=20account=20che=20doveva=20confermare=20in=20automatico...?= =?UTF-8?q?=20non=20lo=20faceva...=20"Riregistrarsi=20se=20l'invitante=20n?= =?UTF-8?q?on=20ha=20ancora=20confermato=20l'invito.=20Annullo=20la=20rich?= =?UTF-8?q?iesta=20precedente.=20(inviando=20un=20msg=20di=20annullamento.?= =?UTF-8?q?=20(Si=20=C3=A8=20gi=C3=A0=20registrato=20con=20un=20alto=20inv?= =?UTF-8?q?ito.)"=20CMyEditor:=20non=20posso=20andare=20in=20edit=20sul=20?= =?UTF-8?q?HTML=20(nella=20table)=20Aggiornare=20il=20msg=20di=20benvenuto?= =?UTF-8?q?=20!=20(prendere=20da=20msgtemplate)=20Dal=20Profilo:=20=C3=A8?= =?UTF-8?q?=20possibile=20inviarsi=20il=20messaggio=20da=20condividere=20a?= =?UTF-8?q?gli=20Amici=20Visualizzare=20la=20data=20d'inserimento=20dell'a?= =?UTF-8?q?nnuncio=20e=20l'ultima=20modifica=20fatta=20Link=20alla=20pagin?= =?UTF-8?q?a=20di=20un=20Evento=20o=20Bene=20o=20Servizio=20!=20Se=20aggio?= =?UTF-8?q?rnamento:=20mettere=20messaggio=20che=20dice=20di=20chiudere=20?= =?UTF-8?q?e=20riaprire=20per=20aggiornare.=20Quando=20un=20utente=20chied?= =?UTF-8?q?e=20di=20entrare=20nel=20Gruppo,=20mettere=20l'abilitazione=20a?= =?UTF-8?q?nche=20su=20Telegram.=20(e=20correggere=20il=20msg)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- .../insiemesipuo.app/db/lang/ws_enUs.js | 1 + _ALL_SITES/insiemesipuo.app/db/lang/ws_it.js | 1 + .../popolodelnuovomondo.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- _ALL_SITES/riso.app/db/lang/ws_es.js | 1 + _ALL_SITES/riso.app/db/lang/ws_it.js | 1 + src/common/shared_nodejs.js | 16 +++++++++ src/common/shared_vuejs.ts | 23 +++++++++++- .../CFirstPageApp/CFirstPageApp.vue | 2 +- src/components/CMyCardPopup/CMyCardPopup.ts | 14 ++++++-- src/components/CMyCardPopup/CMyCardPopup.vue | 36 +++++++++++++++++-- src/components/CMyPopupEdit/CMyPopupEdit.vue | 6 ++-- .../CUserNonVerif/CUserNonVerif.vue | 2 ++ src/db/lang/ws_es.js | 1 + src/db/lang/ws_it.js | 1 + src/db/static_data.ts | 11 ++++++ src/model/GlobalStore.ts | 16 +++++++++ src/root/mainview/mainview.ts | 3 ++ src/root/mainview/mainview.vue | 29 +++++++++++++-- .../admin/sendpushnotif/sendpushnotif.ts | 15 +++----- src/rootgen/admin/usersList/usersList.ts | 4 +++ src/statics/lang/de.js | 2 ++ src/statics/lang/enUs.js | 8 +++-- src/statics/lang/es.js | 9 +++-- src/statics/lang/fr.js | 2 ++ src/statics/lang/it.js | 14 +++++--- src/statics/lang/pt.js | 2 ++ src/statics/lang/si.js | 2 ++ src/store/Modules/costanti.ts | 1 + src/store/Modules/fieldsTable.ts | 7 +++- src/store/Modules/tools.ts | 30 +++++++++++++++- src/store/UserStore.ts | 33 +++++++++++++++-- src/views/user/mygroup/mygroup.ts | 10 +++--- .../user/mypagebacheca/mypagebacheca.vue | 3 +- src/views/user/mypagegood/mypagegood.scss | 18 ++++++++++ src/views/user/mypagegood/mypagegood.ts | 31 ++++++++++++++++ src/views/user/mypagegood/mypagegood.vue | 30 ++++++++++++++++ src/views/user/myprofile/myprofile.vue | 19 ++++++---- src/views/user/myservice/myservice.ts | 10 ++++-- src/views/user/myservice/myservice.vue | 24 ++++++------- 43 files changed, 381 insertions(+), 69 deletions(-) create mode 100755 src/views/user/mypagegood/mypagegood.scss create mode 100755 src/views/user/mypagegood/mypagegood.ts create mode 100755 src/views/user/mypagegood/mypagegood.vue 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 @@