IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin area creation transaction list

Browse Source
This commit is contained in:
ogerly 2022-03-06 11:52:29 +01:00
parent e0490827c7
commit 25b1a5a83e
4 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/src/components/CreationTransactionListFormular.vue
View File

@ -15,30 +15,32 @@ export default {
return { return {
fields: [ fields: [
{ {
key: 'date', key: 'creationDate',
label: this.$t('transactionlist.date'), label: this.$t('transactionlist.date'),
formatter: (value, key, item) => { formatter: (value, key, item) => {
return this.$d(new Date(value)) return this.$d(new Date(value))
}, },
}, },
{ {
key: 'balance', key: 'amount',
label: this.$t('transactionlist.amount'), label: this.$t('transactionlist.amount'),
formatter: (value, key, item) => { formatter: (value, key, item) => {
return `${value} GDD` return `${value} GDD`
}, },
}, },
{ key: 'name', label: this.$t('transactionlist.community') }, {
key: 'linkedUser',
label: this.$t('transactionlist.community'),
formatter: (value, key, item) => {
return `${value.firstName} ${value.lastName}`
},
},
{ key: 'memo', label: this.$t('transactionlist.memo') }, { key: 'memo', label: this.$t('transactionlist.memo') },
{ {
key: 'decay', key: 'balanceDate',
label: this.$t('transactionlist.decay'), label: this.$t('transactionlist.balanceDate'),
formatter: (value, key, item) => { formatter: (value, key, item) => {
if (value && value.balance >= 0) { return this.$d(new Date(value))
return value.balance
} else {
return '0'
}
}, },
}, },
], ],
@ -59,7 +61,7 @@ export default {
}, },
}) })
.then((result) => { .then((result) => {
this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation') this.items = result.data.transactionList.transactions
}) })
.catch((error) => { .catch((error) => {
this.toastError(error.message) this.toastError(error.message)

27
admin/src/graphql/transactionList.js
View File

@ -15,28 +15,15 @@ export const transactionList = gql`
onlyCreations: $onlyCreations onlyCreations: $onlyCreations
userId: $userId userId: $userId
) { ) {
gdtSum
count
balance
decay
decayDate
transactions { transactions {
type id
balance amount
decayStart balanceDate
decayEnd creationDate
decayDuration
memo memo
transactionId linkedUser {
name firstName
email lastName
date
decay {
balance
decayStart
decayEnd
decayDuration
decayStartBlock
} }
} }
} }

2
backend/src/graphql/resolver/TransactionResolver.ts
View File

@ -112,7 +112,7 @@ export class TransactionResolver {
const transactions: Transaction[] = [] const transactions: Transaction[] = []
// decay transaction // decay transaction
if (currentPage === 1 && order === Order.DESC) { if (!onlyCreations && currentPage === 1 && order === Order.DESC) {
transactions.push( transactions.push(
virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self), virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self),
) )

4
backend/src/typeorm/repository/Transaction.ts
View File

@ -15,8 +15,8 @@ export class TransactionRepository extends Repository<Transaction> {
if (onlyCreation) { if (onlyCreation) {
return this.createQueryBuilder('userTransaction') return this.createQueryBuilder('userTransaction')
.where('userTransaction.userId = :userId', { userId }) .where('userTransaction.userId = :userId', { userId })
.andWhere('userTransaction.transactionTypeId = :transactionTypeId', { .andWhere('userTransaction.typeId = :typeId', {
transactionTypeId: TransactionTypeId.CREATION, typeId: TransactionTypeId.CREATION,
}) })
.orderBy('userTransaction.balanceDate', order) .orderBy('userTransaction.balanceDate', order)
.limit(limit) .limit(limit)