diff --git a/backend/src/graphql/models/Decay.ts b/backend/src/graphql/models/Decay.ts index c6ce85548..e0234f588 100644 --- a/backend/src/graphql/models/Decay.ts +++ b/backend/src/graphql/models/Decay.ts @@ -9,6 +9,7 @@ export class Decay { this.decayStart = json.decay_start this.decayEnd = json.decay_end this.decayDuration = json.decay_duration + this.decayStartBlock = json.decay_start_block } @Field(() => Number) @@ -22,4 +23,7 @@ export class Decay { @Field(() => String, { nullable: true }) decayDuration?: string + + @Field(() => Int, { nullable: true }) + decayStartBlock?: number } diff --git a/backend/src/graphql/models/GdtEntry.ts b/backend/src/graphql/models/GdtEntry.ts index bc87abbc0..09ee35a70 100644 --- a/backend/src/graphql/models/GdtEntry.ts +++ b/backend/src/graphql/models/GdtEntry.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { ObjectType, Field } from 'type-graphql' export enum GdtEntryType { diff --git a/backend/src/graphql/models/GdtEntryList.ts b/backend/src/graphql/models/GdtEntryList.ts index 233d8472d..f62adeb4f 100644 --- a/backend/src/graphql/models/GdtEntryList.ts +++ b/backend/src/graphql/models/GdtEntryList.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/no-explicit-any */ +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { GdtEntry } from './GdtEntry' import { ObjectType, Field } from 'type-graphql' diff --git a/backend/src/graphql/models/Transaction.ts b/backend/src/graphql/models/Transaction.ts index fb17866c4..7e1102cce 100644 --- a/backend/src/graphql/models/Transaction.ts +++ b/backend/src/graphql/models/Transaction.ts @@ -43,8 +43,8 @@ export class Transaction { @Field(() => String) memo: string - @Field(() => Number) - transactionId: number + @Field(() => Number, { nullable: true }) + transactionId?: number @Field({ nullable: true }) name?: string diff --git a/frontend/src/components/DecayInformation.vue b/frontend/src/components/DecayInformation.vue index 81654be94..7187e080e 100644 --- a/frontend/src/components/DecayInformation.vue +++ b/frontend/src/components/DecayInformation.vue @@ -19,16 +19,16 @@ {{ $t('decay.last_transaction') }}
-
+
{{ $t('decay.Starting_block_decay') }}
{{ $t('decay.decay_introduced') }} : - {{ $d($moment.unix(decay.decay_start), 'long') }} + {{ $d($moment.unix(decay.decayStart), 'long') }}
- {{ $d($moment.unix(decay.decay_start), 'long') }} + {{ $d($moment.unix(decay.decayStart), 'long') }} {{ $i18n.locale === 'de' ? 'Uhr' : '' }}
@@ -40,7 +40,7 @@ {{ $t('decay.past_time') }}
-
{{ $t('decay.since_introduction') }}
+
{{ $t('decay.since_introduction') }}
{{ duration.years }} {{ $t('decay.year') }}, {{ duration.months }} {{ $t('decay.months') }}, @@ -62,24 +62,24 @@ export default { props: { decay: { balance: '', - decay_duration: '', - decay_start: 0, - decay_end: 0, - decay_start_block: 0, + decayDuration: '', + decayStart: 0, + decayEnd: 0, + decayStartBlock: 0, }, decaytyp: { type: String, default: '' }, }, computed: { decayStartBlockTextShort() { - return this.decay.decay_start_block - ? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decay_start_block)) + return this.decay.decayStartBlock + ? ' - Startblock Decay am: ' + this.$d(this.$moment.unix(this.decay.decayStartBlock)) : '' }, duration() { return this.$moment.duration( this.$moment - .unix(new Date(this.decay.decay_end)) - .diff(this.$moment.unix(new Date(this.decay.decay_start))), + .unix(new Date(this.decay.decayEnd)) + .diff(this.$moment.unix(new Date(this.decay.decayStart))), )._data }, }, diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 320ba3008..2eaa7eb56 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -62,5 +62,35 @@ export const updateUserInfos = gql` ) { validValues } +` + +export const transactionsQuery = gql` + query($sessionId: Float!, $firstPage: Int = 1, $items: Int = 25, $order: String = "DESC") { + transactionList(sessionId: $sessionId, firstPage: $firstPage, items: $items, order: $order) { + gdtSum + count + balance + decay + decayDate + transactions { + type + balance + decayStart + decayEnd + decayDuration + memo + transactionId + name + email + date + decay { + balance + decayStart + decayEnd + decayDuration + decayStartBlock + } + } + } } ` diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index 7a04e39ab..8884cd47f 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -66,11 +66,9 @@