surya/myprojplanet_vite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Circuito Italia, dettagli...

Browse Source
This commit is contained in:
Surya Paolo
2023-11-27 11:13:01 +01:00
parent 114af5b3fd
commit a831f37069
9 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/CContactUser/CContactUser.vue
View File

@@ -1,9 +1,25 @@
<template>
<div class="row justify-evenly items-center q-pa-sm q-ma-sm">
<div >
<q-btn
v-if="
userStore.showButtonSendCoin(myuser) &&
(myuser.username !== userStore.my.username ||
userStore.hoContiCollettiviDaAmministrare() ||
userStore.hoContiComunitariDaAmministrare())
"
icon="fas fa-coins"
color="green"
size="md"
rounded
:label="$t('circuit.sendcoins')"
@click="clickOpenSendCoin"
>
</q-btn>
</div>
<div
v-if="showBtnActivities"
class="col-md-6 col-sm-6 q-ma-xs col-xs-12 text-center q-mb-md"
>
<q-btn
icon="fas fa-house-user"
@@ -14,7 +30,7 @@
>
</q-btn>
</div>
<div class="q-ma-sx">
<div class="q-ma-sm">
<q-btn
v-if="getLinkUserTelegram()"
icon="fab fa-telegram"
@@ -52,21 +68,6 @@
</q-btn>
</div>
</div>
<div class="q-ma-sx">
<q-btn
v-if="
userStore.showButtonSendCoin(myuser) &&
((myuser.username !== userStore.my.username) || userStore.hoContiCollettiviDaAmministrare() || userStore.hoContiComunitariDaAmministrare())
"
icon="fas fa-coins"
color="green"
size="md"
rounded
:label="$t('circuit.sendcoins')"
@click="clickOpenSendCoin"
>
</q-btn>
</div>
</div>
<div v-if="showsendCoinTo || sendRIS > 0">
<CSendCoins

10
src/components/CMyCircuit/CMyCircuit.vue
View File

@@ -1,5 +1,6 @@
<template>
<div v-if="tools.isUserOk() || noaut">
<div v-if="circuit">
<q-item
:class="
@@ -34,21 +35,22 @@
<q-item-section :class="$q.dark.isActive ? `text-white` : `text-black`">
<q-item-label
class="text-center"
@click="naviga(tools.getPathByTableAndRec(table, circuit))"
><strong>{{ circuit.name }}</strong>
<span v-if="circuit.subname"> ({{ circuit.subname }})</span>
</q-item-label>
<q-item-label
<!---<q-item-label
@click="naviga(tools.getPathByTableAndRec(table, circuit))"
v-if="circuit.longdescr && circuit.longdescr !== circuit.name"
caption
lines="3"
><em>{{ circuit.longdescr }}</em>
</q-item-label>
</q-item-label>-->
<q-item-label v-if="visu === costanti.ENTER_TO_THE_CIRCUIT" caption>
<span> Membri: {{ circuit.numMembers }}</span>
</q-item-label>
<q-item-label caption lines="3">
<!--<q-item-label caption lines="3">
<q-chip
v-if="circuit.status !== undefined && circuit.status !== 0"
:color="circuitStore.getColorCircuitClass(circuit)"
@@ -85,7 +87,7 @@
}}</q-tooltip>
</q-btn>
</q-chip>
</q-item-label>
</q-item-label>-->
<q-item-label
v-if="
!circuit.transactionsEnabled &&

4
src/components/CMyElem/CMyElem.vue
View File

@@ -498,8 +498,8 @@
<div v-else-if="myel.type === shared_consts.ELEMTYPE.BOTT_CONDIVIDI">
<div class="row justify-evenly items-center q-pa-sm q-ma-sm">
<q-btn
icon="fas fa-link"
color="blue"
icon="fas fa-share"
text-color="blue"
type="a"
size="md"
:class="

12
src/components/CMyUser/CMyUser.vue
View File

