-
![]()
-
online
+
![]()
+
online
- {{ tools.getNameToShow(row) }}
+ {{ tools.getNameToShow(row, col) }}
{{
- tools.getUserNameOnlyIfToShow(row)
+ tools.getUserNameOnlyIfToShow(row, col)
}}
diff --git a/src/components/CSaldo/CSaldo.vue b/src/components/CSaldo/CSaldo.vue
index b1daf633..6a53bbf9 100755
--- a/src/components/CSaldo/CSaldo.vue
+++ b/src/components/CSaldo/CSaldo.vue
@@ -20,14 +20,14 @@
-
{{ t('movement.pendingtransaction') }}
diff --git a/src/components/CStatusReg/CStatusReg.scss b/src/components/CStatusReg/CStatusReg.scss
index e69de29b..e85fe059 100755
--- a/src/components/CStatusReg/CStatusReg.scss
+++ b/src/components/CStatusReg/CStatusReg.scss
@@ -0,0 +1,3 @@
+.index_diffusore {
+ font-size: 1rem;
+}
diff --git a/src/components/CStatusReg/CStatusReg.ts b/src/components/CStatusReg/CStatusReg.ts
index 5606b819..a4587787 100755
--- a/src/components/CStatusReg/CStatusReg.ts
+++ b/src/components/CStatusReg/CStatusReg.ts
@@ -60,6 +60,7 @@ export default defineComponent({
num_teleg_pending: 0,
lastsreg: [],
lastsonline: [],
+ diffusorilist: [],
checkuser: { verified_email: false }
})
@@ -81,6 +82,9 @@ export default defineComponent({
const lastsonline = computed(() => {
return datastat.value.lastsonline
})
+ const diffusorilist = computed(() => {
+ return datastat.value.diffusorilist
+ })
watch(() => $q.appVisible, (value: any, oldval: any) => {
// console.log('visible', value)
@@ -197,6 +201,7 @@ export default defineComponent({
emailnonverif,
lastsreg,
lastsonline,
+ diffusorilist,
datastat,
tools,
costanti,
diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue
index 6d2a2b8e..cbc2c6dc 100755
--- a/src/components/CStatusReg/CStatusReg.vue
+++ b/src/components/CStatusReg/CStatusReg.vue
@@ -54,8 +54,21 @@
-
-
+
+
+
@@ -142,6 +155,60 @@
+
+
+
I Migliori Invitanti su RISO:
+
Indica il numero di persone registrate tramite il link d'invito personale.
+
+
+
+
+
+
+ ![]()
+ online
+
+
+
+
+ {{ index + 1 }}°
+
+
+ {{ tools.getNameToShow(user) }}
+ {{
+ tools.getUserNameOnlyIfToShow(user)
+ }}
+
+ {{
+ user.count
+ }}
+
+
+
+
+
diff --git a/src/css/app.scss b/src/css/app.scss
index ea063551..79f4e4b8 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -818,9 +818,8 @@ h3 {
border: solid 2px #49b502;
}
-.bordo_stondato_pending {
+.bordo_stondato_pending, .bordo_quadrato_pending {
margin: 4px;
- border-radius: 3rem;
padding-left: 14px;
padding-right: 14px;
padding-top: 0px;
@@ -828,6 +827,10 @@ h3 {
border: solid 1px #4a6598;
}
+.bordo_stondato_pending {
+ border-radius: 3rem;
+}
+
.bordo_stondato_circuiti {
margin: 4px;
border-radius: 1.15rem;
@@ -1311,6 +1314,7 @@ h3 {
.last_access {
opacity: 0.7;
margin-top: -10px;
+ color: white;
z-index: 1000;
margin-bottom: 5px;
padding: 5px;
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 6a8d1e42..592e5baf 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -99,8 +99,9 @@ const msg_website_it = {
autorizzare: 'In attesa di Abilitazione',
passeggeri: 'Passeggeri Navi',
giainlista: 'Gia in Lista',
- newreg: 'Ultimi Registrati',
- onlineusers: 'Utenti OnLine',
+ newreg: 'Registrati',
+ onlineusers: 'OnLine',
+ diffusori: 'Diffusori',
nationality: 'Nazionalità',
nationality_born: 'Nazione di Nascita',
verified: 'Verificata',
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 829ae4db..b6f812a8 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -33,6 +33,7 @@ export interface INotData {
arr_nations?: string
lastsreg?: IUserFields[]
lastsonline?: IUserFields[]
+ diffusorilist?: IUserFields[]
checkuser?: ICheckUser | any
numreg_untilday?: number
reg_daily?: string
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index b185dff6..e55fafe9 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -3614,7 +3614,7 @@ export const tools = {
return date.addToDate(mydate, { days })
},
- isUserOnline(user: IUserFields) {
+ isUserOnline(user: IUserFields, col: any = null) {
const dateonline = tools.addDays(tools.getDateNow(), -1)
return user.lasttimeonline && new Date(user.lasttimeonline).getTime() > dateonline.getTime()
},
@@ -7344,18 +7344,18 @@ export const tools = {
return ''
},
- getNameToShow(user: IUserFields): string {
+ getNameToShow(user: IUserFields, col: any = null): string {
const userStore = useUserStore()
- let name = userStore.getNameToShow(user)
+ let name = userStore.getNameToShow(user, col)
return name
},
- getUserNameOnlyIfToShow(user: IUserFields): string {
+ getUserNameOnlyIfToShow(user: IUserFields, col: any = null): string {
const userStore = useUserStore()
- let name = userStore.getUserNameOnlyIfToShow(user)
+ let name = userStore.getUserNameOnlyIfToShow(user, col)
return name
},
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index 45be3d7e..baf1ce62 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -304,16 +304,20 @@ export const useUserStore = defineStore('UserStore', {
return img ? img : 'images/noimg-user.svg'
},
- getImgByProfile(userparam: IUserFields, reale: any = false): string {
+ getImgByProfile(userparam: any, reale: any = false, col: any = null): string {
try {
- if (userparam.profile && userparam.profile.img) {
- return costanti.DIR_UPLOAD + 'profile/' + userparam.username + '/' + userparam.profile.img
+ let myrec = this.getRecByCol(userparam, col)
+
+ if (myrec.profile && myrec.profile.img) {
+ return costanti.DIR_UPLOAD + 'profile/' + myrec.username + '/' + myrec.profile.img
+ } else {
+ return 'images/noimg-user.svg'
}
} catch (e) {
//
}
if (!reale)
- return 'images/noimg.png'
+ return 'images/noimg-user.svg'
else
return ''
},
@@ -426,24 +430,40 @@ export const useUserStore = defineStore('UserStore', {
return `(${username})`
},
- getNameToShow(user: IUserFields): string {
+ getRecByCol(user: any, col: any = null) {
+ let myrec = user
+ if (col && col.field === 'userto')
+ myrec = user.userto
+ if (col && col.field === 'userfrom')
+ myrec = user.userfrom
+
+ return myrec
+ },
+
+ getNameToShow(user: any, col: any = null): string {
let name = ''
- if (!!user.name)
- name = user.name
- if (!!user.surname)
- name += ' ' + user.surname
+ let myrec = this.getRecByCol(user, col)
+
+ if (!!myrec.name)
+ name = myrec.name
+ if (!!myrec.surname)
+ name += ' ' + myrec.surname
if (!name) {
- name = user.username
+ name = myrec.username
+ }
+ if (col && col.field === 'extrarec' && !name) {
+ name = myrec.dest
}
return name
},
- getUserNameOnlyIfToShow(user: IUserFields): string {
+ getUserNameOnlyIfToShow(user: any, col: any = null): string {
+ let myrec = this.getRecByCol(user, col)
- if (user.name || user.surname) {
- return user.username
+ if (myrec.name || myrec.surname) {
+ return myrec.username
}
return ''
@@ -1281,7 +1301,7 @@ export const useUserStore = defineStore('UserStore', {
tools.showPositiveNotif($q, msgok)
if (mydata.cmd === shared_consts.MsgTeleg.SHARE_MSGREG) {
if (!tools.isTelegOk()) {
- // console.log('text', res.data.text)
+ // console.log('text', res.data.text)
tools.copyStringToClipboardSilent(res.data.text)
}
if (res.data.textsent) {
diff --git a/src/views/requestresetpwd/requestresetpwd.ts b/src/views/requestresetpwd/requestresetpwd.ts
index 7f03d6eb..ce2f94c4 100755
--- a/src/views/requestresetpwd/requestresetpwd.ts
+++ b/src/views/requestresetpwd/requestresetpwd.ts
@@ -25,7 +25,8 @@ export default defineComponent({
const emailsent = ref(false)
const form = reactive({
email: '',
- tokenforgot: ''
+ tokenforgot: '',
+ tokenforgot_code: ''
})
// @ts-ignore