@@ -138,6 +154,11 @@ export default {
}
},
methods: {
+ rowClass(item, type) {
+ if (!item || type !== 'row') return
+ if (item.state === 'CONFIRMED') return 'table-success'
+ if (item.state === 'DENIED') return 'table-info'
+ },
updateCreationData(data) {
const row = data.row
this.$emit('update-contributions', data)
@@ -151,6 +172,9 @@ export default {
updateState(id) {
this.$emit('update-state', id)
},
+ reActive() {
+ alert('reActive Contribution')
+ },
},
}
diff --git a/admin/src/graphql/listAllContributions.js b/admin/src/graphql/listAllContributions.js
index c9ad60441..655ab679c 100644
--- a/admin/src/graphql/listAllContributions.js
+++ b/admin/src/graphql/listAllContributions.js
@@ -3,7 +3,7 @@ import gql from 'graphql-tag'
export const listAllContributions = gql`
query (
$currentPage: Int = 1
- $pageSize: Int = 5
+ $pageSize: Int = 25
$order: Order = DESC
$statusFilter: [ContributionStatus!]
) {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 3f9c92e86..b65830e85 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,6 +1,8 @@
{
"all_emails": "Alle Nutzer",
"back": "zurück",
+ "create":"Schöpfen",
+ "created":"Geschöpft",
"contributionLink": {
"amount": "Betrag",
"changeSaved": "Änderungen gespeichert",
@@ -31,6 +33,7 @@
},
"contributions": {
"all": "Alle",
+ "confirms":"Bestätigt",
"confirmed": "Bestätigte",
"deleted": "Gelöscht",
"denied": "Abgelehnt",
@@ -55,6 +58,7 @@
"toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit",
"update_creation": "Schöpfung aktualisieren"
},
+ "createdAt":"Angelegt",
"creation_for_month": "Schöpfung für Monat",
"date": "Datum",
"delete": "Löschen",
@@ -102,6 +106,7 @@
"request": "Die Anfrage wurde gesendet."
},
"moderator": "Moderator",
+ "mod": "Mod",
"multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
"name": "Name",
"navbar": {
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 4a8c3e942..e459bfd27 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,6 +1,7 @@
{
"all_emails": "All users",
"back": "back",
+ "create":"Create",
"contributionLink": {
"amount": "Amount",
"changeSaved": "Changes saved",
@@ -31,11 +32,13 @@
},
"contributions": {
"all": "All",
+ "confirms":"Bestätigt",
"confirmed": "Confirmed",
"deleted": "Deleted",
"denied": "Denied",
"open": "Open"
},
+ "created":"Created",
"creation": "Creation",
"creationList": "Creation list",
"creation_form": {
@@ -102,6 +105,7 @@
"request": "Request has been sent."
},
"moderator": "Moderator",
+ "mod": "Mod",
"multiple_creation_text": "Please select one or more members for which you would like to perform creations.",
"name": "Name",
"navbar": {
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 75356c588..77f46765c 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -3,7 +3,7 @@
-
+
{{ $t('contributions.open') }}
@@ -12,23 +12,38 @@
-
+
+ {{ $t('contributions.denied') }}
+
+
+
+ {{ $t('contributions.confirmed') }}
+
+
+
{{ $t('contributions.deleted') }}
-
- {{ $t('contributions.confirmed') }}
-
-
- {{ $t('contributions.denied') }}
-
-
+
{{ $t('contributions.all') }}
+ {{ rows }}
+
@@ -67,7 +92,6 @@
diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index 6a5240cd1..868b24707 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -195,6 +195,7 @@ export class ContributionResolver {
.select('c')
.from(DbContribution, 'c')
.innerJoinAndSelect('c.user', 'u')
+ .leftJoinAndSelect('c.messages', 'm')
.where(where)
.orderBy('c.createdAt', order)
.limit(pageSize)