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

Merge pull request #782 from gradido/fix_apollo_gdt

Browse Source 
Fix missing gdt id
This commit is contained in:
einhornimmond 2021-08-31 13:00:49 +02:00 committed by GitHub
commit eda7a19ee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/graphql/models/GdtEntry.ts
View File

@ -15,6 +15,7 @@ export enum GdtEntryType {
@ObjectType() @ObjectType()
export class GdtEntry { export class GdtEntry {
constructor(json: any) { constructor(json: any) {
this.id = json.id
this.amount = json.amount this.amount = json.amount
this.date = json.date this.date = json.date
this.email = json.email this.email = json.email
@ -27,6 +28,9 @@ export class GdtEntry {
this.gdt = json.gdt this.gdt = json.gdt
} }
@Field(() => Number)
id: number
@Field(() => Number) @Field(() => Number)
amount: number amount: number

1
frontend/src/graphql/queries.js
View File

@ -129,6 +129,7 @@ export const listGDTEntriesQuery = gql`
listGDTEntries(currentPage: $currentPage, pageSize: $pageSize, sessionId: $sessionId) { listGDTEntries(currentPage: $currentPage, pageSize: $pageSize, sessionId: $sessionId) {
count count
gdtEntries { gdtEntries {
id
amount amount
date date
comment comment

19
frontend/src/views/Pages/AccountOverview/GdtTransactionList.vue
View File

@ -163,10 +163,19 @@
import { listGDTEntriesQuery } from '../../../graphql/queries' import { listGDTEntriesQuery } from '../../../graphql/queries'
import PaginationButtons from '../../../components/PaginationButtons' import PaginationButtons from '../../../components/PaginationButtons'
const iconsByType = { function iconByType(typeId) {
1: { icon: 'heart', classes: 'gradido-global-color-accent' }, switch (typeId) {
4: { icon: 'person-check', classes: 'gradido-global-color-accent' }, case 1:
7: { icon: 'gift', classes: 'gradido-global-color-accent' }, 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 { export default {
@ -216,7 +225,7 @@ export default {
}) })
}, },
getIcon(givenType) { getIcon(givenType) {
const type = iconsByType[givenType] const type = iconByType(givenType)
if (type) if (type)
return { return {
icon: type.icon, icon: type.icon,