-
+
@@ -36,6 +36,8 @@
:myimg="myimg"
:canModify="canModify"
:canEdit="canEdit"
+ :id="id"
+ :idmain="idmain"
:visulabel="true"
:mycol="col"
:tablesel="tablesel"
@@ -47,6 +49,7 @@
+
diff --git a/src/components/CMyFriends/CMyFriends.ts b/src/components/CMyFriends/CMyFriends.ts
index 37069b13..320e630e 100755
--- a/src/components/CMyFriends/CMyFriends.ts
+++ b/src/components/CMyFriends/CMyFriends.ts
@@ -204,72 +204,12 @@ export default defineComponent({
})
}
- function removeFromMyFriends(usernameDest: string) {
- $q.dialog({
- message: t('db.domanda_removefriend', { username: usernameDest }),
- ok: { label: t('dialog.yes'), push: true },
- cancel: { label: t('dialog.cancel') },
- title: t('db.domanda')
- }).onOk(() => {
- userStore.setFriendsCmd($q, t, username.value, usernameDest, shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS, null).then((res) => {
- if (res) {
- userStore.my.profile.friends = userStore.my.profile.friends.filter((rec: IFriends) => rec.username !== usernameDest)
- tools.showPositiveNotif($q, t('db.removedfriend'))
- }
- })
- })
- }
+ function setCmd($q: any, cmd: number, usernameDest: string, value: any, groupname: string) {
+ tools.setCmd($q, cmd, usernameDest, value, username.value)
- function refuseReqFriends(usernameDest: string) {
- $q.dialog({
- message: t('db.domanda_revoke_friend', { username: usernameDest }),
- ok: { label: t('dialog.yes'), push: true },
- cancel: { label: t('dialog.cancel') },
- title: t('db.domanda')
- }).onOk(() => {
-
- userStore.setFriendsCmd($q, t, username.value, usernameDest, shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS, null).then((res) => {
- if (res) {
- userStore.my.profile.req_friends = userStore.my.profile.req_friends.filter((user: IFriends) => user.username !== usernameDest)
- tools.showPositiveNotif($q, t('db.removedfriend'))
- }
- })
- })
- }
-
-
- function blockUser(usernameDest: string) {
- $q.dialog({
- message: t('db.domanda_blockuser', { username: usernameDest }),
- ok: { label: t('dialog.yes'), push: true },
- cancel: { label: t('dialog.cancel') },
- title: t('db.domanda')
- }).onOk(() => {
- userStore.setFriendsCmd($q, t, username.value, usernameDest, shared_consts.FRIENDSCMD.BLOCK_USER, null).then((res) => {
- if (res) {
- userStore.my.profile.friends = userStore.my.profile.friends.filter((rec: IFriends) => rec.username !== usernameDest)
- tools.showPositiveNotif($q, t('db.blockedfriend'))
- }
- })
- })
- }
-
- function setCmd(cmd: number, usernameDest: string, value: any = '') {
if (cmd === shared_consts.FRIENDSCMD.SETTRUST) {
setRequestTrust(usernameDest, value)
- } else if (cmd === shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS) {
- removeFromMyFriends(usernameDest)
- } else if (cmd === shared_consts.FRIENDSCMD.BLOCK_USER) {
- blockUser(usernameDest)
- } else if (cmd === shared_consts.FRIENDSCMD.SETFRIEND) {
- tools.addToMyFriends($q, username.value, usernameDest)
- } else if (cmd === shared_consts.FRIENDSCMD.REQFRIEND) {
- tools.setRequestFriendship($q, username.value, usernameDest, value)
- } else if (cmd === shared_consts.FRIENDSCMD.REFUSE_REQ_FRIEND) {
- refuseReqFriends(usernameDest)
- } else if (cmd === shared_consts.FRIENDSCMD.CANCEL_REQ_FRIEND) {
- tools.cancelReqFriends($q, username.value, usernameDest)
}
}
diff --git a/src/components/CMyGroup/CMyGroup.ts b/src/components/CMyGroup/CMyGroup.ts
index 01892717..01429d53 100755
--- a/src/components/CMyGroup/CMyGroup.ts
+++ b/src/components/CMyGroup/CMyGroup.ts
@@ -81,6 +81,7 @@ export default defineComponent({
setCmd,
shared_consts,
userStore,
+ $q,
}
},
})
diff --git a/src/components/CMyGroup/CMyGroup.vue b/src/components/CMyGroup/CMyGroup.vue
index 6db31eef..4e2b069c 100755
--- a/src/components/CMyGroup/CMyGroup.vue
+++ b/src/components/CMyGroup/CMyGroup.vue
@@ -19,12 +19,12 @@
+ @click="tools.setCmd($q, shared_consts.GROUPSCMD.REMOVE_FROM_MYGROUP, myusername(), '', grp.groupname)">
{{ $t('groups.remove_from_mygroups') }}
-
+
{{ $t('groups.block_group') }}
@@ -38,7 +38,7 @@
+ @click="tools.setCmd($q, shared_consts.GROUPSCMD.REQGROUP, myusername(), false, grp.groupname)">
{{ $t('groups.reject_ask_group') }}
@@ -52,7 +52,7 @@
+ @click="tools.setCmd($q, shared_consts.GROUPSCMD.CANCEL_REQ_GROUP, myusername(), '', grp.groupname)">
{{ $t('groups.cancel_ask_group') }}
@@ -65,17 +65,17 @@
-
+
{{ $t('groups.ask_group') }}
-
+
{{ $t('groups.cancel_ask_group') }}
-
+
{{ $t('groups.remove_from_mygroups') }}
diff --git a/src/components/CMyGroups/CMyGroups.ts b/src/components/CMyGroups/CMyGroups.ts
index 25a1b1b0..31147732 100755
--- a/src/components/CMyGroups/CMyGroups.ts
+++ b/src/components/CMyGroups/CMyGroups.ts
@@ -103,7 +103,8 @@ export default defineComponent({
userStore.loadGroups(username.value).then((ris) => {
// console.log('ris', ris)
if (ris) {
- userStore.my.profile.mygroups = ris.listUsersGroup ? ris.listUsersGroup : []
+ userStore.my.profile.mygroups = ris.mygroups ? ris.mygroups : []
+ userStore.my.profile.list_usersgroup = ris.listUsersGroup ? ris.listUsersGroup : []
userStore.groups = ris.listgroups ? ris.listgroups : []
userStore.my.profile.asked_groups = ris.listSentRequestGroups ? ris.listSentRequestGroups : []
filtroutente.value = [{ userId: userStore.my._id }]
@@ -113,36 +114,6 @@ export default defineComponent({
}
}
- function blockGroup(usernameDest: string) {
- $q.dialog({
- message: t('db.domanda_blockgroup', { groupname: usernameDest }),
- ok: { label: t('dialog.yes'), push: true },
- cancel: { label: t('dialog.cancel') },
- title: t('db.domanda')
- }).onOk(() => {
- userStore.setGroupsCmd($q, t, username.value, usernameDest, shared_consts.GROUPSCMD.BLOCK_GROUP, null).then((res) => {
- if (res) {
- userStore.my.profile.mygroups = userStore.my.profile.mygroups.filter((rec: IMyGroup) => rec.groupname !== usernameDest)
- tools.showPositiveNotif($q, t('db.blockedgroup'))
- }
- })
- })
- }
-
- function setCmd(cmd: number, groupnameDest: string, value: any = '') {
- if (cmd === shared_consts.GROUPSCMD.REMOVE_FROM_MYGROUP) {
- tools.removeFromMyGroups($q, username.value, groupnameDest)
- } else if (cmd === shared_consts.GROUPSCMD.BLOCK_GROUP) {
- blockGroup(groupnameDest)
- } else if (cmd === shared_consts.GROUPSCMD.SETGROUP) {
- tools.addToMyGroups($q, username.value, groupnameDest)
- } else if (cmd === shared_consts.GROUPSCMD.REQGROUP) {
- tools.setRequestGroup($q, username.value, groupnameDest, value)
- } else if (cmd === shared_consts.GROUPSCMD.CANCEL_REQ_GROUP) {
- tools.cancelReqGroups($q, username.value, groupnameDest)
- }
- }
-
function mounted() {
username.value = userStore.my.username
loadGroups()
@@ -161,7 +132,6 @@ export default defineComponent({
shared_consts,
filtroutente,
listgroupsfiltered,
- setCmd,
updateValue,
myoptions,
}
diff --git a/src/components/CMyGroups/CMyGroups.vue b/src/components/CMyGroups/CMyGroups.vue
index 149810a1..374cdc69 100755
--- a/src/components/CMyGroups/CMyGroups.vue
+++ b/src/components/CMyGroups/CMyGroups.vue
@@ -23,7 +23,6 @@
@@ -35,7 +34,6 @@
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index a88d6308..77c86133 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -231,8 +231,6 @@ export default defineComponent({
}
}
- console.log('col.value', col.value)
-
// console.log('CMyFieldDb crea', myvalue)
}
@@ -251,10 +249,13 @@ export default defineComponent({
function changeval(newval: any) {
console.log('changeval update:row', newval)
- emit('update:row', props.row)
+ if (!props.isrec) {
+ emit('update:row', props.row)
+ }
if (props.isInModif)
OpenEdit()
+
}
function getrealval(newval: any) {
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index 47efe9b3..1cc05910 100755
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -126,6 +126,10 @@ export default defineComponent({
type: String,
required: false,
default: '',
+ },
+ filter: {
+ type: Function,
+ required: false,
}
},
components: {},
@@ -194,7 +198,7 @@ export default defineComponent({
// console.log('----------- arrtempOpt.value', arrtempOpt.value)
localStorage.setItem(props.tablesel + num + props.optval, id)
- localStorage.setItem(props.tablesel + num + props.optlab, rec[`${props.optlab}`])
+ localStorage.setItem(props.tablesel + num + props.optlab, tools.getValueByFunzOrVal(rec, props.optlab))
num += 1
localStorage.setItem(props.tablesel + 'NUM', num.toString())
@@ -320,7 +324,7 @@ export default defineComponent({
}
if (props.tablesel === 'friendsandme') {
- debugger;
+ // debugger;
}
if (props.multiple) {
@@ -349,7 +353,7 @@ export default defineComponent({
if (props.funcgetvaluebyid)
myvalue.value = props.funcgetvaluebyid(rec[`${props.optval}`])
else
- myvalue.value = rec[`${props.optlab}`]
+ myvalue.value = tools.getValueByFunzOrVal(rec, props.optlab)
} else {
// if (!props.useinput) {
if (props.value) {
@@ -372,13 +376,16 @@ export default defineComponent({
function updateArrOptions() {
let myarr: any = []
+ // console.log(props.col.jointable, props.filter)
if (props.col.jointable) {
- optionsreal.value = globalStore.getTableJoinByName(props.col.jointable, props.col.addall, props.col.filter)
+ optionsreal.value = globalStore.getTableJoinByName(props.col.jointable, props.col.addall, props.filter)
// console.log('optionsreal.value', optionsreal.value)
} else {
optionsreal.value = props.options
}
+ // console.log('optionsreal.value', optionsreal.value)
+
myarr = optionsreal.value
if (!fieldsTable.tableRemotePickup.includes(props.tablesel)) {
@@ -386,7 +393,7 @@ export default defineComponent({
// console.log('needle', needle, 'props.multiple', props.multiple)
if (props.filter_table) {
- console.log(' FILTERTABLE', props.filter_field, myarr)
+ // console.log(' FILTERTABLE', props.filter_field, myarr)
if (props.multiple) {
myarr = myarr.filter((rec: any) => rec[props.filter_field] === needle)
} else {
@@ -578,6 +585,7 @@ export default defineComponent({
abortFilterFn,
newvaluefuncfirst,
getIcon,
+ tools,
}
}
})
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index fa63b558..eaf2d54b 100755
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -105,7 +105,7 @@
- {{ scope.opt[optlab] }}
+ {{ tools.getValueByFunzOrVal(scope.opt,optlab) }}
@@ -139,7 +139,7 @@
-
+
- {{ scope.opt[optlab] }}
+ {{ tools.getValueByFunzOrVal(scope.opt, optlab) }}
@@ -158,7 +158,7 @@
v-slot:option="{ itemProps, opt, selected, toggleOption }">
- {{ opt[optlab] }}
+ {{ tools.getValueByFunzOrVal(opt,optlab) }}
{{ opt['hint'] }}
@@ -200,7 +200,7 @@
- {{ scope.opt[optlab] }}
+ {{ tools.getValueByFunzOrVal(scope.opt,optlab) }}
{{ scope.opt['hint'] }}
diff --git a/src/components/CMyUser/CMyUser.ts b/src/components/CMyUser/CMyUser.ts
index c6fc66d8..99cd2766 100755
--- a/src/components/CMyUser/CMyUser.ts
+++ b/src/components/CMyUser/CMyUser.ts
@@ -73,8 +73,8 @@ export default defineComponent({
$router.push(path)
}
- function setCmd(cmd: number, myusername: string, value: any = '') {
- emit('setCmd', cmd, myusername, value)
+ function setCmd($q: any, cmd: number, myusername: string, value: any, groupname: string) {
+ emit('setCmd', $q, cmd, myusername, value, groupname)
}
onMounted(mounted)
diff --git a/src/components/CMyUser/CMyUser.vue b/src/components/CMyUser/CMyUser.vue
index 31c5b0d1..0a60de4a 100755
--- a/src/components/CMyUser/CMyUser.vue
+++ b/src/components/CMyUser/CMyUser.vue
@@ -8,7 +8,7 @@
- {{ contact.name }} {{ contact.surname }} ({{ contact.username }})
+ {{ contact.username }} ({{ contact.name }} {{ contact.surname }})
{{ contact.profile.qualifica }}
@@ -19,12 +19,12 @@
+ @click="setCmd($q, shared_consts.FRIENDSCMD.REMOVE_FROM_MYFRIENDS, contact.username, '', '')">
{{ $t('friends.remove_from_myfriends') }}
-
+
{{ $t('friends.block_user') }}
@@ -32,18 +32,18 @@
-
+
-
+
{{ $t('friends.accept_friend') }}
+ @click="setCmd($q, shared_consts.FRIENDSCMD.REQFRIEND, contact.username, false, '')">
{{ $t('friends.reject_ask_friend') }}
@@ -51,7 +51,7 @@
-
+
@@ -79,7 +79,7 @@
-
+
@@ -95,13 +95,13 @@
-
+
+ @click="setCmd($q, shared_consts.FRIENDSCMD.CANCEL_REQ_FRIEND, contact.username, '', '')">
{{ $t('friends.cancel_ask_friend') }}
@@ -109,25 +109,25 @@
-
+
-
+
-
+
-
+
-
+
{{ $t('friends.ask_friend') }}
-
+
{{ $t('friends.reject_trust') }}
@@ -135,22 +135,22 @@
-
+
-
+
{{ $t('friends.ask_friend') }}
-
+
{{ $t('friends.cancel_ask_friend') }}
-
+
{{ $t('friends.remove_from_myfriends') }}
@@ -158,13 +158,13 @@
-
+
+ @click="setCmd($q, shared_consts.FRIENDSCMD.SETTRUST, contact.username, true, '')">
{{ $t('friends.accept_trust') }}
diff --git a/src/components/CSignUp/CSignUp.ts b/src/components/CSignUp/CSignUp.ts
index 6d15b63d..f406b7d9 100755
--- a/src/components/CSignUp/CSignUp.ts
+++ b/src/components/CSignUp/CSignUp.ts
@@ -22,6 +22,7 @@ import { complexity, registereduser, aportadorexist } from '../../validation'
// import 'vue3-tel-input/dist/vue3-tel-input.css'
import { useRoute, useRouter } from 'vue-router'
+import { static_data } from '@/db/static_data'
// import {Loading, QSpinnerFacebook, QSpinnerGears} from 'quasar'
@@ -49,6 +50,11 @@ export default defineComponent({
required: false,
default: false,
},
+ show_namesurname: {
+ type: Boolean,
+ required: false,
+ default: true,
+ },
},
setup(props, { emit }) {
const $q = useQuasar()
@@ -65,8 +71,8 @@ export default defineComponent({
const signup = reactive({
email: process.env.TEST_EMAIL || '',
username: process.env.TEST_USERNAME || '',
- name: process.env.TEST_NAME || '',
- surname: process.env.TEST_SURNAME || '',
+ name: static_data.functionality.SHOW_NAMESURNAME ? (process.env.TEST_NAME || '') : '',
+ surname: static_data.functionality.SHOW_NAMESURNAME ? (process.env.TEST_SURNAME || '') : '',
password: process.env.TEST_PASSWORD || '',
repeatPassword: process.env.TEST_PASSWORD || '',
terms: !process.env.PROD,
@@ -75,7 +81,7 @@ export default defineComponent({
})
const validations: any = computed(() => {
- return {
+ let valid: any = {
repeatPassword: {
required,
repeatPassword: sameAs(signup.password),
@@ -90,12 +96,6 @@ export default defineComponent({
minLength: minLength(6),
registereduser,
},
- name: {
- required,
- },
- surname: {
- required,
- },
terms: {
required,
},
@@ -104,6 +104,17 @@ export default defineComponent({
required
}
}
+
+ if (props.show_namesurname) {
+ valid.name = {
+ required,
+ }
+ valid.surname = {
+ required,
+ }
+ }
+
+ return valid
})
// @ts-ignore
@@ -176,8 +187,10 @@ export default defineComponent({
return
} */
- signup.name = tools.CapitalizeAllWords(signup.name)
- signup.surname = tools.CapitalizeAllWords(signup.surname)
+ if (signup.name) {
+ signup.name = tools.CapitalizeAllWords(signup.name)
+ signup.surname = tools.CapitalizeAllWords(signup.surname)
+ }
$q.loading.show({ message: t('reg.incorso') })
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index c32d036a..3f8e977b 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -2,7 +2,8 @@
@@ -53,7 +54,7 @@
debounce="3000"
:rules="[ myRuleEmail ]"
lazy-rules
- :label="$t('reg.email')">
+ :label="$t('reg.email_reg')">
@@ -69,9 +70,10 @@
:error="v$.username.$error"
@keydown.space="(event) => event.preventDefault()"
maxlength="20"
+ :hint="$t('reg.username_hint')"
debounce="1000"
:error-message="tools.errorMsg( 'username', v$.username)"
- :label="$t('reg.username')">
+ :label="$t('reg.username_reg')">
@@ -79,37 +81,40 @@
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+ :label="$t('reg.password_reg')">
@@ -203,10 +208,11 @@
-
+
-
+