IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-14 00:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master, change tests, change operators

Browse Source
This commit is contained in:
ogerly 2022-03-03 20:23:45 +01:00 committed by Ulf Gebhardt
parent 6d17786c59
commit 970592d00b
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/DecayInformations/DecayInformation-Long.vue
View File

@ -78,7 +78,7 @@
</b-col>
<b-col cols="6">
<div v-if="typeId === 'SEND'">
<b>{{ $n(Number(amount) - Number(decay.decay), 'decimal') }}</b>
<b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>
</div>
<div v-if="typeId === 'RECEIVE'">
<b>{{ $n(Number(amount) + Number(decay.decay), 'decimal') }}</b>

3
frontend/src/components/Transactions/TransactionCreation.vue
View File

@ -1,9 +1,6 @@
<template>
<div :class="visible ? 'bg-secondary' : ''" class="transaction-slot-creation">
<div @click="visible = !visible">
{{ amount }}, {{ balance }}, {{ balanceDate }}, {{ decay }}, {{ id }}, {{ linkedUser }},
{{ memo }}
<!-- Collaps Icon -->
<div class="text-right" style="width: 95%; position: absolute">
<b-icon

5
frontend/src/components/Transactions/TransactionReceive.vue
View File

@ -14,7 +14,10 @@
<!-- ICON -->
<b-col cols="1">
<div class="gdd-transaction-list-item-icon">
<b-icon icon="arrow-right-circle" class="text-success m-mb-1 font2em" />
<b-icon
icon="arrow-right-circle"
class="gradido-global-color-accent m-mb-1 font2em"
/>
</div>
</b-col>

2
frontend/src/components/Transactions/TransactionSend.vue
View File

@ -23,7 +23,7 @@
<b-row>
<b-col cols="5">
<div class="text-right">
<span class="gdd-transaction-list-item-operator">-</span>
<span class="gdd-transaction-list-item-operator"></span>
<span class="gdd-transaction-list-item-amount">
{{ $n(amount, 'decimal') }}
</span>

14
frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
View File

@ -238,11 +238,11 @@ describe('GddTransactionList', () => {
expect(transaction.findAll('svg').at(1).classes()).toContain('text-danger')
})
it('has a minus operator', () => {
expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
'-',
)
})
// it('has a minus operator', () => {
// expect(transaction.findAll('.gdd-transaction-list-item-operator').at(0).text()).toContain(
// '-',
// )
// })
it('shows the amount of transaction', () => {
expect(transaction.findAll('.gdd-transaction-list-item-amount').at(0).text()).toContain(
@ -345,10 +345,10 @@ describe('GddTransactionList', () => {
expect(transaction.findAll('svg').at(1).classes()).toContain('bi-arrow-right-circle')
})
it('has text-success color', () => {
it('has gradido-global-color-accent color', () => {
expect(transaction.findAll('svg').at(1).classes()).toEqual([
'bi-arrow-right-circle',
'text-success',
'gradido-global-color-accent',
'm-mb-1',
'font2em',
'b-icon',