Pagina "Attività" non compare bene la scritta Beni e Servizi... ?!

This commit is contained in:
Surya Paolo
2023-01-29 22:22:41 +01:00
parent 23fd5fc5ef
commit 8176902363
17 changed files with 143 additions and 69 deletions

View File

@@ -221,7 +221,7 @@
costanti.ENABLE_CONTI_COMUNITARI &&
tools.iAmAdminCircuit(circuit.name)
"
:label="t('circuit.gruppicom')"
:label="t('circuit.conticollettivi')"
name="gruppicom"
icon="fas fa-users"
></q-tab>
@@ -322,7 +322,7 @@
</q-btn>
</div>
<CTitleSec title="Lista Gruppi Comunitari" />
<CTitleSec :title="$t('circuit.listaconticollettivi')" />
<CGridTableRec
v-if="!loading"
@@ -522,7 +522,7 @@
</span>
</div>
<div :class="$q.screen.lt.sm ? '' : 'row'">
<div v-if="circuit.fido_scoperto_default" class="sezioni">
<div class="sezioni">
<CCurrencyValue
:symbol="tools.getSymbolByCircuit(circuit)"
:color="tools.getColorByCircuit(circuit)"
@@ -534,7 +534,7 @@
>
</CCurrencyValue>
</div>
<div v-if="circuit.fido_scoperto_default" class="sezioni">
<div class="sezioni">
<CCurrencyValue
:symbol="tools.getSymbolByCircuit(circuit)"
:color="tools.getColorByCircuit(circuit)"
@@ -547,7 +547,7 @@
</CCurrencyValue>
</div>
<div
v-if="circuit.fido_scoperto_default_grp"
v-if="circuit.qta_max_default_grp"
class="sezioni"
>
<CCurrencyValue
@@ -562,7 +562,6 @@
</CCurrencyValue>
</div>
<div
v-if="circuit.fido_scoperto_default_grp"
class="sezioni"
>
<CCurrencyValue
@@ -874,6 +873,14 @@
</div>
<div v-html="circuit.regulation"></div>
</q-card-section>
<q-card-section class="inset-shadow">
<div style="font-weight: bold; font-size: 1.25rem">
{{t('circuit.contocomunitario')}}
</div>
<div>
...
</div>
</q-card-section>
<q-card-actions align="center">
<q-btn
class="centeritems"

View File

@@ -27,3 +27,10 @@
.title_param{
font-size: 1.25rem;
}
.circuit_name {
text-align: center;
font-weight: bold;
font-size: 1rem;
}

View File

@@ -22,12 +22,15 @@ import { shared_consts } from '@/common/shared_vuejs'
import { colmyUserPeople, colmyUserGroup } from '@store/Modules/fieldsTable'
import { useNotifStore } from '@store/NotifStore'
import { useCircuitStore } from '@src/store/CircuitStore'
import circuitsList from '@src/rootgen/admin/circuitsList/circuitsList'
export default defineComponent({
name: 'mygroup',
components: { CProfile, CTitleBanner, CMyFieldRec,
CSaldo, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged },
components: {
CProfile, CTitleBanner, CMyFieldRec,
CSaldo, CSkill, CDateTime, CMyFriends, CGridTableRec, CMyUser, CCheckIfIsLogged
},
props: {},
setup() {
const userStore = useUserStore()
@@ -62,7 +65,7 @@ export default defineComponent({
const cities = ref(<ICity[]>[])
const circuitslist = ref(<ICircuit[] | null | undefined>[])
const circuitslist = ref(<ICircuit[]>[])
function profile() {
return userStore.my.profile
@@ -87,6 +90,14 @@ export default defineComponent({
if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value)
}
if (circuitslist.value) {
for (let i = 0; i < circuitslist.value.length; i++) {
let myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name)
if (myc) {
circuitslist.value[i].account = myc.account
}
}
}
} else {
mygrp.value = null
users_in_group.value = []
@@ -248,6 +259,7 @@ export default defineComponent({
mystatus,
cities,
circuitslist,
circuitStore,
}
}
})

View File

@@ -483,12 +483,12 @@
</q-tab-panel>
<q-tab-panel name="circuits">
<div v-for="(circuit, ind) of circuitslist" :key="ind">
circuit.account: {{ circuit.account}}
<div class="circuit_name">{{circuit.name}}: </div>
<CSaldo
:account="circuit.account"
:symbol="circuit.symbol"
:color="circuit.color"
:saldo="circuit.account"
:saldo="circuit.account.saldo"
:qtarem="circuit.account ? circuitStore.getRemainingCoinsToSend(circuit.account) : 0"
>
</CSaldo>