diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index 30a564c4..a0f73700 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -248,6 +248,7 @@ export default defineComponent({
const myrecdialog = ref(null)
const startsearch = ref(false)
+ const clickbuttsearch = ref(false)
const $router = useRouter()
@@ -283,7 +284,7 @@ export default defineComponent({
const colclicksel = ref(null)
const selected: any = ref([])
- const showfilteradv = ref(false) // filtri avanzati
+ const showfilter = ref(false) // filtri avanzati
const filter = ref(0)
const filtergrp = ref(costanti.MY_GROUPS)
@@ -312,8 +313,8 @@ export default defineComponent({
}
})
- watch(() => showfilteradv.value, (newval: any, from: any) => {
- tools.setCookie('s_adv', newval)
+ watch(() => showfilter.value, (newval: any, from: any) => {
+ tools.setCookie('s_adv', newval ? '1' : '0')
})
watch(() => props.filtercustom, (to: any, from: any) => {
@@ -849,10 +850,10 @@ export default defineComponent({
// calculate starting row of data
const startRow = numRecLoaded.value
const endRow = startRow + fetchCount
- console.log('startRow', startRow, 'endRow', endRow, 'fetchCount', fetchCount)
+ console.log('startRow', startRow, 'endRow', endRow, 'rowsNumber', pagination.value.rowsNumber)
- if (startRow < pagination.value.rowsNumber) {
+ if ((startRow < pagination.value.rowsNumber) || clickbuttsearch.value) {
// fetch data from "server"
return fetchFromServer(startRow, endRow, myfilternow, myfilterandnow, sortBy, descending).then((ris: any) => {
@@ -890,7 +891,7 @@ export default defineComponent({
}
console.log(' ...DONE ')
- done()
+ done(pagination.value.rowsNumber === 0 ? true : false)
})
} else {
startsearch.value = false
@@ -930,6 +931,7 @@ export default defineComponent({
function refresh() {
console.log('refresh', 'startsearch', startsearch.value)
+ clickbuttsearch.value = true
// console.log('refresh')
if (startsearch.value)
return false
@@ -963,6 +965,7 @@ export default defineComponent({
refresh_table()
}
+ clickbuttsearch.value = false
}
watch(() => mycodeid.value, (newval, oldval) => {
@@ -1245,7 +1248,7 @@ export default defineComponent({
myvertical.value = props.vertical
// myvertical.value = tools.getCookie('myv_' + props.prop_mytable, props.vertical)
- showfilteradv.value = tools.getCookie('s_adv', false)
+ showfilter.value = tools.getCookie('s_adv', '0') !== '0'
}
function mounted() {
@@ -1868,11 +1871,15 @@ export default defineComponent({
function onLoadScroll (index: number, done: any) {
if (index > 0) {
console.log('onLoadScroll', index, 'RECLOAD', numRecLoaded.value, 'ROWS: ', pagination.value.rowsNumber)
- if (numRecLoaded.value >= pagination.value.rowsNumber) {
- done(true)
- } else {
+ if (numRecLoaded.value < pagination.value.rowsNumber || (pagination.value.rowsNumber <= 0 && clickbuttsearch.value)) {
+ if (pagination.value.rowsNumber === 0) {
+ pagination.value.page = 0
+ }
+
pagination.value.page = pagination.value.page + 1
refresh_infscroll(done)
+ } else {
+ done(true)
}
}
}
@@ -1956,7 +1963,7 @@ export default defineComponent({
getValueExtra,
shared_consts,
getLabelFooterByRow,
- showfilteradv,
+ showfilter,
cmdExt,
visupagedialog,
myrecdialog,
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 118047e7..455fc5fb 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -35,14 +35,16 @@
-
+
@@ -162,8 +166,11 @@
v-on:keyup.enter="doSearch"
>
-
-
+
+
+
+
+
@@ -191,48 +198,47 @@
{{ pagination.rowsNumber }} elemento trovato
{{ pagination.rowsNumber }} elementi trovati
- numRecLoaded: {{numRecLoaded}}
-
- INFINITE:
+
-
+ >
-
- {{ actual = tools.getstrVeryShortDate(row.dateTimeStart) }}
- {{ tools.getstrDateLong(row.dateTimeStart) }}
-
+
+
+
+
+ {{ actual = tools.getstrVeryShortDate(row.dateTimeStart) }}
+ {{ tools.getstrDateLong(row.dateTimeStart) }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
[])
const filtroutente = ref([])
@@ -154,12 +155,14 @@ export default defineComponent({
function loadFriends() {
// Carica il profilo di quest'utente
if (username.value) {
+ spinner_visible.value = true
userStore.loadFriends(username.value).then((ris) => {
// console.log('ris', ris)
if (ris) {
listTrusted.value = ris.listTrusted ? ris.listTrusted : []
filtroutente.value = [{ userId: userStore.my._id }]
}
+ spinner_visible.value = false
})
}
@@ -237,6 +240,7 @@ export default defineComponent({
setCmd,
updateValue,
myoptions,
+ spinner_visible,
}
}
})
diff --git a/src/components/CMyFriends/CMyFriends.vue b/src/components/CMyFriends/CMyFriends.vue
index b8b08c62..535a42d1 100755
--- a/src/components/CMyFriends/CMyFriends.vue
+++ b/src/components/CMyFriends/CMyFriends.vue
@@ -16,6 +16,9 @@
/>
+
+
+
diff --git a/src/components/MyFooter/MyFooter.scss b/src/components/MyFooter/MyFooter.scss
index e69de29b..cf620a6c 100755
--- a/src/components/MyFooter/MyFooter.scss
+++ b/src/components/MyFooter/MyFooter.scss
@@ -0,0 +1,3 @@
+.q-tab__label {
+ font-size: 0.7rem !important;
+}
diff --git a/src/components/MyFooter/MyFooter.vue b/src/components/MyFooter/MyFooter.vue
index 54d52705..b417a3bf 100755
--- a/src/components/MyFooter/MyFooter.vue
+++ b/src/components/MyFooter/MyFooter.vue
@@ -5,31 +5,43 @@
bordered
>
@@ -40,6 +52,6 @@
-
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 194add16..54b8e785 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -883,12 +883,17 @@ export interface IMyHosp extends IMyMain {
date_updated?: Date,
}
+export interface ICircuitList {
+ Num: number,
+ inscription_date?: Date
+}
export interface ICircuit {
_id: number
+ groupnameId: string
name: string
subname: string
- descr: string
+ longdescr: string
systemUserDescr: string
systemUserId: string
founderUserId: string
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index c461d1a9..9c7aae2b 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -1,6 +1,6 @@
import { IToken } from '@model/other'
import { ICart, IOrderCart, IShareWithUs } from '@src/model/Products'
-import { IGallery, IImgGallery } from '@model/GlobalStore'
+import { ICircuit, ICircuitList, IGallery, IImgGallery } from '@model/GlobalStore'
const enum ESexType {
None = 0,
@@ -30,6 +30,7 @@ export interface IMyGroup {
username_who_block?: string
date_blocked?: Date
createdBy?: string
+ circuits_list?: ICircuitList[]
}
export interface ICalcStat {
diff --git a/src/rootgen/admin/circuitsList/circuitsList.vue b/src/rootgen/admin/circuitsList/circuitsList.vue
index cee65a69..c7703763 100755
--- a/src/rootgen/admin/circuitsList/circuitsList.vue
+++ b/src/rootgen/admin/circuitsList/circuitsList.vue
@@ -3,7 +3,7 @@
filter.value, (newval: any, oldval) => {
diff --git a/src/views/user/mygroup/mygroup.vue b/src/views/user/mygroup/mygroup.vue
index aef0ce1d..9869d57a 100755
--- a/src/views/user/mygroup/mygroup.vue
+++ b/src/views/user/mygroup/mygroup.vue
@@ -100,10 +100,11 @@
-->
-
-
+
+
+ :label="t('groups.subscribes')" name="members" icon="fas fa-users">
+
@@ -234,7 +235,10 @@
-
+
+
+
+