From 00939b053abdb708d53e1d57e59e9df35fddf9e4 Mon Sep 17 00:00:00 2001 From: paoloar77 Date: Wed, 9 Mar 2022 14:53:17 +0100 Subject: [PATCH] Pagina con i link dei Canali territoriali di RISO Lista Tabelle "Aggiungi" da errore userId... Aggiunto "Servizi" e alcune sue sottocategorie Aggiunto anche la conversione della foto piccola alla Foto Profilo --- .env.development | 2 +- _ALL_SITES/freeplanet.app/db/lang/ws_it.js | 1 + _ALL_SITES/freeplanet.app/db/static_data.ts | 27 +- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- .../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_de.js | 1 + src/common/shared_nodejs.js | 140 +----- src/common/shared_vuejs.ts | 346 +++---------- .../CCheckIfIsLogged/CCheckIfIsLogged.vue | 10 +- src/components/CGridTableRec/CGridTableRec.ts | 3 + .../CGridTableRec/CGridTableRec.vue | 1 + src/components/CSignUp/CSignUp.ts | 2 + src/components/CSignUp/CSignUp.vue | 458 +++++++++--------- src/components/CStatusReg/CStatusReg.ts | 2 + src/components/CStatusReg/CStatusReg.vue | 7 +- .../CUserNonVerif/CUserNonVerif.vue | 33 +- src/components/Header/Header.ts | 5 +- src/css/app.scss | 3 + src/db/lang/ws_de.js | 2 + src/db/lang/ws_enUs.js | 3 + src/db/lang/ws_es.js | 3 + src/db/lang/ws_it.js | 3 + src/db/static_data.ts | 31 +- src/model/GlobalStore.ts | 13 +- src/rootgen/admin/importdata/importdata.ts | 29 ++ src/rootgen/admin/importdata/importdata.vue | 7 + .../admin/sendpushnotif/sendpushnotif.ts | 83 +++- .../admin/sendpushnotif/sendpushnotif.vue | 163 +++++-- src/rootgen/admin/usersList/usersList.ts | 12 +- src/statics/lang/it.js | 8 +- src/store/Modules/fieldsTable.ts | 22 +- src/store/Modules/tools.ts | 18 + src/store/Modules/toolsext.ts | 1 + src/store/UserStore.ts | 5 + src/store/globalStore.ts | 7 +- src/views/user/mygroups/mygroups.vue | 4 +- 38 files changed, 722 insertions(+), 741 deletions(-) mode change 100755 => 120000 src/common/shared_nodejs.js diff --git a/.env.development b/.env.development index 21072edb..72cad3fb 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.6" +APP_VERSION="0.3.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/freeplanet.app/db/lang/ws_it.js b/_ALL_SITES/freeplanet.app/db/lang/ws_it.js index 5cc7a6c0..71dde945 100755 --- a/_ALL_SITES/freeplanet.app/db/lang/ws_it.js +++ b/_ALL_SITES/freeplanet.app/db/lang/ws_it.js @@ -81,6 +81,7 @@ const msg_website_it = { favproj: 'Favoriti', statusreg: { reg: 'Partecipanti', + verifieds: 'Verificati', passeggeri: 'Passeggeri Navi', giainlista: 'Gia in Lista', newreg: 'Ultime Registrazioni:', diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index 66c7d1a5..4b8d2320 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -94,19 +94,6 @@ const routes_admin: IListRoutes[] = [ submenu: true, onlyAdmin: true }, - { - active: true, - order: 1030, - path: '/admin/sendpushnotif', - materialIcon: 'event_seat', - name: 'otherpages.manage.sendpushnotif', - component: () => import('@/rootgen/admin/sendpushnotif/sendpushnotif.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - }, { active: true, order: 1040, @@ -336,6 +323,20 @@ const routes_manager: IListRoutes[] = [ onlyManager: true // onlyTutor: true }, + { + active: true, + order: 1030, + path: '/admin/sendpushnotif', + materialIcon: 'event_seat', + name: 'otherpages.manage.sendpushnotif', + component: () => import('@/rootgen/admin/sendpushnotif/sendpushnotif.vue'), + level_parent: 0.0, + level_child: 0.5, + inmenu: true, + submenu: true, + onlyAdmin: true, + onlyManager: true, + }, { active: true, order: 40, diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 680e080b..e571b101 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ - APP_VERSION="0.3.6" + APP_VERSION="0.3.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 1d5108c7..0aaeb763 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ - APP_VERSION="0.3.6" + APP_VERSION="0.3.7" 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 4530565b..c976fb8e 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ - APP_VERSION="0.3.6" + APP_VERSION="0.3.7" 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 d897209f..c1694187 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ - APP_VERSION="0.3.6" + APP_VERSION="0.3.7" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/db/lang/ws_de.js b/_ALL_SITES/riso.app/db/lang/ws_de.js index 0a88fde2..0b813fa5 100755 --- a/_ALL_SITES/riso.app/db/lang/ws_de.js +++ b/_ALL_SITES/riso.app/db/lang/ws_de.js @@ -41,6 +41,7 @@ const msg_website_de = { dbop: 'Operazioni', statusreg: { reg: 'Partecipanti', + verifieds: 'Verificati', passeggeri: 'Passeggeri Navi', giainlista: 'Gia in Lista', newreg: 'Ultime Registrazioni:', diff --git a/src/common/shared_nodejs.js b/src/common/shared_nodejs.js deleted file mode 100755 index 0fa7069a..00000000 --- a/src/common/shared_nodejs.js +++ /dev/null @@ -1,139 +0,0 @@ -module.exports = { - Accepted: { - CHECK_READ_GUIDELINES: 1, - CHECK_SEE_VIDEO_PRINCIPI: 2, - }, - - ALL_SAW_AND_ACCEPTED: 3, - // --------------------- - - FILTER_EXTRALIST_NOT_REGISTERED: 1, - FILTER_EXTRALIST_NOT_CONTACTED: 2, - FILTER_EXTRALIST_WITH_NOTE: 4, - FILTER_USER_NO_ZOOM: 8, - FILTER_USER_NO_INVITANTE: 16, - FILTER_USER_NO_TELEGRAM_ID: 32, - FILTER_USER_CODICE_AUTH_TELEGRAM: 64, - FILTER_USER_NO_EMAIL_VERIFICATA: 128, - FILTER_USER_NO_DREAM: 256, - FILTER_EXTRALIST_DELETED: 512, - FILTER_USER_TELEGRAM_BLOCKED: 1024, - FILTER_ATTIVI: 2048, - FILTER_NASCOSTI: 4096, - FILTER_NAVI_NON_PRESENTI: 8192, - FILTER_QUALIFIED: 16384, - FILTER_ASK_ZOOM_VISTO: 32768, - FILTER_HOURS_MYLIST: 65536, - FILTER_HOURS_ALL: 131072, - FILTER_MISSING_PAYMENT: 262144, - FILTER_TO_MAKE_MEMBERSHIP_CARD: 524288, - FILTER_MEMBERSHIP_CARD_OK: 1048576, - - REPORT_FILT_RESP: 1, - REPORT_FILT_ATTIVITA: 2, - - PaymentTypes: [ - 'Nessuno', - 'Bonifico Bancario', - 'Paypal', - 'In Contanti alla CNM', - ], - - CashType: { - None: 0, - Incoming: 1, - Outcoming: 2, - }, - - Cmd: { - PROVINCE: 1, - COMUNI: 2, - CITIES_SERVER: 3, - }, - - WalletFinalStatusType: { - None: 0, - InCommonCash: 1, - InMyWallet: 2, - }, - - Permissions: { - Admin: 1, - Manager: 2, - Teacher: 4, - Tutor: 8, - Editor: 16, - Zoomeri: 32, - Department: 64, - }, - - MessageOptions: { - Notify_ByEmail: 2, - Notify_ByPushNotification: 4, - }, - - TypeMsg: { - SEND_TO_ALL: 1, - SEND_TO_SOCI: 2, - SEND_TO_SOCIO_RESIDENTE: 3, - 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: { - NORMAL: 0, - YESNO: 1, - OPZ1_2: 2, - }, - - CallFunz: { - SOSTITUISCI: 345, - AGGIUNGI_NUOVO_IMBARCO: 380, - CANCELLA_IMBARCO: 385, - DAMMI_PRIMO_UTENTE_LIBERO: 390, - GET_VALBYTABLE: 400, - SET_VALBYTABLE: 410, - ZOOM_GIA_PARTECIPATO: 510, - }, - - OrderStatus: { - NONE: 0, - IN_CART: 1, - CHECKOUT_SENT: 2, - ORDER_CONFIRMED: 3, - PAYED: 4, - DELIVEDED: 5, - RECEIVED: 6, - CANCELED: 10, - }, - - OrderStatusView: { - CHECKOUT_SENT: 2, - ORDER_CONFIRMED: 3, - PAYED: 4, - RECEIVED: 6, - 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_nodejs.js b/src/common/shared_nodejs.js new file mode 120000 index 00000000..78490d4b --- /dev/null +++ b/src/common/shared_nodejs.js @@ -0,0 +1 @@ +/home/paolo/myproject/freeplanet_serverside/src/server/tools/shared_nodejs.js \ No newline at end of file diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 0a7bc259..f54dfda4 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -40,6 +40,8 @@ export const shared_consts = { FILTER_TO_MAKE_MEMBERSHIP_CARD: 524288, FILTER_MEMBERSHIP_CARD_OK: 1048576, FILTER_USER_NO_VERIFIED_APORTADOR: 2097152, + FILTER_USER_SI_TELEGRAM_ID: 4194304, + FILTER_USER_WITHOUT_USERNAME_TELEGRAM: 8388608, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, @@ -197,289 +199,6 @@ export const shared_consts = { }, ], - Provinces: [ - { _id: 1, reg: 'SIC', value: 'AG', label: 'Agrigento', }, { - _id: 2, - reg: 'PIE', - value: 'AL', - label: 'Alessandria', - }, { _id: 3, reg: 'MAR', value: 'AN', label: 'Ancona', }, { - _id: 4, - reg: 'VDA', - value: 'AO', - label: 'Aosta', - }, { _id: 5, reg: 'TOS', value: 'AR', label: 'Arezzo', }, { - _id: 6, - reg: 'MAR', - value: 'AP', - label: 'Ascoli Piceno', - }, { _id: 7, reg: 'PIE', value: 'AT', label: 'Asti', }, { - _id: 8, - reg: 'CAM', - value: 'AV', - label: 'Avellino', - }, { _id: 9, reg: 'PUG', value: 'BA', label: 'Bari', }, { - _id: 10, - reg: 'PUG', - value: 'BT', - label: 'Barletta-Andria-Trani', - }, { _id: 11, reg: 'VEN', value: 'BL', label: 'Belluno', }, { - _id: 12, - reg: 'CAM', - value: 'BN', - label: 'Benevento', - }, { _id: 13, reg: 'LOM', value: 'BG', label: 'Bergamo', }, { - _id: 14, - reg: 'PIE', - value: 'BI', - label: 'Biella', - }, { _id: 15, reg: 'EMR', value: 'BO', label: 'Bologna', }, { - _id: 16, - reg: 'TAA', - value: 'BZ', - label: 'Bolzano', - }, { _id: 17, reg: 'LOM', value: 'BS', label: 'Brescia', }, { - _id: 18, - reg: 'PUG', - value: 'BR', - label: 'Brindisi', - }, { _id: 19, reg: 'SAR', value: 'CA', label: 'Cagliari', }, { - _id: 20, - reg: 'SIC', - value: 'CL', - label: 'Caltanissetta', - }, { _id: 21, reg: 'MOL', value: 'CB', label: 'Campobasso', }, { - _id: 22, - reg: 'SAR', - value: 'CI', - label: 'Carbonia-Iglesias', - }, { _id: 23, reg: 'CAM', value: 'CE', label: 'Caserta', }, { - _id: 24, - reg: 'SIC', - value: 'CT', - label: 'Catania', - }, { _id: 25, reg: 'CAL', value: 'CZ', label: 'Catanzaro', }, { - _id: 26, - reg: 'ABR', - value: 'CH', - label: 'Chieti', - }, { _id: 27, reg: 'LOM', value: 'CO', label: 'Como', }, { - _id: 28, - reg: 'CAL', - value: 'CS', - label: 'Cosenza', - }, { _id: 29, reg: 'LOM', value: 'CR', label: 'Cremona', }, { - _id: 30, - reg: 'CAL', - value: 'KR', - label: 'Crotone', - }, { _id: 31, reg: 'PIE', value: 'CN', label: 'Cuneo', }, { - _id: 32, - reg: 'SIC', - value: 'EN', - label: 'Enna', - }, { _id: 33, reg: 'MAR', value: 'FM', label: 'Fermo', }, { - _id: 34, - reg: 'EMR', - value: 'FE', - label: 'Ferrara', - }, { _id: 35, reg: 'TOS', value: 'FI', label: 'Firenze', }, { - _id: 36, - reg: 'PUG', - value: 'FG', - label: 'Foggia', - }, { _id: 37, reg: 'EMR', value: 'FC', label: 'Forli-Cesena', }, { - _id: 38, - reg: 'LAZ', - value: 'FR', - label: 'Frosinone', - }, { _id: 39, reg: 'LIG', value: 'GE', label: 'Genova', }, { - _id: 40, - reg: 'FVG', - value: 'GO', - label: 'Gorizia', - }, { _id: 41, reg: 'TOS', value: 'GR', label: 'Grosseto', }, { - _id: 42, - reg: 'LIG', - value: 'IM', - label: 'Imperia', - }, { _id: 43, reg: 'MOL', value: 'IS', label: 'Isernia', }, { - _id: 44, - reg: 'LIG', - value: 'SP', - label: 'La Spezia', - }, { _id: 45, reg: 'ABR', value: 'AQ', label: 'L\'Aquila', }, { - _id: 46, - reg: 'LAZ', - value: 'LT', - label: 'Latina', - }, { _id: 47, reg: 'PUG', value: 'LE', label: 'Lecce', }, { - _id: 48, - reg: 'LOM', - value: 'LC', - label: 'Lecco', - }, { _id: 49, reg: 'TOS', value: 'LI', label: 'Livorno', }, { - _id: 50, - reg: 'LOM', - value: 'LO', - label: 'Lodi', - }, { _id: 51, reg: 'TOS', value: 'LU', label: 'Lucca', }, { - _id: 52, - reg: 'MAR', - value: 'MC', - label: 'Macerata', - }, { _id: 53, reg: 'LOM', value: 'MN', label: 'Mantova', }, { - _id: 54, - reg: 'TOS', - value: 'MS', - label: 'Massa-Carrara', - }, { _id: 55, reg: 'BAS', value: 'MT', label: 'Matera', }, { - _id: 56, - reg: 'SIC', - value: 'ME', - label: 'Messina', - }, { _id: 57, reg: 'LOM', value: 'MI', label: 'Milano', }, { - _id: 58, - reg: 'EMR', - value: 'MO', - label: 'Modena', - }, { _id: 59, reg: 'LOM', value: 'MB', label: 'Monza e della Brianza', }, { - _id: 60, - reg: 'CAM', - value: 'NA', - label: 'Napoli', - }, { _id: 61, reg: 'PIE', value: 'NO', label: 'Novara', }, { - _id: 62, - reg: 'SAR', - value: 'NU', - label: 'Nuoro', - }, { _id: 63, reg: 'SAR', value: 'OT', label: 'Olbia-Tempio', }, { - _id: 64, - reg: 'SAR', - value: 'OR', - label: 'Oristano', - }, { _id: 65, reg: 'VEN', value: 'PD', label: 'Padova', }, { - _id: 66, - reg: 'SIC', - value: 'PA', - label: 'Palermo', - }, { _id: 67, reg: 'EMR', value: 'PR', label: 'Parma', }, { - _id: 68, - reg: 'LOM', - value: 'PV', - label: 'Pavia', - }, { _id: 69, reg: 'UMB', value: 'PG', label: 'Perugia', }, { - _id: 70, - reg: 'MAR', - value: 'PU', - label: 'Pesaro e Urbino', - }, { _id: 71, reg: 'ABR', value: 'PE', label: 'Pescara', }, { - _id: 72, - reg: 'EMR', - value: 'PC', - label: 'Piacenza', - }, { _id: 73, reg: 'TOS', value: 'PI', label: 'Pisa', }, { - _id: 74, - reg: 'TOS', - value: 'PT', - label: 'Pistoia', - }, { _id: 75, reg: 'FVG', value: 'PN', label: 'Pordenone', }, { - _id: 76, - reg: 'BAS', - value: 'PZ', - label: 'Potenza', - }, { _id: 77, reg: 'TOS', value: 'PO', label: 'Prato', }, { - _id: 78, - reg: 'SIC', - value: 'RG', - label: 'Ragusa', - }, { _id: 79, reg: 'EMR', value: 'RA', label: 'Ravenna', }, { - _id: 80, - reg: 'CAL', - value: 'RC', - label: 'Reggio CAL', - }, { _id: 81, reg: 'EMR', value: 'RE', label: 'Reggio Emilia', }, { - _id: 82, - reg: 'LAZ', - value: 'RI', - label: 'Rieti', - }, { _id: 83, reg: 'EMR', value: 'RN', label: 'Rimini', }, { - _id: 84, - reg: 'LAZ', - value: 'RM', - label: 'Roma', - }, { _id: 85, reg: 'VEN', value: 'RO', label: 'Rovigo', }, { - _id: 86, - reg: 'CAM', - value: 'SA', - label: 'Salerno', - }, { _id: 87, reg: 'SAR', value: 'VS', label: 'Medio Campidano', }, { - _id: 88, - reg: 'SAR', - value: 'SS', - label: 'Sassari', - }, { _id: 89, reg: 'LIG', value: 'SV', label: 'Savona', }, { - _id: 90, - reg: 'TOS', - value: 'SI', - label: 'Siena', - }, { _id: 91, reg: 'SIC', value: 'SR', label: 'Siracusa', }, { - _id: 92, - reg: 'LOM', - value: 'SO', - label: 'Sondrio', - }, { _id: 93, reg: 'PUG', value: 'TA', label: 'Taranto', }, { - _id: 94, - reg: 'ABR', - value: 'TE', - label: 'Teramo', - }, { _id: 95, reg: 'UMB', value: 'TR', label: 'Terni', }, { - _id: 96, - reg: 'PIE', - value: 'TO', - label: 'Torino', - }, { _id: 97, reg: 'SAR', value: 'OG', label: 'Ogliastra', }, { - _id: 98, - reg: 'SIC', - value: 'TP', - label: 'Trapani', - }, { _id: 99, reg: 'TAA', value: 'TN', label: 'Trento', }, { - _id: 100, - reg: 'VEN', - value: 'TV', - label: 'Treviso', - }, { _id: 101, reg: 'FVG', value: 'TS', label: 'Trieste', }, { - _id: 102, - reg: 'FVG', - value: 'UD', - label: 'Udine', - }, { _id: 103, reg: 'LOM', value: 'VA', label: 'Varese', }, { - _id: 104, - reg: 'VEN', - value: 'VE', - label: 'Venezia', - }, { _id: 105, reg: 'PIE', value: 'VB', label: 'Verbano-Cusio-Ossola', }, { - _id: 106, - reg: 'PIE', - value: 'VC', - label: 'Vercelli', - }, { _id: 107, reg: 'VEN', value: 'VR', label: 'Verona', }, { - _id: 108, - reg: 'CAL', - value: 'VV', - label: 'Vibo Valentia', - }, - { _id: 109, reg: 'VEN', value: 'VI', label: 'Vicenza', }, { - _id: 110, - reg: 'LAZ', - value: 'VT', - label: 'Viterbo', - }, - { _id: 111, reg: 'RSM', value: 'RSM', label: 'Repubblica di San Marino', }, - { _id: 112, reg: 'EST', value: 'EST', label: 'Estero', }, - { _id: 113, reg: 'ONL', value: 'ONL', label: 'On Line', }, - ], - Regions: [ { value: 'ABR', @@ -681,6 +400,8 @@ export const shared_consts = { SEND_TO_USER: 25, SEND_TO_GROUP: 30, SEND_TO_MYSELF: 40, + SEND_TO_TELEG_NO_USERNAME_TELEG: 50, + SEND_TO_TELEG_NO_VERIF_BY_APORTADOR: 60, }, TypeMsg_Actions: { @@ -689,6 +410,24 @@ export const shared_consts = { OPZ1_2: 2, }, + whatMsgToSend: { + MSG_OF_TEMPLATE: 1, + MSG_TEXT: 2, + }, + + selectwhatMsgToSend: [ + { + id: 1, + label: 'Messaggio su Template', + value: 1, //MSG_OF_TEMPLATE + }, + { + id: 2, + label: 'Messaggio di Testo', + value: 2, // MSG_TEXT + }, + ], + selectActions: [ { id: 0, @@ -707,6 +446,18 @@ export const shared_consts = { }, ], + selectSendReally: [ + { + id: 0, + label: 'Vedi quanti msg saranno inviati', + value: false, + }, + { + id: 1, + label: 'Invia il messaggio veramente', + value: true, + }, + ], selectDestination: [ { id: 0, @@ -733,6 +484,35 @@ export const shared_consts = { label: 'a Paolo (test)', value: 20, }, + { + id: 5, + label: 'a un Utente', + value: 25, //TypeMsg.SEND_TO_USER + }, + { + id: 6, + label: 'a un Gruppo', + value: 30, //SEND_TO_GROUP: 30, + + }, + { + id: 7, + label: 'a me stesso', + value: 40, //SEND_TO_MYSELF: 40, + + }, + { + id: 8, + label: 'Abilitati Telegram (senza Username telegram)', + value: 50, //SEND_TO_TELEG_NO_USERNAME_TELEG: 50, + + }, + { + id: 9, + label: 'Abilitati Telegram (Non Verificati dall\'Invitante)', + value: 60, //SEND_TO_TELEG_NO_VERIF_BY_APORTADOR: 60, + + }, ], OrderStatus: { diff --git a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue index 5ba206c2..56f0aaa2 100755 --- a/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue +++ b/src/components/CCheckIfIsLogged/CCheckIfIsLogged.vue @@ -8,13 +8,15 @@
- Accedi al menu inserendo le tue credenziali πŸ”‘

+ Accedi al menu inserendo le tue credenziali per entrare πŸ”‘
+
+ +
+
πŸ“ Non sei Registrato?
πŸ‘‰πŸ» Chiedi in chat il link a chi ti ha invitato.
- +
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 3c999483..8c5c3919 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -951,6 +951,9 @@ export default defineComponent({ // @ts-ignore newRecord.value = props.defaultnewrec() } + if (!newRecord.value) { + newRecord.value = {} + } newRecord.value['userId'] = userStore.my._id newRecord.value['idapp'] = process.env.APP_ID // globalStore.saveTable(mydata).then(ris => console.log('RISULT', ris)) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index f4727e42..89004f13 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -554,6 +554,7 @@ +
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts index 2cdecaa4..2e6bf17a 100755 --- a/src/components/CSignUp/CSignUp.ts +++ b/src/components/CSignUp/CSignUp.ts @@ -73,6 +73,7 @@ export default defineComponent({ const iamadult = ref(false) const duplicate_email = ref(false) const duplicate_username = ref(false) + const visureg = ref(false) const globalStore = useGlobalStore() @@ -297,6 +298,7 @@ export default defineComponent({ t, allowSubmit, myRuleEmail, + visureg, } }, }) diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue index e72d71ec..b5bee5bd 100755 --- a/src/components/CSignUp/CSignUp.vue +++ b/src/components/CSignUp/CSignUp.vue @@ -1,228 +1,254 @@ diff --git a/src/components/CStatusReg/CStatusReg.ts b/src/components/CStatusReg/CStatusReg.ts index bb9e8fd9..21b301aa 100755 --- a/src/components/CStatusReg/CStatusReg.ts +++ b/src/components/CStatusReg/CStatusReg.ts @@ -43,6 +43,8 @@ export default defineComponent({ num_passeggeri: 0, num_imbarcati: 0, num_teleg_attivo: 0, + num_autorizzare: 0, + num_autorizzati: 0, email_non_verif: 0, num_teleg_pending: 0, lastsreg: [], diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue index 8b587426..996c67da 100755 --- a/src/components/CStatusReg/CStatusReg.vue +++ b/src/components/CStatusReg/CStatusReg.vue @@ -7,8 +7,11 @@
- + + +
diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue index 55919d6e..9a0ffd49 100755 --- a/src/components/CUserNonVerif/CUserNonVerif.vue +++ b/src/components/CUserNonVerif/CUserNonVerif.vue @@ -8,12 +8,38 @@ -->
- + + +
πŸ”‘ Ora torna su Telegram ed imposta l'Username di Telegram:
+
+ πŸ’¬ In questo modo le persone potranno contattarti su Telegram senza aver bisogno del tuo numero di cellulare, e potranno farlo anche dalla APP.
+
+ πŸ‘‰πŸ» 1. Su telegram premi sull'icona (tre linee orizzontali) del menu principale in alto a sinistra.
+ πŸ‘‰πŸ» 2. Seleziona la voce Impostazioni nel menu.
+ πŸ‘‰πŸ» 3.Premi su Username nella sezione account.
+ πŸ‘‰πŸ» 4. Digita il tuo username. (deve essere un nome ancora libero e non giΓ  usato da altri).
+ πŸ‘‰πŸ» 5. Per confermare premi sull'icona con la spunta (V) in alto a destra.
+ + 🏁 Infine vai sul BOT RISO Telegram e scrivi OK nel messaggio. + +

+ + Se non ci riesci vedi la GUIDA PER IMPOSTARE + L'USERNAME SU TELEGRAM
+
+ + + - Appena sarai abilitato, dal tuo invitante {{tools.getAportadorSolidario()}}, ti arriverΓ  una notifica su Telegram.

- Se non dovesse arrivarti subito probabilmente {{tools.getAportadorSolidario()}} non ha il cellulare a portata di mano.
+ Appena sarai abilitato, dal tuo invitante {{ tools.getAportadorSolidario() }}, ti arriverΓ  una notifica su Telegram.

+ Se non dovesse arrivarti entro 24 ore prova a mandargli un messaggio.
 -
diff --git a/src/components/Header/Header.ts b/src/components/Header/Header.ts index fcd07acf..553fb497 100755 --- a/src/components/Header/Header.ts +++ b/src/components/Header/Header.ts @@ -128,6 +128,7 @@ export default defineComponent({ } function setLangAtt(mylang: string) { + console.log('LANG =', mylang) // console.log('PRIMA $q.lang.isoName', $q.lang.isoName) @@ -189,12 +190,12 @@ export default defineComponent({ // tools.showNotif($q, 'IMPOSTA LANG= ' + $i18n.locale) // console.log('IMPOSTA LANG= ' + $i18n.locale) - userStore.setlang($router, $q.lang.getLocale()) - let mylangtopass = mylang mylangtopass = toolsext.checkLangPassed($q, $router, mylangtopass) + userStore.setlang($router, mylangtopass) + setshortlang(mylangtopass) setLangAtt(mylangtopass) diff --git a/src/css/app.scss b/src/css/app.scss index 19b5227b..44b63fad 100755 --- a/src/css/app.scss +++ b/src/css/app.scss @@ -969,3 +969,6 @@ $heightBtn: 100%; font-weight: bold; } +.regione{ + +} diff --git a/src/db/lang/ws_de.js b/src/db/lang/ws_de.js index 0a88fde2..a36ebea3 100755 --- a/src/db/lang/ws_de.js +++ b/src/db/lang/ws_de.js @@ -41,6 +41,8 @@ const msg_website_de = { dbop: 'Operazioni', statusreg: { reg: 'Partecipanti', + verifieds: 'Verificati', + autorizzati: 'Autorizzati', passeggeri: 'Passeggeri Navi', giainlista: 'Gia in Lista', newreg: 'Ultime Registrazioni:', diff --git a/src/db/lang/ws_enUs.js b/src/db/lang/ws_enUs.js index 54a36e24..bf27674a 100755 --- a/src/db/lang/ws_enUs.js +++ b/src/db/lang/ws_enUs.js @@ -82,6 +82,9 @@ const msg_website_enUs = { favproj: 'Favoriti', statusreg: { reg: 'Participants', + verifieds: 'Verificati', + autorizzati: 'Autorizzati', + autorizzare: 'In attesa di Abilitazione', passeggeri: 'Passengers Ships', giainlista: 'Already in the List', newreg: 'New registrations:', diff --git a/src/db/lang/ws_es.js b/src/db/lang/ws_es.js index 3468b00e..8dcae921 100755 --- a/src/db/lang/ws_es.js +++ b/src/db/lang/ws_es.js @@ -83,6 +83,9 @@ const msg_website_es = { favproj: 'Favoriti', statusreg: { reg: 'Participantes', + verifieds: 'Verificati', + autorizzati: 'Autorizzati', + autorizzare: 'In attesa di Abilitazione', passeggeri: 'Barcos de pasajeros', giainlista: 'Gia in Lista', newreg: 'Nuevas inscripciones :', diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js index e097e507..c4c1106f 100755 --- a/src/db/lang/ws_it.js +++ b/src/db/lang/ws_it.js @@ -83,6 +83,9 @@ const msg_website_it = { favproj: 'Favoriti', statusreg: { reg: 'Partecipanti', + verifieds: 'Verificati', + autorizzati: 'Autorizzati', + autorizzare: 'In attesa di Abilitazione', passeggeri: 'Passeggeri Navi', giainlista: 'Gia in Lista', newreg: 'Ultime Registrazioni:', diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 8376da07..0c94beb5 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -94,19 +94,6 @@ const routes_admin: IListRoutes[] = [ submenu: true, onlyAdmin: true }, - { - active: true, - order: 1030, - path: '/admin/sendpushnotif', - materialIcon: 'event_seat', - name: 'otherpages.manage.sendpushnotif', - component: () => import('@/rootgen/admin/sendpushnotif/sendpushnotif.vue'), - level_parent: 0.0, - level_child: 0.5, - inmenu: true, - submenu: true, - onlyAdmin: true - }, { active: true, order: 1040, @@ -350,6 +337,20 @@ const routes_manager: IListRoutes[] = [ onlyManager: true // onlyTutor: true }, + { + active: true, + order: 1030, + path: '/admin/sendpushnotif', + materialIcon: 'event_seat', + name: 'otherpages.manage.sendpushnotif', + component: () => import('@/rootgen/admin/sendpushnotif/sendpushnotif.vue'), + level_parent: 0.0, + level_child: 0.5, + inmenu: true, + submenu: true, + onlyAdmin: true, + onlyManager: true, + }, { active: true, order: 40, @@ -718,8 +719,8 @@ const baseroutes: IListRoutes[] = [ const arrLangUsed = [ 'it', - 'enUs', - 'es', + // 'enUs', + // 'es', ] const lang_available: ILang[] = [ diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 0487e371..9e6cd48a 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -23,6 +23,8 @@ export interface INotData { num_imbarcati?: number email_non_verif?: number num_teleg_attivo?: number + num_autorizzare?: number + num_autorizzati?: number num_teleg_pending?: number num_part_zoom?: number num_part_accepted?: number @@ -299,7 +301,7 @@ export interface IGlobalState { sectors: ISector[], sectorgoods: ISectorGood[], catgrps: ICatGrp[], - cities: ICity[], + provinces: IProvince[], datastat?: INotData } @@ -626,6 +628,7 @@ export interface IMsgGlobParam { groupnameDest?: string text?: string typesend: number + sendreally?: boolean } export interface IDataToSet { @@ -756,6 +759,14 @@ export interface ICity { prov: string } +export interface IProvince { + _id: number + prov: string + reg: string + descr: string + link_grp: string +} + export interface IMySkill { _id: number idSector: number diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index 457153d6..c15ed99c 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -32,6 +32,7 @@ export default defineComponent({ const inputfile = ref('') const risultato = ref('') + const risraw = ref('') const caricaDatiToggle = ref(false) @@ -395,6 +396,32 @@ export default defineComponent({ userStore.importToServerCmd($q, t, cosafare.value, null) } + function createProvLink() { + let str = '' + + const arr = globalStore.provinces + + let regione = '' + let regid = '' + + for (const prov of arr) { + if (prov.link_grp) { + if (prov.reg !== regid) { + const myreg = shared_consts.Regions.find((rec: any) => rec.value === prov.reg) + if (myreg) { + regid = myreg.value + regione = myreg.label + str += '
' + regione + '
' + } + } + str += '' + prov.descr + '
' + } + } + + risultato.value = str + risraw.value = str + } + onMounted(created) return { @@ -407,6 +434,8 @@ export default defineComponent({ eseguiCmd, caricaDatiToggle, caricadati, + createProvLink, + risraw, } } }) diff --git a/src/rootgen/admin/importdata/importdata.vue b/src/rootgen/admin/importdata/importdata.vue index c11ba74a..4ecc48ab 100755 --- a/src/rootgen/admin/importdata/importdata.vue +++ b/src/rootgen/admin/importdata/importdata.vue @@ -20,8 +20,15 @@ label="Esegui" @click="eseguiCmd"> +
+ + +

+
{{ risraw }}

diff --git a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts index 574e7f44..0c7fbb2c 100755 --- a/src/rootgen/admin/sendpushnotif/sendpushnotif.ts +++ b/src/rootgen/admin/sendpushnotif/sendpushnotif.ts @@ -1,9 +1,10 @@ import { CMyPage } from '../../../components/CMyPage/index' +import { CMyEditor } from '../../../components/CMyEditor/index' import { shared_consts } from '@src/common/shared_vuejs' import { tools } from '@src/store/Modules/tools' -import { defineComponent, ref, onMounted } from 'vue' +import { defineComponent, ref, onMounted, watch } from 'vue' import { useI18n } from '@src/boot/i18n' import { useUserStore } from '@store/UserStore' import { useGlobalStore } from '@store/globalStore' @@ -12,7 +13,7 @@ import { IMsgGlobParam } from 'model' export default defineComponent({ name: 'Sendpushnotif', - components: { CMyPage }, + components: { CMyPage, CMyEditor }, setup(props, { emit }) { const $q = useQuasar() const { t } = useI18n() @@ -29,13 +30,68 @@ export default defineComponent({ const opz2= ref('') const tag= ref('') const actiontype = ref(shared_consts.TypeMsg_Actions.NORMAL) - const destination = ref(shared_consts.TypeMsg.SEND_TO_ALL) + const whatMsg = ref(shared_consts.whatMsgToSend.MSG_TEXT) + const destination = ref(shared_consts.TypeMsg.SEND_TO_MYSELF) + const sendreally = ref(false) + const templmsgid = ref(0) + const mytempl = ref(null) + + const mytab = ref('telegram') + const arrTemplate = ref([]) + const recMsgTempl = ref([]) + const mymsg = ref('') + const msgold = ref('') + + watch(() => whatMsg.value, (newval: any, oldval) => { + + if (whatMsg.value !== shared_consts.whatMsgToSend.MSG_TEXT) { + msgold.value = mymsg.value + } else { + mymsg.value = msgold.value + } + + load() + + }) + + watch(() => templmsgid.value, (newval: any, oldval) => { + + if (newval && recMsgTempl.value.length > 0) { + mytempl.value = recMsgTempl.value.find((rec: any) => rec._id === newval) + mymsg.value = mytempl.value.msg_it + } + + }) + + async function load() { + if (whatMsg.value === shared_consts.whatMsgToSend.MSG_OF_TEMPLATE) { + recMsgTempl.value = await globalStore.GetMsgTemplates() + + for (const rec of recMsgTempl.value) { + arrTemplate.value.push({id: rec._id, value: rec._id, label: rec.title}) + } + + if (templmsgid.value) { + if (recMsgTempl.value.length > 0) { + templmsgid.value = recMsgTempl.value[0]._id; + } + } + if (templmsgid.value) { + mytempl.value = recMsgTempl.value.find((rec: any) => rec._id === templmsgid.value) + mymsg.value = '' + mymsg.value = mytempl.value.msg_it + } + } + + } function created() { title.value = t('ws.sitename') openUrl.value = '/' openUrl2.value = '' tag.value = 'msg' + + load() } function SendMsg(params: any) { @@ -66,7 +122,7 @@ export default defineComponent({ }) } - function SendMsgToParam(typemsg: any) { + function SendMsgToParam(typemsg: any, typesend: number = shared_consts.TypeSend.PUSH_NOTIFICATION, sendreally: any = false) { let param: IMsgGlobParam = { typemsg, @@ -76,9 +132,15 @@ export default defineComponent({ openUrl2: openUrl2.value, tag: tag.value, actions: [], - typesend: shared_consts.TypeSend.PUSH_NOTIFICATION + typesend, + sendreally } + if (typesend === shared_consts.TypeSend.TELEGRAM) { + param.content = mymsg.value + } + + param.actions = [] if (actiontype.value === shared_consts.TypeMsg_Actions.YESNO) { @@ -100,9 +162,9 @@ export default defineComponent({ return SendMsg(param) } - function SendMsgToAll() { + function SendMsgToAll(typesend: number) { - SendMsgToParam(destination.value) + SendMsgToParam(destination.value, typesend, sendreally.value) } onMounted(created) @@ -113,13 +175,20 @@ export default defineComponent({ openUrl, openUrl2, actiontype, + whatMsg, destination, + sendreally, SendMsgToAll, opz1, opz2, content, shared_consts, incaricamento, + mytab, + templmsgid, + arrTemplate, + mytempl, + mymsg, } } }) diff --git a/src/rootgen/admin/sendpushnotif/sendpushnotif.vue b/src/rootgen/admin/sendpushnotif/sendpushnotif.vue index 60aa8d84..2923168d 100755 --- a/src/rootgen/admin/sendpushnotif/sendpushnotif.vue +++ b/src/rootgen/admin/sendpushnotif/sendpushnotif.vue @@ -1,47 +1,130 @@