diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index a81009c09..ef96e3652 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
@@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => {
)
})
- it('emitted "update-state" with data', async () => {
- expect(wrapper.emitted('update-state')).toEqual(
+ it('emitted "update-status" with data', async () => {
+ expect(wrapper.emitted('update-status')).toEqual(
expect.arrayContaining([expect.arrayContaining([42])]),
)
})
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
index 3a5d6e0b8..56761df12 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -54,7 +54,7 @@ export default {
})
.then((result) => {
this.$emit('get-list-contribution-messages', this.contributionId)
- this.$emit('update-state', this.contributionId)
+ this.$emit('update-status', this.contributionId)
this.form.text = ''
this.toastSuccess(this.$t('message.request'))
this.loading = false
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
index f0b6ea821..c0d9ed9ae 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -10,7 +10,7 @@ describe('ContributionMessagesList', () => {
const propsData = {
contributionId: 42,
- contributionState: 'PENDING',
+ contributionStatus: 'PENDING',
}
const mocks = {
diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
index fab6b5e4a..173061012 100644
--- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -6,11 +6,11 @@
-
@@ -31,7 +31,7 @@ export default {
type: Number,
required: true,
},
- contributionState: {
+ contributionStatus: {
type: String,
required: true,
},
@@ -58,8 +58,8 @@ export default {
this.toastError(error.message)
})
},
- updateState(id) {
- this.$emit('update-state', id)
+ updateStatus(id) {
+ this.$emit('update-status', id)
},
},
created() {
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
index d02b5053a..93e2cdcd8 100644
--- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
+++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js
@@ -18,7 +18,7 @@ describe('ContributionMessagesListItem', () => {
describe('if message author has moderator role', () => {
const propsData = {
contributionId: 42,
- state: 'PENDING',
+ status: 'PENDING',
message: {
id: 111,
message: 'Lorem ipsum?',
@@ -79,7 +79,7 @@ describe('ContributionMessagesListItem', () => {
describe('if message author does not have moderator role', () => {
const propsData = {
contributionId: 42,
- state: 'PENDING',
+ status: 'PENDING',
message: {
id: 113,
message: 'Asda sdad ad asdasd, das Ass das Das. ',
diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js
index e88d7cc22..bff1bb32c 100644
--- a/admin/src/components/CreationTransactionList.spec.js
+++ b/admin/src/components/CreationTransactionList.spec.js
@@ -28,7 +28,7 @@ const defaultData = () => {
memo: 'Danke für alles',
date: new Date(),
moderator: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,
@@ -50,7 +50,7 @@ const defaultData = () => {
memo: 'Gut Ergattert',
date: new Date(),
moderator: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,
diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue
index a4849c87e..5ce3f0644 100644
--- a/admin/src/components/CreationTransactionList.vue
+++ b/admin/src/components/CreationTransactionList.vue
@@ -34,8 +34,8 @@
{{ $t('help.transactionlist.confirmed') }}
- {{ $t('transactionlist.state') }} {{ $t('math.equals') }}
- {{ $t('help.transactionlist.state') }}
+ {{ $t('transactionlist.status') }} {{ $t('math.equals') }}
+ {{ $t('help.transactionlist.status') }}
@@ -78,8 +78,8 @@ export default {
},
},
{
- key: 'state',
- label: this.$t('transactionlist.state'),
+ key: 'status',
+ label: this.$t('transactionlist.status'),
},
{
key: 'amount',
diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 8f91aca03..11c5fd240 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -131,13 +131,13 @@ describe('OpenCreationsTable', () => {
})
})
- describe('call updateState', () => {
+ describe('call updateStatus', () => {
beforeEach(() => {
- wrapper.vm.updateState(4)
+ wrapper.vm.updateStatus(4)
})
- it('emits update-state', () => {
- expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
+ it('emits update-status', () => {
+ expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy()
})
})
})
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 9d93eba60..8e1a08785 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -9,8 +9,8 @@
stacked="md"
:tbody-tr-class="rowClass"
>
-
-
+
+
@@ -39,12 +39,12 @@
@@ -154,14 +154,14 @@ export default {
},
rowClass(item, type) {
if (!item || type !== 'row') return
- if (item.state === 'CONFIRMED') return 'table-success'
- if (item.state === 'DENIED') return 'table-warning'
- if (item.state === 'DELETED') return 'table-danger'
- if (item.state === 'IN_PROGRESS') return 'table-primary'
- if (item.state === 'PENDING') return 'table-primary'
+ if (item.status === 'CONFIRMED') return 'table-success'
+ if (item.status === 'DENIED') return 'table-warning'
+ if (item.status === 'DELETED') return 'table-danger'
+ if (item.status === 'IN_PROGRESS') return 'table-primary'
+ if (item.status === 'PENDING') return 'table-primary'
},
- updateState(id) {
- this.$emit('update-state', id)
+ updateStatus(id) {
+ this.$emit('update-status', id)
},
},
}
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index 97a11c61a..3c1dcd69c 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -26,7 +26,7 @@ export const adminListContributions = gql`
contributionDate
confirmedAt
confirmedBy
- state
+ status
messagesCount
deniedAt
deniedBy
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index e7fb80062..b38e8b6e7 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -94,7 +94,7 @@
"transactionlist": {
"confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
"periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht.",
- "state": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+ "status": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
"submitted": "Wann wurde es vom Mitglied eingereicht"
}
},
@@ -184,7 +184,7 @@
"confirmed": "Bestätigt",
"memo": "Nachricht",
"period": "Zeitraum",
- "state": "Status",
+ "status": "Status",
"submitted": "Eingereicht",
"title": "Alle geschöpften Transaktionen für den Nutzer"
},
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 8ed53cd4b..2ef31e55e 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -94,7 +94,7 @@
"transactionlist": {
"confirmed": "When was it confirmed by a moderator / admin.",
"periods": "For what period was it submitted by the member.",
- "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
+ "status": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
"submitted": "When was it submitted by the member"
}
},
@@ -184,7 +184,7 @@
"confirmed": "Confirmed",
"memo": "Message",
"period": "Period",
- "state": "State",
+ "status": "State",
"submitted": "Submitted",
"title": "All creation-transactions for the user"
},
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 091d7a011..c8f01d40d 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -51,7 +51,7 @@ const defaultData = () => {
memo: 'Danke für alles',
date: new Date(),
moderator: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,
@@ -73,7 +73,7 @@ const defaultData = () => {
memo: 'Gut Ergattert',
date: new Date(),
moderator: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,
@@ -451,12 +451,12 @@ describe('CreationConfirm', () => {
describe('update status', () => {
beforeEach(async () => {
- await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-state', 2)
+ await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-status', 2)
})
it('updates the status', () => {
expect(wrapper.vm.items.find((obj) => obj.id === 2).messagesCount).toBe(1)
- expect(wrapper.vm.items.find((obj) => obj.id === 2).state).toBe('IN_PROGRESS')
+ expect(wrapper.vm.items.find((obj) => obj.id === 2).status).toBe('IN_PROGRESS')
})
})
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 53ffbd66e..fbbe03406 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -43,7 +43,7 @@
:items="items"
:fields="fields"
@show-overlay="showOverlay"
- @update-state="updateStatus"
+ @update-status="updateStatus"
@update-contributions="$apollo.queries.ListAllContributions.refetch()"
/>
@@ -187,7 +187,7 @@ export default {
},
updateStatus(id) {
this.items.find((obj) => obj.id === id).messagesCount++
- this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
+ this.items.find((obj) => obj.id === id).status = 'IN_PROGRESS'
},
formatDateOrDash(value) {
return value ? this.$d(new Date(value), 'short') : '—'
@@ -331,7 +331,7 @@ export default {
],
[
// all contributions
- { key: 'state', label: this.$t('status') },
+ { key: 'status', label: this.$t('status') },
{ key: 'firstName', label: this.$t('firstname') },
{ key: 'lastName', label: this.$t('lastname') },
{
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 53378d010..b9ad77cdd 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -43,7 +43,7 @@ const defaultData = () => {
memo: 'Danke für alles',
date: new Date(),
moderatorId: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,
@@ -65,7 +65,7 @@ const defaultData = () => {
memo: 'Gut Ergattert',
date: new Date(),
moderatorId: 1,
- state: 'PENDING',
+ status: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
deniedBy: null,