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

Invio RIS da User a Conto Comunitario

Browse Source 
- Visu movimenti OK
This commit is contained in:
Surya Paolo
2023-02-01 23:50:58 +01:00
parent 97ee2a1129
commit cfa2457147
12 changed files with 164 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2185,6 +2185,7 @@ export default defineComponent({
editOn,
newRecordBoolOld,
showSpin,
userStore,
}
}
})

32
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -28,10 +28,7 @@
v-if="butt_modif_new || mytitle"
:class="$q.screen.lt.sm ? `` : `q-gutter-md q-ma-xs` + ` row`"
>
<div
class="q-table__title"
style="min-width: 150px"
>
<div class="q-table__title" style="min-width: 150px">
{{ mytitle }}
</div>
<q-space></q-space>
@@ -448,16 +445,21 @@
"
>
<div class="q-pa-xs row items-start q-gutter-xs">
<q-card
class="my-card text-white"
:style="
`background: radial-gradient(circle, #cccccc 0%, ` +
(tools.isEntrataByRecMov(row) ? `#aaffaa` : `#ffaaaa`) +
` 100%)`
"
>
<q-card class="my-card text-black">
<q-toolbar class="bg-primary text-white" style="min-height: 30px">
<q-toolbar-title>
<span class="q-ma-sm">
<q-icon
v-if="tools.isEntrataByRecMov(row)"
name="fas fa-box-tissue"
color="green"
></q-icon>
<q-icon
v-else
name="fas fa-share-square"
color="red"
></q-icon>
</span>
{{
tools.isEntrataByRecMov(row)
? t('movement.movin')
@@ -471,7 +473,7 @@
v-if="
showColCheck(col, tools.TIPOVIS_SHOW_RECORD, true, 1, row)
"
class="tdclass"
:class="!col.extrafield || (col.extrafield && (col.tipovisu !== costanti.TipoVisu.LINK || (col.tipovisu === costanti.TipoVisu.LINK && userStore.getImgByProfile(row, true, col)))) ? `tdclass` : ``"
>
<div :class="getclrow(row)">
<CMyPopupEdit
@@ -1141,7 +1143,7 @@
>
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
Nuovo {{mytitle}}:
Nuovo {{ mytitle }}:
<q-space />
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>
@@ -1215,7 +1217,7 @@
>
<q-card class="dialog_card">
<q-bar dense class="bg-primary text-white">
Nuovo {{mytitle}}:
Nuovo {{ mytitle }}:
<q-space />
<q-btn flat round color="white" icon="close" v-close-popup></q-btn>
</q-bar>

40
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -81,11 +81,12 @@
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.username_chip">
<div class="">
<span v-if="col.extrafield">
<span v-if="col.extrafield && (col.tipovisu !== costanti.TipoVisu.LINK || (col.tipovisu === costanti.TipoVisu.LINK && userStore.getImgByProfile(row, true, col)))">
<span class="extrafield">{{ $t(col.extrafield) }}</span>
</span>
</div>
<div class="q-ma-xs chip_shadow">
<div v-if="!col.extrafield || (col.extrafield && (col.tipovisu !== costanti.TipoVisu.LINK || (col.tipovisu === costanti.TipoVisu.LINK && userStore.getImgByProfile(row, true, col))))"
class="q-ma-xs chip_shadow">
<div
v-if="
(col.tipovisu === costanti.TipoVisu.LINK ||
@@ -108,11 +109,19 @@
<q-item-section avatar>
<q-avatar round size="48px">
<img :src="userStore.getImgByProfile(row, true, col)" />
<q-badge v-if="tools.isUserOnline(row, col)" align="top" floating color="green">online</q-badge>
<q-badge
v-if="tools.isUserOnline(row, col)"
align="top"
floating
color="green"
>online</q-badge
>
</q-avatar>
</q-item-section>
<q-item-section class="">
<q-item-label>{{ tools.getNameToShow(row, col) }}</q-item-label>
<q-item-label>{{
tools.getNameToShow(row, col)
}}</q-item-label>
<q-item-label caption>{{
tools.getUserNameOnlyIfToShow(row, col)
}}</q-item-label>
@@ -120,29 +129,6 @@
<q-item-section side></q-item-section>
</q-item>
</div>
<!--
<q-btn
v-if="
(col.tipovisu === costanti.TipoVisu.LINK ||
col.tipovisu === costanti.TipoVisu.NONE) &&
myvalue
"
glossy
rounded
size="md"
:class="{ disabled: disable }"
color="white"
text-color="blue"
:icon="`img:` + userStore.getImgUserByUsername(myvalue)"
:to="
col.link
? col.link.replace(col.name, myvalue)
: `/my/username`.replace(col.name, myvalue)
"
:label="tools.getNameToShow(row)"
>
</q-btn>-->
<q-avatar
v-else-if="
col.tipovisu === costanti.TipoVisu.LINKIMG && myvalue

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

@@ -254,8 +254,8 @@ export default defineComponent({
myrecsendcoin.groupdest = props.to_group ? props.to_group.groupname : ''
myrecsendcoin.contoComDest = props.to_contocom
myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? from_groupname.value : ''
myrecsendcoin.contoComOrig = tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT ? props.from_contocom : ''
myrecsendcoin.grouporig = tipoConto.value === costanti.AccountType.COLLECTIVE_ACCOUNT ? from_groupname.value : ''
myrecsendcoin.contoComOrig = tipoConto.value === costanti.AccountType.COMMUNITY_ACCOUNT ? props.from_contocom : ''
myrecsendcoin.dest = props.to_user ? props.to_user.username : ''

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

@@ -214,8 +214,8 @@
qtyRef
? qtyRef.hasError || !circuitloaded.transactionsEnabled ||
((tipoConto === costanti.AccountType.USER) && to_user && (from_username === to_user.username)) ||
((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && !from_groupname) ||
((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && to_group && from_groupname && (to_group.groupname === from_groupname)) ||
((tipoConto === costanti.AccountType.COLLECTIVE_ACCOUNT) && !from_groupname) ||
((tipoConto === costanti.AccountType.COLLECTIVE_ACCOUNT) && to_group && from_groupname && (to_group.groupname === from_groupname)) ||
((tipoConto === costanti.AccountType.COMMUNITY_ACCOUNT) && !to_contocom)
: false
"