diff --git a/src/components/CFindUsers/CFindUsers.ts b/src/components/CFindUsers/CFindUsers.ts index 8b00c94b..b0580d80 100755 --- a/src/components/CFindUsers/CFindUsers.ts +++ b/src/components/CFindUsers/CFindUsers.ts @@ -1,28 +1,37 @@ -import { computed, defineComponent, onMounted, PropType, ref, watch, reactive, toRefs } from 'vue' +import { + computed, + defineComponent, + onMounted, + PropType, + ref, + watch, + reactive, + toRefs, +} from 'vue'; import type { ISearchList } from '../../model'; -import { ICalcStat, IOperators } from '../../model' -import { useUserStore } from '../../store/UserStore' -import { useRouter } from 'vue-router' -import { useGlobalStore } from '../../store/globalStore' -import { useCircuitStore } from '../../store/CircuitStore' -import { useI18n } from 'vue-i18n' +import { ICalcStat, IOperators } from '../../model'; +import { useUserStore } from '../../store/UserStore'; +import { useRouter } from 'vue-router'; +import { useGlobalStore } from '../../store/globalStore'; +import { useCircuitStore } from '../../store/CircuitStore'; +import { useI18n } from 'vue-i18n'; -import { shared_consts } from '@src/common/shared_vuejs' -import { costanti, IMainCard } from '@store/Modules/costanti' +import { shared_consts } from '@src/common/shared_vuejs'; +import { costanti, IMainCard } from '@store/Modules/costanti'; -import { CMyUser } from '../CMyUser' -import { CTitleBanner } from '../CTitleBanner' -import { CMyGroup } from '../CMyGroup' -import { CQRCode } from '../CQRCode' -import { CCopyBtnSmall } from '../CCopyBtnSmall' -import { CContactUser } from '../CContactUser' -import { CGridTableRec } from '../CGridTableRec' -import { CUserInfoAccount } from '../CUserInfoAccount' -import { tools } from '@tools' -import { useQuasar } from 'quasar' +import { CMyUser } from '../CMyUser'; +import { CTitleBanner } from '../CTitleBanner'; +import { CMyGroup } from '../CMyGroup'; +import { CQRCode } from '../CQRCode'; +import { CCopyBtnSmall } from '../CCopyBtnSmall'; +import { CContactUser } from '../CContactUser'; +import { CGridTableRec } from '../CGridTableRec'; +import { CUserInfoAccount } from '../CUserInfoAccount'; +import { tools } from '@tools'; +import { useQuasar } from 'quasar'; -import { colmyUserPeople } from '@store/Modules/fieldsTable' +import { colmyUserPeople, colmyUserGroup } from '@store/Modules/fieldsTable'; export default defineComponent({ name: 'CFindUsers', @@ -39,51 +48,62 @@ export default defineComponent({ }, }, components: { - CMyUser, CMyGroup, CUserInfoAccount, CCopyBtnSmall, - CTitleBanner, CContactUser, CGridTableRec, CQRCode + CMyUser, + CMyGroup, + CUserInfoAccount, + CCopyBtnSmall, + CTitleBanner, + CContactUser, + CGridTableRec, + CQRCode, }, setup(props) { + const userStore = useUserStore(); + const globalStore = useGlobalStore(); + const circuitStore = useCircuitStore(); + const { t } = useI18n(); + const $q = useQuasar(); + const $router = useRouter(); - const userStore = useUserStore() - const globalStore = useGlobalStore() - const circuitStore = useCircuitStore() - const { t } = useI18n() - const $q = useQuasar() - const $router = useRouter() + const receiveRislist = computed(() => + globalStore.datastat ? globalStore.datastat.receiveRislist : [] + ); + const receiveRislistgroup = computed(() => + globalStore.datastat ? globalStore.datastat.receiveRislistgroup : [] + ); + const listlinksreg = computed(() => + globalStore.datastat ? globalStore.datastat.listlinksreg : [] + ); - const receiveRislist = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislist : []) - const receiveRislistgroup = computed(() => globalStore.datastat ? globalStore.datastat.receiveRislistgroup : []) - const listlinksreg = computed(() => globalStore.datastat ? globalStore.datastat.listlinksreg : []) + const arrfilterand: any = ref([]); + const filtercustom: any = ref([]); + const searchList = ref([]); - const arrfilterand: any = ref([]) - const filtercustom: any = ref([]) - const searchList = ref([]) + const filter = ref(costanti.FIND_PEOPLE); - const filter = ref(costanti.FIND_PEOPLE) + const loading = ref(false); + const tipoConto = ref(0); - const loading = ref(false) - const tipoConto = ref(0) + const contact = computed(() => userStore.my); - const contact = computed(() => userStore.my) + const searchType = ref('receivers'); - const searchType = ref('receivers') - - const usersList = ref({ show: false, title: '', list: [], listgroup: [] }) + const usersList = ref({ show: false, title: '', list: [], listgroup: [] }); const options = ref([ { label: 'Lista dei Riceventi di oggi', - value: 'receivers' + value: 'receivers', }, { label: 'Cerca per Nome o Username', - value: 'username' + value: 'username', }, { label: 'Scansiona il QRCode del Destinatario', - value: 'qrcode' + value: 'qrcode', }, - ]) + ]); const arrTypesAccounts = ref([ { @@ -93,22 +113,20 @@ export default defineComponent({ { label: t('circuit.conticollettivi'), value: shared_consts.AccountType.CONTO_DI_GRUPPO, - } - ]) - + }, + ]); function getFilterProvinceByRegion(recProvince: any, index: number, arr: any) { - const recreg: any = searchList.value.find((rec) => rec.table === 'regions') + const recreg: any = searchList.value.find((rec) => rec.table === 'regions'); if (recreg) { - return recProvince.reg === recreg.value + return recProvince.reg === recreg.value; } else { - return true + return true; } } function mounted() { - - usersList.value.listlinkreg = listlinksreg + usersList.value.listlinkreg = listlinksreg; searchList.value = [ { @@ -123,7 +141,7 @@ export default defineComponent({ arrvalue: [], filter: null, useinput: false, - icon: 'fas fa-globe-europe' + icon: 'fas fa-globe-europe', }, { visible: true, @@ -131,7 +149,10 @@ export default defineComponent({ table: 'provinces', key: 'profile.resid_province', type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + 'provinces_fr', costanti.FILTER_TUTTI), + value: tools.getCookie( + tools.COOK_SEARCH + 'provinces_fr', + costanti.FILTER_TUTTI + ), keycookie: '_fr', addall: true, arrvalue: [], @@ -140,21 +161,48 @@ export default defineComponent({ icon: 'flag', tablesel: 'provinces', }, - ] + ]; - filtercustom.value = [] - arrfilterand.value = [] + filtercustom.value = []; + arrfilterand.value = []; - const filt_loaded = tools.getCookie(tools.COOK_SEARCH + tools.FRIENDS_SEARCH, costanti.FIND_PEOPLE, true) - filter.value = filt_loaded ? filt_loaded : costanti.FIND_PEOPLE + const filt_loaded = tools.getCookie( + tools.COOK_SEARCH + tools.FRIENDS_SEARCH, + costanti.FIND_PEOPLE, + true + ); + filter.value = filt_loaded ? filt_loaded : costanti.FIND_PEOPLE; - updateUserListRIS() + updateUserListRIS(); - sendCoinsToClick() + sendCoinsToClick(); + } + + function extraparams_groups() { + const lk_tab = 'mygroups'; + const lk_LF = 'userId'; + const lk_FF = '_id'; + const lk_as = 'group'; + const af_objId_tab = 'myId'; + + return { + lookup1: { + lk_tab, + lk_LF, + lk_FF, + lk_as, + af_objId_tab, + lk_proj: { + groupname: 1, + title: 1, + descr: 1, + photos: 1, + }, + }, + }; } function extraparams() { - return { lookup1: { lk_tab: 'provinces', @@ -175,38 +223,34 @@ export default defineComponent({ 'profile.resid_province': 1, 'mycities.reg': 1, perm: 1, - } + }, }, - - } + }; } - - onMounted(mounted) + onMounted(mounted); async function updateUserListRIS() { - const userStore = useUserStore() + const userStore = useUserStore(); - loading.value = true + loading.value = true; - await globalStore.getStatSite() + await globalStore.getStatSite(); - usersList.value.list = receiveRislist - usersList.value.listgroup = receiveRislistgroup + usersList.value.list = receiveRislist; + usersList.value.listgroup = receiveRislistgroup; // usersList.value.listlinkreg = listlinksreg - loading.value = false + loading.value = false; } async function sendCoinsToClick() { - usersList.value.show = true; usersList.value.title = t('circuit.sendcoins'); - usersList.value.list = receiveRislist - usersList.value.listgroup = receiveRislistgroup + usersList.value.list = receiveRislist; + usersList.value.listgroup = receiveRislistgroup; } - return { userStore, tools, @@ -218,6 +262,7 @@ export default defineComponent({ t, extraparams, colmyUserPeople, + colmyUserGroup, searchList, options, searchType, @@ -227,6 +272,9 @@ export default defineComponent({ receiveRislistgroup, tipoConto, CQRCode, - } + extraparams_groups, + filtercustom, + arrfilterand, + }; }, -}) +}); diff --git a/src/components/CFindUsers/CFindUsers.vue b/src/components/CFindUsers/CFindUsers.vue index a5f252ec..8a89b08f 100755 --- a/src/components/CFindUsers/CFindUsers.vue +++ b/src/components/CFindUsers/CFindUsers.vue @@ -6,39 +6,95 @@ :options="options" color="primary" /> - + - - +
+ +
+ +
+ + +
+
+ + +
@@ -56,7 +112,10 @@ />
-
+
-
-
- +
+
+
@@ -98,9 +162,13 @@ > - +
 
-
+
@@ -109,8 +177,7 @@ - +