diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index f3de7be3d..016016406 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -7,7 +7,7 @@
- {{ $store.state.moderator.firstName }} {{ $store.state.moderator.lastName }}
+ {{ $store.state.firstName }} {{ $store.state.lastName }}
@@ -34,8 +34,16 @@
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
index 74d349d12..9bde5b8e0 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue
@@ -8,7 +8,7 @@ export default {
name: 'ContributionMessagesListItem',
props: {
typeId: {
- type: Number,
+ type: String,
required: true,
},
},
diff --git a/frontend/src/components/ContributionMessages/slots/IsModerator.vue b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
index 1fd284b65..1de58b023 100644
--- a/frontend/src/components/ContributionMessages/slots/IsModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsModerator.vue
@@ -1,7 +1,7 @@
-
{{ message.firstName }} {{ message.lastName }}
+
{{ message.userFirstName }} {{ message.userLastName }}
{{ message }}
diff --git a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
index 668e840fe..5b6305a2a 100644
--- a/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
+++ b/frontend/src/components/ContributionMessages/slots/IsNotModerator.vue
@@ -2,7 +2,9 @@
-
{{ message.firstName }} {{ message.lastName }}
+
+ {{ message.userFirstName }} {{ message.userLastName }}
+
{{ message }}
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index cf8606e33..c77277fc3 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -1,8 +1,10 @@
+ {{item}}
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 3654a28d2..7d0625232 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -5,7 +5,7 @@
{{ firstName }} {{ lastName }}
-
+
{{ amount | GDD }}
{{ $t('math.minus') }}
@@ -18,7 +18,10 @@
{{ memo }}
-
+
-
-
-
-
+
+
Bitte beantworte die Nachfrage
-
+
@@ -98,6 +104,18 @@ export default {
type: String,
required: false,
},
+ state: {
+ type: String,
+ required: false,
+ },
+ messages: {
+ type: Array,
+ required: false,
+ },
+ contributionId: {
+ type: Number,
+ required: true,
+ },
},
data() {
return {
@@ -105,11 +123,6 @@ export default {
}
},
computed: {
- type() {
- if (this.deletedAt) return 'deleted'
- if (this.confirmedAt) return 'confirmed'
- return 'pending'
- },
icon() {
if (this.deletedAt) return 'x-circle'
if (this.confirmedAt) return 'check'
@@ -121,9 +134,6 @@ export default {
return 'primary'
},
date() {
- // if (this.deletedAt) return this.deletedAt
- // if (this.confirmedAt) return this.confirmedAt
- // return this.contributionDate
return this.createdAt
},
collapsId() {
diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js
index 959bdefc3..9846784d5 100644
--- a/frontend/src/graphql/mutations.js
+++ b/frontend/src/graphql/mutations.js
@@ -122,3 +122,17 @@ export const deleteContribution = gql`
deleteContribution(id: $id)
}
`
+
+export const createContributionMessage = gql`
+ mutation($contributionId: Float!, $message: String!) {
+ createContributionMessage(contributionId: $contributionId, message: $message) {
+ id
+ message
+ createdAt
+ updatedAt
+ type
+ userFirstName
+ userLastName
+ }
+ }
+`