diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js new file mode 100644 index 000000000..a53fcae02 --- /dev/null +++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js @@ -0,0 +1,40 @@ +import { mount } from '@vue/test-utils' +import ConfirmRegisterMailFormular from './ConfirmRegisterMailFormular.vue' + +const localVue = global.localVue + +const mocks = { + $moment: jest.fn(() => { + return { + format: jest.fn((m) => m), + subtract: jest.fn(() => { + return { + format: jest.fn((m) => m), + } + }), + } + }), +} + +const propsData = { + email: '', + dateLastSend: '', +} + +describe('ConfirmRegisterMailFormular', () => { + let wrapper + + const Wrapper = () => { + return mount(ConfirmRegisterMailFormular, { localVue, mocks, propsData }) + } + + describe('mount', () => { + beforeEach(() => { + wrapper = Wrapper() + }) + + it('has a DIV element with the class.component-confirm-register-mail', () => { + expect(wrapper.find('.component-confirm-register-mail').exists()).toBeTruthy() + }) + }) +}) diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue new file mode 100644 index 000000000..5ccf2eb15 --- /dev/null +++ b/admin/src/components/ConfirmRegisterMailFormular.vue @@ -0,0 +1,47 @@ + + + + + Die letzte Email wurde am + {{ dateLastSend }} Uhr + an das Mitglied ({{ email }}) gesendet. + + + + + + + + Registrierungs-Email bestätigen, jetzt senden + + + + + + + + diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index d73ea3c81..2074da857 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -204,8 +204,6 @@ export default { // Die anzahl der Mitglieder aus der Mehrfachschöpfung const i = Object.keys(this.itemsMassCreation).length // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird) - // eslint-disable-next-line no-console - console.log('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder') this.submitObj = [ { item: this.itemsMassCreation, @@ -216,8 +214,6 @@ export default { moderator: this.$store.state.moderator.id, }, ] - // eslint-disable-next-line no-console - console.log('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder') // $store - offene Schöpfungen hochzählen this.$store.commit('openCreationsPlus', i) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue new file mode 100644 index 000000000..4073a315a --- /dev/null +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -0,0 +1,59 @@ + + + Alle Geschöpften Transaktionen für den User + + + + diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index aaff9d61d..24286f01c 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -1,6 +1,6 @@ - + @@ -9,19 +9,18 @@ - Übersicht | - Usersuche | + Übersicht + Usersuche Mehrfachschöpfung - | {{ $store.state.openCreations }} offene Schöpfungen + {{ $store.state.openCreations }} offene Schöpfungen Wallet Logout - @@ -49,4 +48,7 @@ export default { height: 2rem; padding-left: 10px; } +.bg-color-creation { + background-color: #cf1010dc; +} diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 4a8ca8e84..4692cab49 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -40,7 +40,8 @@ @@ -49,40 +50,85 @@ - + + + + + + + + + + + + + - + - {{ type }} - - + + + + + + import CreationFormular from '../components/CreationFormular.vue' import EditCreationFormular from '../components/EditCreationFormular.vue' +import ConfirmRegisterMailFormular from '../components/ConfirmRegisterMailFormular.vue' +import CreationTransactionListFormular from '../components/CreationTransactionListFormular.vue' + import { confirmPendingCreation } from '../graphql/confirmPendingCreation' export default { @@ -162,9 +211,14 @@ export default { components: { CreationFormular, EditCreationFormular, + ConfirmRegisterMailFormular, + CreationTransactionListFormular, }, data() { return { + showCreationFormular: null, + showConfirmRegisterMailFormular: null, + showCreationTransactionListFormular: null, creationUserData: {}, overlay: false, overlayBookmarkType: '', @@ -181,6 +235,73 @@ export default { } }, methods: { + rowDetailsToogle(row, details) { + if ( + this.showConfirmRegisterMailFormular === true || + this.showCreationTransactionListFormular === true + ) { + this.showCreationFormular = true + this.showConfirmRegisterMailFormular = false + this.showCreationTransactionListFormular = false + return + } + if (details) { + row.toggleDetails() + this.showCreationFormular = null + this.showConfirmRegisterMailFormular = null + this.showCreationTransactionListFormular = null + } + if (!details) { + row.toggleDetails() + this.showCreationFormular = true + if (this.$refs.showing_detals_true !== undefined) { + this.$refs.showing_detals_true.click() + } + } + }, + + rowDetailsToogleRegisterMail(row, details) { + if (this.showCreationFormular === true || this.showCreationTransactionListFormular === true) { + this.showCreationFormular = false + this.showConfirmRegisterMailFormular = true + this.showCreationTransactionListFormular = false + return + } + if (details) { + row.toggleDetails() + this.showCreationFormular = null + this.showConfirmRegisterMailFormular = null + this.showCreationTransactionListFormular = null + } + if (!details) { + row.toggleDetails() + this.showConfirmRegisterMailFormular = true + if (this.$refs.showing_registermail_detals_true !== undefined) { + this.$refs.showing_registermail_detals_true.click() + } + } + }, + rowDetailsToogleTransactionsList(row, details) { + if (this.showCreationFormular === true || this.showConfirmRegisterMailFormular === true) { + this.showCreationFormular = false + this.showConfirmRegisterMailFormular = false + this.showCreationTransactionListFormular = true + return + } + if (details) { + row.toggleDetails() + this.showCreationFormular = null + this.showConfirmRegisterMailFormular = null + this.showCreationTransactionListFormular = null + } + if (!details) { + row.toggleDetails() + this.showCreationTransactionListFormular = true + if (this.$refs.showing_transactions_list_true !== undefined) { + this.$refs.showing_transactions_list_true.click() + } + } + }, overlayShow(bookmarkType, item) { this.overlay = true this.overlayBookmarkType = bookmarkType diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue index 820f6382e..e8651357e 100644 --- a/admin/src/pages/Creation.vue +++ b/admin/src/pages/Creation.vue @@ -40,7 +40,6 @@ :items="itemsMassCreation" @remove-all-bookmark="removeAllBookmark" /> - {{ itemsMassCreation }} diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index 524e03f07..9b609c3ef 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -28,28 +28,6 @@ - - - - - - zur Usersuche - - - Mitglieder - 2400 - - - - aktive Mitglieder - 2201 - - - - nicht bestätigte Mitglieder - 120 - -