From 9b2afaafe594999bab8dbc281ad96ab55d7840b6 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 31 Aug 2021 12:11:17 +0200 Subject: [PATCH 1/3] add id to gdt entry --- backend/src/graphql/models/GdtEntry.ts | 4 ++++ frontend/src/graphql/queries.js | 1 + 2 files changed, 5 insertions(+) diff --git a/backend/src/graphql/models/GdtEntry.ts b/backend/src/graphql/models/GdtEntry.ts index 09ee35a70..7935d4181 100644 --- a/backend/src/graphql/models/GdtEntry.ts +++ b/backend/src/graphql/models/GdtEntry.ts @@ -15,6 +15,7 @@ export enum GdtEntryType { @ObjectType() export class GdtEntry { constructor(json: any) { + this.id = json.id this.amount = json.amount this.date = json.date this.email = json.email @@ -27,6 +28,9 @@ export class GdtEntry { this.gdt = json.gdt } + @Field(() => Number) + id: number + @Field(() => Number) amount: number diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 3afe807f4..bc5c5f285 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -129,6 +129,7 @@ export const listGDTEntriesQuery = gql` listGDTEntries(currentPage: $currentPage, pageSize: $pageSize, sessionId: $sessionId) { count gdtEntries { + id amount date comment From 143a07bb57919c09e7f81e3d1e156562f42145ba Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 31 Aug 2021 12:11:37 +0200 Subject: [PATCH 2/3] fix problems with icons in fronten --- .../Pages/AccountOverview/GdtTransactionList.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index 8193717cf..02c902f6b 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -169,6 +169,19 @@ const iconsByType = { 7: { icon: 'gift', classes: 'gradido-global-color-accent' }, } +function iconByType(typeId) +{ + switch(typeId) { + case 1: + case 2: + case 3: + case 5: + case 6: return { icon: 'heart', classes: 'gradido-global-color-accent' } + case 4: return { icon: 'person-check', classes: 'gradido-global-color-accent' } + case 7: return { icon: 'gift', classes: 'gradido-global-color-accent' } + } +} + export default { name: 'gdt-transaction-list', components: { @@ -216,7 +229,7 @@ export default { }) }, getIcon(givenType) { - const type = iconsByType[givenType] + const type = iconByType(givenType) if (type) return { icon: type.icon, From 0d144324acc5267376b7658aafa6c126783adee8 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 31 Aug 2021 12:24:42 +0200 Subject: [PATCH 3/3] fix linting --- .../AccountOverview/GdtTransactionList.vue | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue index 02c902f6b..368cb5779 100644 --- a/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue +++ b/frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue @@ -163,23 +163,19 @@ import { listGDTEntriesQuery } from '../../../graphql/queries' import PaginationButtons from '../../../components/PaginationButtons' -const iconsByType = { - 1: { icon: 'heart', classes: 'gradido-global-color-accent' }, - 4: { icon: 'person-check', classes: 'gradido-global-color-accent' }, - 7: { icon: 'gift', classes: 'gradido-global-color-accent' }, -} - -function iconByType(typeId) -{ - switch(typeId) { - case 1: - case 2: - case 3: - case 5: - case 6: return { icon: 'heart', classes: 'gradido-global-color-accent' } - case 4: return { icon: 'person-check', classes: 'gradido-global-color-accent' } - case 7: return { icon: 'gift', classes: 'gradido-global-color-accent' } - } +function iconByType(typeId) { + switch (typeId) { + case 1: + case 2: + case 3: + case 5: + case 6: + return { icon: 'heart', classes: 'gradido-global-color-accent' } + case 4: + return { icon: 'person-check', classes: 'gradido-global-color-accent' } + case 7: + return { icon: 'gift', classes: 'gradido-global-color-accent' } + } } export default {