diff --git a/.env.development b/.env.development index cca63202..12427aa5 100755 --- a/.env.development +++ b/.env.development @@ -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" diff --git a/.env.example.production b/.env.example.production index f1046f6a..eb599faf 100755 --- a/.env.example.production +++ b/.env.example.production @@ -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 diff --git a/.env.test.risosrv b/.env.test.risosrv index 666392cc..a367c8bb 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -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 diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index cca63202..12427aa5 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -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" diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production index e4ac5999..c0a2cb47 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -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 diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index cdd31a47..5e34ff6b 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -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" diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index d63869c8..50d6a882 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -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 } diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index d71628ea..2e845af5 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -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' diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index ebadb0c8..f2d4f11d 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -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', diff --git a/src/views/user/mygroup/mygroup.ts b/src/views/user/mygroup/mygroup.ts index b19a455d..194267f7 100755 --- a/src/views/user/mygroup/mygroup.ts +++ b/src/views/user/mygroup/mygroup.ts @@ -47,12 +47,14 @@ export default defineComponent({ const filtroutente = ref([]) const showPic = ref(false) + const tabcircuit = ref('info') + const mygrp = ref({}) const mystatus = ref(0) const users_in_group = ref([]) - 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([]) const circuitslist = ref([]) + const circuitslistOpt = ref([]) function profile() { return userStore.my.profile @@ -93,10 +96,12 @@ export default defineComponent({ if (mygrp.value) circuitslist.value = circuitStore.getCircuitsListByGroup(mygrp.value) - /*if (mygrp.value && tools.iAmAdminGroup(groupname.value)) { - }*/ + /*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 @@ -225,19 +230,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 : '', - } - + function getExtraparams_movs_grp(circuit: ICircuit): any { + return { + querytype: shared_consts.QUERYTYPE_LIST_MOVEMENTS_GROUPNAME, + myid: circuit ? circuit._id : '', + groupname: mygrp.value ? mygrp.value.groupname : '', } } @@ -283,10 +280,12 @@ export default defineComponent({ circuitslist, circuitStore, getExtraparams_movs_grp, - showonlymine, tabellare, colmyMovementTable, colmyMovement, + tabcircuit, + circuitIndex, + circuitslistOpt, } } }) diff --git a/src/views/user/mygroup/mygroup.vue b/src/views/user/mygroup/mygroup.vue index 0638c9bf..74be08a0 100755 --- a/src/views/user/mygroup/mygroup.vue +++ b/src/views/user/mygroup/mygroup.vue @@ -488,6 +488,42 @@ + + + + + + + + + + + + + +
{{ circuit.name }}:
- - +
+
+ +
@@ -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" >