mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
fix recipent, fix lint, test open
This commit is contained in:
ogerly
parent
48001db2d9
commit
61935e04c7
@ -28,7 +28,10 @@
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<span>{{ $d($moment.unix(decay.decay_start), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</span>
|
||||
<span>
|
||||
{{ $d($moment.unix(decay.decay_start), 'long') }}
|
||||
{{ $i18n.locale === 'de' ? 'Uhr' : '' }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
"close": "schließen",
|
||||
"edit": "bearbeiten",
|
||||
"save": "speichern",
|
||||
"receiver":"Empfänger",
|
||||
"recipient":"Empfänger",
|
||||
"sender":"Absender",
|
||||
"username":"Username",
|
||||
"firstname":"Vorname",
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
"close":"Close",
|
||||
"edit": "Edit",
|
||||
"save": "save",
|
||||
"receiver":"Receiver",
|
||||
"recipient":"Recipient",
|
||||
"sender":"Sender",
|
||||
"username":"Username",
|
||||
"firstname":"Firstname",
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<b-list-group>
|
||||
<b-list-group-item class="d-flex justify-content-between align-items-center">
|
||||
{{ email }}
|
||||
<b-badge variant="primary" pill>{{ $t('form.receiver') }}</b-badge>
|
||||
<b-badge variant="primary" pill>{{ $t('form.recipient') }}</b-badge>
|
||||
</b-list-group-item>
|
||||
<b-list-group-item class="d-flex justify-content-between align-items-center">
|
||||
{{ $n(amount, 'decimal') }} GDD
|
||||
|
||||
@ -50,7 +50,7 @@ describe('GddSend', () => {
|
||||
})
|
||||
|
||||
it('has a label form.receiver', () => {
|
||||
expect(wrapper.find('label.input-1').text()).toBe('form.receiver')
|
||||
expect(wrapper.find('label.input-1').text()).toBe('form.recipient')
|
||||
})
|
||||
|
||||
it('has a placeholder "E-Mail"', () => {
|
||||
@ -121,8 +121,8 @@ describe('GddSend', () => {
|
||||
)
|
||||
})
|
||||
|
||||
it('has a label form.memo', () => {
|
||||
expect(wrapper.find('label.input-3').text()).toBe('form.memo')
|
||||
it('has a label form.message', () => {
|
||||
expect(wrapper.find('label.input-3').text()).toBe('form.message')
|
||||
})
|
||||
|
||||
it('flushes an error message when memo is less than 5 characters', async () => {
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
}"
|
||||
v-slot="{ errors }"
|
||||
>
|
||||
|
||||
<label class="input-1" for="input-1">{{ $t('form.receiver') }}</label>
|
||||
<label class="input-1" for="input-1">{{ $t('form.recipient') }}</label>
|
||||
<b-input-group
|
||||
id="input-group-1"
|
||||
class="border border-default"
|
||||
@ -44,9 +43,9 @@
|
||||
class="pl-3"
|
||||
></b-form-input>
|
||||
</b-input-group>
|
||||
<b-col v-if="errors" class="text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" :key="error" class="errors">{{ error }}</span>
|
||||
</b-col>
|
||||
<b-col v-if="errors" class="text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" :key="error" class="errors">{{ error }}</span>
|
||||
</b-col>
|
||||
</validation-provider>
|
||||
</div>
|
||||
|
||||
@ -60,7 +59,7 @@
|
||||
gddSendAmount: [0.01, balance],
|
||||
}"
|
||||
v-slot="{ errors, valid }"
|
||||
>
|
||||
>
|
||||
<label class="input-2" for="input-2">{{ $t('form.amount') }}</label>
|
||||
<b-input-group id="input-group-2" class="border border-default" size="lg">
|
||||
<b-input-group-prepend class="p-2 d-none d-md-block">
|
||||
@ -79,9 +78,9 @@
|
||||
class="pl-3"
|
||||
></b-form-input>
|
||||
</b-input-group>
|
||||
<b-col v-if="errors" class="col-12 text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
|
||||
</b-col>
|
||||
<b-col v-if="errors" class="col-12 text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
|
||||
</b-col>
|
||||
</validation-provider>
|
||||
</div>
|
||||
|
||||
@ -94,7 +93,7 @@
|
||||
}"
|
||||
:name="$t('form.message')"
|
||||
v-slot="{ errors }"
|
||||
>
|
||||
>
|
||||
<label class="input-3" for="input-3">{{ $t('form.message') }}</label>
|
||||
<b-input-group id="input-group-3" class="border border-default">
|
||||
<b-input-group-prepend class="d-none d-md-block">
|
||||
@ -107,9 +106,9 @@
|
||||
class="pl-3"
|
||||
></b-form-textarea>
|
||||
</b-input-group>
|
||||
<b-col v-if="errors" class="text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
|
||||
</b-col>
|
||||
<b-col v-if="errors" class="text-right p-3 p-sm-1">
|
||||
<span v-for="error in errors" class="errors" :key="error">{{ error }}</span>
|
||||
</b-col>
|
||||
</validation-provider>
|
||||
</div>
|
||||
|
||||
|
||||
@ -9,18 +9,18 @@
|
||||
<!-- ROW Start -->
|
||||
<div class="d-flex gdd-transaction-list-item" v-b-toggle="'a' + date + ''">
|
||||
<!-- ICON -->
|
||||
<div style="width: 8%">
|
||||
<div class="tap1" style="width: 8%">
|
||||
<b-icon :icon="getProperties(type).icon" :class="getProperties(type).class" />
|
||||
</div>
|
||||
<!-- Text Links -->
|
||||
<div class="font1_2em pr-2 text-right" style="width: 32%">
|
||||
<div class="font1_2em pr-2 text-right tap2" style="width: 32%">
|
||||
<span>{{ getProperties(type).operator }}</span>
|
||||
|
||||
|
||||
<small v-if="type === 'decay'">{{ $n(balance, 'decimal') }}</small>
|
||||
|
||||
<span v-else>{{ $n(balance, 'decimal') }}</span>
|
||||
<div>
|
||||
<small >
|
||||
<small>
|
||||
{{ $t('form.message') }}
|
||||
</small>
|
||||
</div>
|
||||
@ -30,20 +30,23 @@
|
||||
</div>
|
||||
</div>
|
||||
<!-- Text Rechts -->
|
||||
<div class="font1_2em text-left pl-2" style="width: 55%">
|
||||
<div class="font1_2em text-left pl-2 tap3" style="width: 55%">
|
||||
{{ name ? name : '' }}
|
||||
<div><small >
|
||||
{{ memo }}
|
||||
</small>
|
||||
</div>
|
||||
<div>
|
||||
<small>
|
||||
{{ memo }}
|
||||
</small>
|
||||
</div>
|
||||
<span v-if="type === 'decay'">
|
||||
<small>{{ $t('decay.decay_since_last_transaction') }}</small>
|
||||
</span>
|
||||
<div v-if="date" class="text-sm">{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</div>
|
||||
<div v-if="date" class="text-sm">
|
||||
{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
|
||||
</div>
|
||||
<decay-information v-if="decay" decaytyp="short" :decay="decay" />
|
||||
</div>
|
||||
<!-- Collaps Toggle Button -->
|
||||
<div v-if="type != 'decay'" class="text-right" style="width: 5%">
|
||||
<div v-if="type != 'decay'" class="text-right tap4" style="width: 5%">
|
||||
<b-button class="btn-sm">
|
||||
<b>i</b>
|
||||
</b-button>
|
||||
@ -57,7 +60,6 @@
|
||||
<div class="d-flex">
|
||||
<div style="width: 40%" class="text-right pr-3 mr-2">
|
||||
{{ type === 'receive' ? $t('form.from') : $t('form.to1') }}:
|
||||
|
||||
</div>
|
||||
<div style="width: 60%">
|
||||
{{ name }}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user