diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index f4fbe7c8b..0b78ca4b8 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -15,30 +15,32 @@ export default { return { fields: [ { - key: 'date', + key: 'creationDate', label: this.$t('transactionlist.date'), formatter: (value, key, item) => { return this.$d(new Date(value)) }, }, { - key: 'balance', + key: 'amount', label: this.$t('transactionlist.amount'), formatter: (value, key, item) => { 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: 'decay', - label: this.$t('transactionlist.decay'), + key: 'balanceDate', + label: this.$t('transactionlist.balanceDate'), formatter: (value, key, item) => { - if (value && value.balance >= 0) { - return value.balance - } else { - return '0' - } + return this.$d(new Date(value)) }, }, ], @@ -59,7 +61,7 @@ export default { }, }) .then((result) => { - this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation') + this.items = result.data.transactionList.transactions }) .catch((error) => { this.toastError(error.message) diff --git a/admin/src/graphql/transactionList.js b/admin/src/graphql/transactionList.js index 8ae5cde42..2ac81bf64 100644 --- a/admin/src/graphql/transactionList.js +++ b/admin/src/graphql/transactionList.js @@ -15,28 +15,15 @@ export const transactionList = gql` onlyCreations: $onlyCreations userId: $userId ) { - gdtSum - count - balance - decay - decayDate transactions { - type - balance - decayStart - decayEnd - decayDuration + id + amount + balanceDate + creationDate memo - transactionId - name - email - date - decay { - balance - decayStart - decayEnd - decayDuration - decayStartBlock + linkedUser { + firstName + lastName } } } diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 14b80a5ea..848ef5d43 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -112,7 +112,7 @@ export class TransactionResolver { const transactions: Transaction[] = [] // decay transaction - if (currentPage === 1 && order === Order.DESC) { + if (!onlyCreations && currentPage === 1 && order === Order.DESC) { transactions.push( virtualDecayTransaction(lastTransaction.balance, lastTransaction.balanceDate, now, self), ) diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 2abcb4090..e1af105f8 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -15,8 +15,8 @@ export class TransactionRepository extends Repository { if (onlyCreation) { return this.createQueryBuilder('userTransaction') .where('userTransaction.userId = :userId', { userId }) - .andWhere('userTransaction.transactionTypeId = :transactionTypeId', { - transactionTypeId: TransactionTypeId.CREATION, + .andWhere('userTransaction.typeId = :typeId', { + typeId: TransactionTypeId.CREATION, }) .orderBy('userTransaction.balanceDate', order) .limit(limit)