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

Merge branch 'master' into 1588-frontend-show-link-information

Browse Source
This commit is contained in:
Alexander Friedland 2022-03-20 19:11:28 +01:00 committed by GitHub
commit 7210804a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/graphql/enum/TransactionTypeId.ts
View File

@ -6,7 +6,7 @@ export enum TransactionTypeId {
RECEIVE = 3, RECEIVE = 3,
// This is a virtual property, never occurring on the database // This is a virtual property, never occurring on the database
DECAY = 4, DECAY = 4,
TRANSACTION_LINK = 5, LINK_SUMMARY = 5,
} }
registerEnumType(TransactionTypeId, { registerEnumType(TransactionTypeId, {

2
backend/src/util/virtualTransactions.ts
View File

@ -41,7 +41,7 @@ const virtualLinkTransaction = (
id: -2, id: -2,
userId: -1, userId: -1,
previous: -1, previous: -1,
typeId: TransactionTypeId.TRANSACTION_LINK, typeId: TransactionTypeId.LINK_SUMMARY,
amount: amount, amount: amount,
balance: balance, balance: balance,
balanceDate: validUntil, balanceDate: validUntil,

8
frontend/src/components/GddTransactionList.vue
View File

@ -42,8 +42,8 @@
/> />
</template> </template>
<template #TRANSACTION_LINK> <template #LINK_SUMMARY>
<transaction-links-summary <transaction-link-summary
class="list-group-item" class="list-group-item"
v-bind="transactions[index]" v-bind="transactions[index]"
:transactionLinkCount="transactionLinkCount" :transactionLinkCount="transactionLinkCount"
@ -72,7 +72,7 @@ import TransactionDecay from '@/components/Transactions/TransactionDecay'
import TransactionSend from '@/components/Transactions/TransactionSend' import TransactionSend from '@/components/Transactions/TransactionSend'
import TransactionReceive from '@/components/Transactions/TransactionReceive' import TransactionReceive from '@/components/Transactions/TransactionReceive'
import TransactionCreation from '@/components/Transactions/TransactionCreation' import TransactionCreation from '@/components/Transactions/TransactionCreation'
import TransactionLinksSummary from '@/components/Transactions/TransactionLinksSummary' import TransactionLinkSummary from '@/components/Transactions/TransactionLinkSummary'
export default { export default {
name: 'gdd-transaction-list', name: 'gdd-transaction-list',
@ -83,7 +83,7 @@ export default {
TransactionSend, TransactionSend,
TransactionReceive, TransactionReceive,
TransactionCreation, TransactionCreation,
TransactionLinksSummary, TransactionLinkSummary,
}, },
data() { data() {
return { return {

4
frontend/src/components/Transactions/TransactionLinksSummary.spec.js → frontend/src/components/Transactions/TransactionLinkSummary.spec.js
View File

@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils' import { mount } from '@vue/test-utils'
import TransactionLinksSummary from './TransactionLinksSummary' import TransactionLinksSummary from './TransactionLinkSummary'
import { listTransactionLinks } from '@/graphql/queries' import { listTransactionLinks } from '@/graphql/queries'
import { toastErrorSpy } from '@test/testSetup' import { toastErrorSpy } from '@test/testSetup'
@ -29,7 +29,7 @@ const propsData = {
transactionLinkCount: 4, transactionLinkCount: 4,
} }
describe('TransactionLinksSummary', () => { describe('TransactionLinkSummary', () => {
let wrapper let wrapper
const Wrapper = () => { const Wrapper = () => {

0
frontend/src/components/Transactions/TransactionLinksSummary.vue → frontend/src/components/Transactions/TransactionLinkSummary.vue
View File