@@ -401,7 +401,7 @@
</q-item-section>
<q-item-section>{{ $t('shared.profile') }}</q-item-section>
</q-item>
<!--<q-item
<q-item
v-if="
userStore.showButtonSendCoin(contact) &&
(contact.username !== userStore.my.username ||
@@ -411,13 +411,13 @@
clickable
v-close-popup
dense
@click="showsendCoin(true)"
@click="naviga(`/my/` + contact.username + '?sendris=1')"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-coins" />
</q-item-section>
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
</q-item>-->
</q-item>
<q-item
clickable
v-close-popup
@@ -787,7 +787,7 @@
>
<q-menu>
<q-list style="min-width: 200px">
<!--<q-item
<q-item
v-if="
userStore.showButtonSendCoin(contact) &&
(contact.username !== userStore.my.username ||
@@ -797,13 +797,13 @@
clickable
v-close-popup
dense
@click="showsendCoin(true)"
@click="naviga(`/my/` + contact.username + '?sendris=1')"
>
<q-item-section avatar>
<q-icon color="positive" name="fas fa-coins" />
</q-item-section>
<q-item-section>{{ $t('circuit.sendcoins') }}</q-item-section>
</q-item>-->
</q-item>
<q-item
clickable
v-close-popup

4
src/components/CSendCoins/CSendCoins.ts
View File

@@ -11,6 +11,7 @@ import { CMyUserOnlyView } from '@/components/CMyUserOnlyView'
import { CMyGroupOnlyView } from '@/components/CMyGroupOnlyView'
import { CCheckCircuitsEnabled } from '@/components/CCheckCircuitsEnabled'
import { costanti } from '@costanti'
import { useRouter } from 'vue-router'
export default defineComponent({
name: 'CSendCoins',
@@ -63,6 +64,7 @@ export default defineComponent({
const showpage = ref(false)
const userStore = useUserStore()
const circuitStore = useCircuitStore()
const $router = useRouter()
const from_username = ref(userStore.my.username)
const from_groupname = ref('')
@@ -346,7 +348,7 @@ export default defineComponent({
if (myrecsendcoin) {
tools.sendCoinsByCircuit($q, circuitloaded.value, myrecsendcoin)
tools.sendCoinsByCircuit($q, $router, circuitloaded.value, myrecsendcoin)
.then((ris: any) => {
if (ris) {
showpage.value = false

1
src/components/CUserInfoAccount/CUserInfoAccount.ts
View File

@@ -137,6 +137,7 @@ export default defineComponent({
t,
myaccount,
save,
toolsext,
}
},
})

12
src/components/CUserInfoAccount/CUserInfoAccount.vue
View File

@@ -6,6 +6,18 @@
<q-separator />
<q-btn
text-color="blue"
color="white"
class="shadow-5 q-mb-xs"
dense
flat
rounded
size="md"
@click="naviga(tools.getPathByTableAndRec(toolsext.TABCIRCUITS, circuit))"
>
{{ circuit.name }}
</q-btn>
<CSaldo
v-if="tools.isUserOk() && myaccount"

3
src/store/Modules/tools.ts
View File

@@ -6401,7 +6401,7 @@ export const tools = {
return extrarec.grouporig ? extrarec.grouporig : (extrarec.contoComOrig ? extrarec.contoComOrig : extrarec.sender)
},
async sendCoinsByCircuit($q: any, circuit: ICircuit, sendcoinrec: ISendCoin) {
async sendCoinsByCircuit($q: any, $router: any, circuit: ICircuit, sendcoinrec: ISendCoin) {
const userStore = useUserStore()
const notifStore = useNotifStore()
@@ -6437,6 +6437,7 @@ export const tools = {
if (res.useraccounts && res.useraccounts.length > 0) {
userStore.my.profile.useraccounts = res.useraccounts
}
$router.push('/circuit')
tools.showPositiveNotif($q, t('circuit.coins_sendrequest_sent'))
} else {
tools.showNegativeNotif($q, res.errormsg)

4
src/views/user/myprofile/myprofile.vue
View File

@@ -254,7 +254,7 @@
>({{ userStore.userprofile.profile.nationality }})</span
>
</div>
<div v-if="userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
<div v-if="userStore.userprofile.profile.qualifica && userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
<span v-if="userStore.userprofile.profile.qualifica">
<em
><span class="qualifica">{{
@@ -263,7 +263,7 @@
>
</span>
</div>
<div v-if="userStore.userprofile._id" class="col-12 text-h8 q-mt-sm">
<div v-if="userStore.userprofile._id && userStore.userprofile.profile.biografia" class="col-12 text-h8 q-mt-sm">
{{ userStore.userprofile.profile.biografia }}
</div>
<div>