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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MESSAGGIO DA INVIARE:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+