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

step3, pre merge step 2 from dario

Browse Source
This commit is contained in:
ogerly 2021-08-06 12:46:43 +02:00
parent c17871f82b
commit f04d8a598e
4 changed files with 126 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/views/Layout/DashboardLayout_gdd.vue
View File

@ -143,9 +143,11 @@ export default {
}
},
async updateGdt() {
// const result = await communityAPI.transactionsGdt(
// this.$store.state.sessionId
// )
const result = await communityAPI.transactionsGdt(
this.$store.state.sessionId
)
console.log(result)
this.transactionsGdt = [
{
@ -164,6 +166,19 @@ export default {
factor2: '0.0500',
gdt: 1000,
},
{
id: 8810,
amount: 1500,
date: '2020-08-5T16:12:00+00:00',
email: 'eopage-gradido-foerderpaket@gradido.org',
comment: null,
coupon_code: '',
gdt_entry_type_id: 7,
factor: '15.0000',
amount2: 0,
factor2: '0.0500',
gdt: 1500,
},
{
id: 8552,
amount: 1000,
@ -191,8 +206,8 @@ export default {
gdt: 1000,
},
],
transactionGdtExecutingCount: 3000,
count: 3,
transactionGdtExecutingCount: 4500,
count: 4,
},
]
},

56
frontend/src/views/Pages/AccountOverview/GddTransactionGdtList.vue
View File

@ -1,56 +0,0 @@
<template>
<div class="gdd-transaction-gtd-list">
<hr />
{{ transactionsGdt[0].gdt }}
<b-list-group>
<b-list-group-item
v-for="{
id,
amount,
date,
email,
comment,
coupon_code,
gdt_entry_type_id,
factor,
amount2,
factor2,
gdt,
} in transactionsGdt[0].gdt"
:key="id"
>
<div>id: {{ id }}</div>
<div>amount: {{ amount }}</div>
<div>date: {{ date }}</div>
<div>email: {{ email }}</div>
<div>comment: {{ comment }}</div>
<div>coupon_code: {{ coupon_code }}</div>
<div>gdt_entry_type_id: {{ gdt_entry_type_id }}</div>
<div>factor: {{ factor }}</div>
<div>amount2: {{ amount2 }}</div>
<div>factor2: {{ factor2 }}</div>
<div>gdt: {{ gdt }}</div>
</b-list-group-item>
</b-list-group>
</div>
</template>
<script>
export default {
name: 'gdd-transaction-gtd-list',
props: {
transactionsGdt: { default: () => [] },
},
methods: {
updateGdt() {
this.$emit('update-gdt')
},
},
}
</script>
<style>
.el-table .cell {
padding-left: 0px;
padding-right: 0px;
}
</style>

79
frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue Normal file
View File

@ -0,0 +1,79 @@
<template>
<div class="gdt-transaction-list">
<b-list-group>
<b-list-group-item
v-for="{
id,
amount,
date,
email,
comment,
coupon_code,
gdt_entry_type_id,
factor,
amount2,
factor2,
gdt,
} in transactionsGdt[0].gdt"
:key="id"
>
<div class="d-flex w-100 justify-content-between">
<h5 class="mb-1">List group item heading</h5>
<small>{{ $d($moment(date), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}</small>
</div>
<p class="mb-1">
Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
</p>
<small>Donec id elit non mi porta.</small>
<div>{{ id }} {{ amount }} {{ date }} {{ email }} {{ comment }} {{ coupon_code }}
{{ gdt_entry_type_id }} {{ factor }} {{ amount2 }} {{ factor2 }}
{{ gdt }}</div>
<div>{{gdt_entry_type_id === 7 ? 'GDT in Euro gekauft' : 'GDT von gradido bekommen'}}</div>
</b-list-group-item>
</b-list-group>
<hr>
<div>
{{transactionsGdt[0].state}}
</div>
<div>
{{transactionsGdt[0].gdt}}
</div>
<hr>
<div>
{{transactionsGdt[0]}}
</div>
</div>
</template>
<script>
export default {
name: 'gdt-transaction-list',
props: {
transactionsGdt: { default: () => [] },
},
methods: {
updateGdt() {
this.$emit('update-gdt')
},
},
}
</script>
<style>
.el-table .cell {
padding-left: 0px;
padding-right: 0px;
}
</style>

42
frontend/src/views/Pages/UserProfileTransactionList.vue
View File

@ -1,36 +1,46 @@
<template>
<div>
<b-container>
<b-row>
<b-col class="order-xl-1">
<gdd-transaction-list
<div >
<b-tabs content-class="mt-3 pt-4 pb-4" justified>
<b-tab :title="'Gradido (' + $n(balance, 'decimal') + ' GDD)'" active class="px-4">
<p class="tab-tex">Gradido Transaktionen </p>
<gdd-transaction-list
:timestamp="timestamp"
:transactionCount="transactionCount"
:transactions="transactions"
:show-pagination="true"
@update-transactions="updateTransactions"
/>
<gdd-transaction-gdt-list
/>
</b-tab>
<b-tab :title="'Gradido Transform (' + $n(GdtBalance, 'decimal') +' GDT)'" class="px-4">
<p class="">Gradido Transform Transaktionen</p>
<gdt-transaction-list
:timestamp="timestamp"
:transactionsGdt="transactionsGdt"
@update-gdt="updateGdt"
/>
</b-col>
</b-row>
</b-container>
</div>
/>
</b-tab>
</b-tabs>
</div>
</template>
<script>
import GddTransactionList from './AccountOverview/GddTransactionList.vue'
import GddTransactionGdtList from './AccountOverview/GddTransactionGdtList.vue'
import GdtTransactionList from './AccountOverview/GdtTransactionList.vue'
export default {
name: 'UserProfileTransactionList',
components: {
GddTransactionList,
GddTransactionGdtList,
GdtTransactionList,
},
props: {
balance: { type: Number, default: 0 },
GdtBalance: { type: Number, default: 0 },
transactions: {
default: () => [],
},
@ -54,4 +64,6 @@ export default {
},
}
</script>
<style></style>
<style>
</style>