surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show table movements

Browse Source
This commit is contained in:
Surya Paolo
2023-03-18 00:57:43 +01:00
parent af04e022eb
commit 422a3b6e88
11 changed files with 139 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.risosrv
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="0.5.79"
APP_VERSION="0.5.80"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

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

@@ -910,7 +910,7 @@ export default defineComponent({
params.codeId = mycodeid.value
// console.log('params', params)
// console.log('props.extraparams', props.extraparams)
console.log('props.extraparams', props.extraparams)
params = { ...params, ...props.extraparams }

3
src/statics/lang/it.js
View File

@@ -1148,7 +1148,8 @@ const msg_it = {
hidden_descr: 'il Gruppo non sarà visibile nella ricerca',
page: 'Pagina',
circuits: 'Circuiti',
groupname: '',
groupname: 'Conto Collettivo',
contocom: 'Conto Comunitario',
},
finder: {
search_skill: 'Cerca una specializzazione'

78
src/store/Modules/fieldsTable.ts
View File

@@ -687,12 +687,78 @@ export const colmyMovement = [
export const colmyMovementTable = [
// AddCol({ name: '_id', label_trans: 'reg.id' }),
AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'userfrom.username', field: 'userfrom', subfield: 'username', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({ name: 'groupfrom.groupname', field: 'groupfrom', subfield: 'groupname', label_trans: 'movement.accountFromCollId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({ name: 'contocomfrom.path', field: 'contocomfrom', subfield: 'path', label_trans: 'movement.accountFromComId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({ name: 'userto.username', field: 'userto', subfield: 'username', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({ name: 'groupto.groupname', field: 'groupto', subfield: 'groupname', label_trans: 'movement.accountToCollId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({ name: 'contocomto.path', field: 'contocomto', subfield: 'path', label_trans: 'movement.accountToComId', fieldtype: costanti.FieldType.string, required: true }),
AddCol({
name: 'userfrom.username',
label_trans: 'reg.username',
field: 'userfrom',
subfield: 'username',
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/my/userfrom.username',
tipoconto: costanti.AccountType.USER,
required: true,
}),
AddCol({
name: 'groupfrom.groupname',
label_trans: 'movement.accountFromCollId',
field: 'groupfrom',
subfield: 'groupname',
foredit: false,
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/grp/groupfrom.groupname',
tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
required: true,
}),
AddCol({
name: 'contocomfrom.path',
label_trans: 'movement.accountFromComId',
field: 'contocomfrom',
subfield: 'path',
foredit: false,
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/circuits/contocomfrom.path',
tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
required: true,
}),
AddCol({
name: 'userto.username',
label_trans: 'reg.username',
field: 'userto',
subfield: 'username',
foredit: false,
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/my/userto.username',
tipoconto: costanti.AccountType.USER,
required: true,
}),
AddCol({
name: 'groupto.groupname',
label_trans: 'movement.accountToCollId',
field: 'groupto',
subfield: 'groupname',
foredit: false,
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/grp/groupto.groupname',
tipoconto: costanti.AccountType.COLLECTIVE_ACCOUNT,
required: true,
}),
AddCol({
name: 'contocomfto.path',
label_trans: 'movement.accountToComId',
field: 'contocomto',
subfield: 'path',
foredit: false,
tipovisu: costanti.TipoVisu.LINK,
fieldtype: costanti.FieldType.username_chip,
link: '/circuits/contocomto.path',
tipoconto: costanti.AccountType.COMMUNITY_ACCOUNT,
required: true,
}),
AddCol({
name: 'amount', label_trans: 'movement.amount',

19
src/views/user/mygroup/mygroup.ts
View File

@@ -47,12 +47,14 @@ export default defineComponent({
const filtroutente = ref(<any[]>[])
const showPic = ref(false)
const tabcircuit = ref('info')
const mygrp = ref(<IMyGroup | null>{})
const mystatus = ref(<number>0)
const users_in_group = ref(<IFriends[]>[])
const showonlymine = ref(true)
const tabellare = ref(false)
const circuitIndex = ref(0)
const loading = ref(false)
@@ -68,6 +70,7 @@ export default defineComponent({
const cities = ref(<ICity[]>[])
const circuitslist = ref(<ICircuit[]>[])
const circuitslistOpt = ref(<any[]>[])
function profile() {
return userStore.my.profile
@@ -96,7 +99,9 @@ export default defineComponent({
/*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) {
}*/
if (circuitslist.value) {
circuitslistOpt.value = []
for (let i = 0; i < circuitslist.value.length; i++) {
circuitslistOpt.value.push({label: circuitslist.value[i].name, value: i })
let myc = data.mygroup.mycircuits.find((circ: IMyCircuit) => circ.circuitname === circuitslist.value[i].name)
if (myc) {
circuitslist.value[i].account = myc.account
@@ -226,19 +231,11 @@ export default defineComponent({
function getExtraparams_movs_grp(circuit: ICircuit): any {
if (showonlymine.value) {
return {
querytype: shared_consts.QUERYTYPE_LIST_MOVEMENTS_GROUPNAME,
myid: circuit ? circuit._id : '',
groupname: mygrp.value ? mygrp.value.groupname : '',
}
} else {
return {
querytype: shared_consts.QUERYTYPE_LIST_ALLMOVEMENTS,
myid: circuit ? circuit._id : '',
}
}
}
@@ -283,10 +280,12 @@ export default defineComponent({
circuitslist,
circuitStore,
getExtraparams_movs_grp,
showonlymine,
tabellare,
colmyMovementTable,
colmyMovement,
tabcircuit,
circuitIndex,
circuitslistOpt,
}
}
})

49
src/views/user/mygroup/mygroup.vue
View File

@@ -488,6 +488,42 @@
</q-tab-panels>
</q-tab-panel>
<q-tab-panel name="circuits">
<q-select
v-model="circuitIndex"
:options="circuitslistOpt"
emit-value
map-options
:behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
>
<template v-slot:prepend>
<q-icon :name="iconsel" />
</template>
<template v-slot:option="scope">
<q-item v-bind="scope.itemProps">
<q-item-section>
<q-item-label>{{ scope.opt.label }}</q-item-label>
</q-item-section>
</q-item>
</template>
</q-select>
<q-tabs v-model="tabcircuit" class="text-blue" no-caps>
<q-tab
:label="t('shared.info1')"
name="info"
icon="fas fa-info"
></q-tab>
<q-tab
:label="t('circuit.movements')"
name="mov"
icon="fas fa-coins"
></q-tab>
</q-tabs>
</q-tab-panel>
</q-tab-panels>
<q-tab-panels v-model="tabcircuit" animated>
<q-tab-panel name="info" style="max-width: 500px">
<div v-for="(circuit, ind) of circuitslist" :key="ind">
<div class="circuit_name">{{ circuit.name }}:</div>
<CInfoAccount
@@ -496,11 +532,10 @@
:account="circuit.account"
:admin="tools.iAmAdminCircuit(circuit.name)"
/>
<q-toggle
v-model="showonlymine"
:label="t('movement.onlymymov')"
></q-toggle>
</div>
</q-tab-panel>
<q-tab-panel name="mov">
<div v-if="circuitslist && circuitslist.length > 0">
<q-toggle v-model="tabellare" label="Tabella"></q-toggle>
<CGridTableRec
@@ -532,7 +567,7 @@
:showType="costanti.SHOW_MOVEMENTS"
:showCol="true"
:showHeaderCol="true"
:extraparams="getExtraparams_movs_grp(circuit)"
:extraparams="getExtraparams_movs_grp(circuitslist[circuitIndex])"
extrafield=""
:visufind="costanti.FRIENDS"
>
@@ -565,7 +600,7 @@
:showType="costanti.SHOW_MOVEMENTS"
:showCol="false"
:showHeaderCol="false"
:extraparams="getExtraparams_movs_grp(circuit)"
:extraparams="getExtraparams_movs_grp(circuitslist[circuitIndex])"
extrafield=""
:visufind="costanti.FRIENDS"
>