diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 9d1b43db9..5649697c4 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -99,6 +99,9 @@
+
+ {{ formatDateOrDash(getClosedDate(row.item)) }}
+
{
const formatDateFromDateTime = (datetimeString) => {
- if (!datetimeString || !datetimeString?.includes('T')) return datetimeString
+ if (!datetimeString || !datetimeString?.includes('T')) {
+ return datetimeString
+ }
return datetimeString.split('T')[0]
}
+ const formatDateOrDash = (value) => (value ? new Date(value).toLocaleDateString() : '—')
return {
formatDateFromDateTime,
+ formatDateOrDash,
}
}
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 2443e3e3d..d36d53576 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -55,6 +55,7 @@
},
"contributions": {
"all": "Alle",
+ "closed": "Geschlossen",
"confirms": "Bestätigt",
"deleted": "Gelöscht",
"denied": "Abgelehnt",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 45b0f2a80..b0db604cc 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -55,6 +55,7 @@
},
"contributions": {
"all": "All",
+ "closed": "Closed",
"confirms": "Confirmed",
"deleted": "Deleted",
"denied": "Rejected",
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index af002bac8..6ffd967f1 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -108,6 +108,7 @@ import { confirmContribution } from '../graphql/confirmContribution'
import { denyContribution } from '../graphql/denyContribution'
import { getContribution } from '../graphql/getContribution'
import { useAppToast } from '@/composables/useToast'
+import { useDateFormatter } from '@/composables/useDateFormatter'
import CONFIG from '@/config'
const FILTER_TAB_MAP = [
@@ -134,7 +135,7 @@ const query = ref('')
const noHashtag = ref(null)
const hideResubmissionModel = ref(true)
-const formatDateOrDash = (value) => (value ? new Date(value).toLocaleDateString() : '—')
+const { formatDateOrDash } = useDateFormatter()
const baseFields = {
firstName: { key: 'user.firstName', label: t('firstname'), class: 'no-select' },
@@ -159,11 +160,6 @@ const baseFields = {
class: 'no-select',
formatter: formatDateOrDash,
},
- confirmedByUserName: {
- key: 'confirmedByUserName',
- label: t('moderator.who'),
- class: 'no-select',
- },
}
const fields = computed(
@@ -231,7 +227,11 @@ const fields = computed(
baseFields.memo,
baseFields.contributionDate,
baseFields.createdAt,
- baseFields.confirmedAt,
+ {
+ key: 'closed',
+ label: t('contributions.closed'),
+ class: 'no-select',
+ },
{ key: 'chatCreation', label: t('details') },
],
][tabIndex.value],