Merge branch 'master' into onboarding_process

admin/src/components/ConfirmRegisterMailFormular.spec.js

@@ -19,6 +19,7 @@ const mocks = {
 }
 
 const propsData = {
+  checked: false,
   email: 'bob@baumeister.de',
   dateLastSend: '',
 }

admin/src/components/ConfirmRegisterMailFormular.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div class="h5">
-        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
-      </div>
+      <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
+      <div v-else>
+        {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
 
-      <!-- Using components -->
-      <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
-        <b-form-input readonly :value="email"></b-form-input>
-        <b-input-group-append>
-          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
-            {{ $t('unregister_mail.button') }}
-          </b-button>
-        </b-input-group-append>
-      </b-input-group>
+        <!-- Using components -->
+        <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
+          <b-form-input readonly :value="email"></b-form-input>
+          <b-input-group-append>
+            <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
+              {{ $t('unregister_mail.button') }}
+            </b-button>
+          </b-input-group-append>
+        </b-input-group>
+      </div>
     </div>
   </div>
 </template>
@@ -23,6 +24,9 @@ import { sendActivationEmail } from '../graphql/sendActivationEmail'
 export default {
   name: 'ConfirmRegisterMail',
   props: {
+    checked: {
+      type: Boolean,
+    },
     email: {
       type: String,
     },

admin/src/components/UserTable.spec.js

@@ -6,28 +6,275 @@ const localVue = global.localVue
 describe('UserTable', () => {
   let wrapper
 
-  const propsData = {
-    type: 'Type',
-    itemsUser: [],
-    fieldsTable: [],
-    creation: [],
+  const defaultItemsUser = [
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+  ]
+
+  const confirmationItemsUser = [
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 1',
+      date: '11-09-2001',
+      moderator: 1,
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 2',
+      date: '21-09-2001',
+      moderator: 1,
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 3',
+      date: '30-09-2001',
+      moderator: 1,
+    },
+  ]
+
+  const propsDataPageUserSearch = {
+    type: 'PageUserSearch',
+    itemsUser: defaultItemsUser,
+    fieldsTable: [
+      'email',
+      'firstName',
+      'lastName',
+      'creation',
+      'show_details',
+      'confirm_mail',
+      'transactions_list',
+    ],
+  }
+
+  const propsDataUserListSearch = {
+    type: 'UserListSearch',
+    itemsUser: defaultItemsUser,
+    fieldsTable: ['bookmark', 'email', 'firstName', 'lastName', 'creation'],
+    creation: [1000, 1000, 1000],
+  }
+
+  const propsDataUserListMassCreation = {
+    type: 'UserListMassCreation',
+    itemsUser: defaultItemsUser,
+    fieldsTable: ['email', 'firstName', 'lastName', 'creation', 'bookmark'],
+    creation: [1000, 1000, 1000],
+  }
+
+  const propsDataPageCreationConfirm = {
+    type: 'PageCreationConfirm',
+    itemsUser: confirmationItemsUser,
+    fieldsTable: [
+      'bookmark',
+      'email',
+      'firstName',
+      'lastName',
+      'amount',
+      'memo',
+      'date',
+      'moderator',
+      'edit_creation',
+      'confirm',
+    ],
   }
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $moment: jest.fn(() => {
+      return {
+        format: jest.fn((m) => m),
+        subtract: jest.fn(() => {
+          return {
+            format: jest.fn((m) => m),
+          }
+        }),
+      }
+    }),
   }
 
-  const Wrapper = () => {
+  const Wrapper = (propsData) => {
     return mount(UserTable, { localVue, propsData, mocks })
   }
 
   describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
+    describe('type PageUserSearch', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataPageUserSearch)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      it('has a DIV element with the id overlay that is not displayed', () => {
+        expect(wrapper.find('#overlay').exists()).toBeTruthy()
+        expect(wrapper.find('#overlay').attributes('style')).toBe('display: none;')
+      })
+
+      describe('table', () => {
+        it('has a table', () => {
+          expect(wrapper.find('table').exists()).toBeTruthy()
+        })
+
+        describe('header definition', () => {
+          it('has 4 column', () => {
+            expect(wrapper.findAll('th').length).toBe(7)
+          })
+
+          it('has Email as first column', () => {
+            expect(wrapper.find('th[aria-colindex="1"] div').text()).toBe('Email')
+          })
+
+          it('has First Name as second column', () => {
+            expect(wrapper.find('th[aria-colindex="2"] div').text()).toBe('First Name')
+          })
+
+          it('has Last Name as third column', () => {
+            expect(wrapper.find('th[aria-colindex="3"] div').text()).toBe('Last Name')
+          })
+
+          it('has Creation as fourth column', () => {
+            expect(wrapper.find('th[aria-colindex="4"] div').text()).toBe('Creation')
+          })
+
+          it('has Creation as fifth column', () => {
+            expect(wrapper.find('th[aria-colindex="5"] div').text()).toBe('Show Details')
+          })
+
+          it('has Creation as sixth column', () => {
+            expect(wrapper.find('th[aria-colindex="6"] div').text()).toBe('Confirm Mail')
+          })
+
+          it('has Creation as seventh column', () => {
+            expect(wrapper.find('th[aria-colindex="7"] div').text()).toBe('Transactions List')
+          })
+        })
+
+        describe('content', () => {
+          it('has 3 rows', () => {
+            expect(wrapper.findAll('tbody tr').length).toBe(3)
+          })
+
+          it('has 7 columns', () => {
+            expect(wrapper.findAll('tr:nth-child(1) > td').length).toBe(7)
+          })
+
+          it('click button on fifth column', () => {
+            wrapper.find('tbody tr td[aria-colindex="5"] button').trigger('click')
+          })
+        })
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
     })
 
-    it('has a DIV element with the class.component-user-table', () => {
-      expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+    describe('type UserListSearch', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataUserListSearch)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
     })
+
+    describe('type UserListMassCreation', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataUserListMassCreation)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
+    })
+
+    describe('type PageCreationConfirm', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataPageCreationConfirm)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
+    })
+    /** 
+    <user-table
+      v-if="itemsList.length > 0"
+      type="UserListSearch"
+      :itemsUser="itemsList"
+      :fieldsTable="Searchfields"
+      :criteria="criteria"
+      :creation="creation"
+      @update-item="updateItem"
+    /> 
+    
+    <user-table
+      v-show="itemsMassCreation.length > 0"
+      class="shadow p-3 mb-5 bg-white rounded"
+      type="UserListMassCreation"
+      :itemsUser="itemsMassCreation"
+      :fieldsTable="fields"
+      :criteria="null"
+      :creation="creation"
+      @update-item="updateItem"
+    />
+    
+    <user-table
+      class="mt-4"
+      type="PageCreationConfirm"
+      :itemsUser="confirmResult"
+      :fieldsTable="fields"
+      @remove-confirm-result="removeConfirmResult"
+    />
+
+    <user-table
+      type="PageUserSearch"
+      :itemsUser="searchResult"
+      :fieldsTable="fields"
+      :criteria="criteria"
+    />
+    */
   })
 })

admin/src/components/UserTable.vue

@@ -74,6 +74,7 @@
 
       <template #row-details="row">
         <row-details
+          v-if="type !== 'UserListSearch' && type !== 'UserListMassCreation'"
           :row="row"
           :type="type"
           :slotName="slotName"
@@ -107,6 +108,7 @@
           </template>
           <template #show-register-mail>
             <confirm-register-mail-formular
+              :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />
@@ -232,6 +234,9 @@ export default {
           row.toggleDetails()
           this.slotIndex = index
           this.openRow = row
+          if (this.type === 'PageCreationConfirm') {
+            this.creationUserData = row.item
+          }
         }
       } else {
         row.toggleDetails()

admin/src/locales/de.json

@@ -59,7 +59,8 @@
     "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
     "info": "Email bestätigen, wiederholt senden an:",
     "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
-    "text": " Die letzte Email wurde am <b>{date} Uhr</b> an das Mitglied ({mail}) gesendet."
+    "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
+    "text_true": " Die Email wurde am {date} Uhr bestätigt."
   },
   "user_search": "Nutzer-Suche"
 }

admin/src/locales/en.json

@@ -59,7 +59,8 @@
     "error": "Error sending the confirmation link to the user: {message}",
     "info": "Confirm email, send repeatedly to:",
     "success": "Successfully send the confirmation link to the user's email! ({email})",
-    "text": " The last email was sent to the member ({mail}) on <b>{date} clock</b>."
+    "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
+    "text_true": "The email was confirmed on {date} clock."
   },
   "user_search": "User search"
 }

admin/src/pages/Creation.spec.js

@@ -35,6 +35,16 @@ const mocks = {
   $toasted: {
     error: toastErrorMock,
   },
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
 }
 
 describe('Creation', () => {

admin/src/pages/Creation.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="creation">
     <b-row>
-      <b-col cols="12" lg="5">
+      <b-col cols="12" lg="6">
         <label>Usersuche</label>
         <b-input
           type="text"
@@ -19,7 +19,7 @@
           @update-item="updateItem"
         />
       </b-col>
-      <b-col cols="12" lg="7" class="shadow p-3 mb-5 rounded bg-info">
+      <b-col cols="12" lg="6" class="shadow p-3 mb-5 rounded bg-info">
         <user-table
           v-show="itemsMassCreation.length > 0"
           class="shadow p-3 mb-5 bg-white rounded"
@@ -62,14 +62,38 @@ export default {
         { key: 'bookmark', label: 'bookmark' },
         { key: 'firstName', label: this.$t('firstname') },
         { key: 'lastName', label: this.$t('lastname') },
-        { key: 'creation', label: this.$t('open_creations') },
+        {
+          key: 'creation',
+          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label:
+            this.$moment().subtract(2, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().subtract(1, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().format('MMM'),
+          formatter: (value, key, item) => {
+            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+          },
+        },
         { key: 'email', label: this.$t('e_mail') },
       ],
       fields: [
         { key: 'email', label: this.$t('e_mail') },
         { key: 'firstName', label: this.$t('firstname') },
         { key: 'lastName', label: this.$t('lastname') },
-        { key: 'creation', label: this.$t('open_creations') },
+        {
+          key: 'creation',
+          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label:
+            this.$moment().subtract(2, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().subtract(1, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().format('MMM'),
+          formatter: (value, key, item) => {
+            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+          },
+        },
         { key: 'bookmark', label: this.$t('remove') },
       ],
       itemsList: [],

admin/src/pages/UserSearch.spec.js

@@ -61,7 +61,7 @@ describe('UserSearch', () => {
       })
 
       it('filters the users by unconfirmed emails', () => {
-        expect(wrapper.vm.searchResult).toHaveLength(0)
+        expect(wrapper.vm.searchResult).toHaveLength(1)
       })
     })
 

admin/src/pages/UserSearch.vue

@@ -42,27 +42,15 @@ export default {
         { key: 'lastName', label: this.$t('lastname') },
         {
           key: 'creation',
-          label: this.$t('open_creation'),
+          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label:
+            this.$moment().subtract(2, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().subtract(1, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().format('MMM'),
           formatter: (value, key, item) => {
-            return (
-              `
-            <div>` +
-              this.$moment().subtract(2, 'month').format('MMMM') +
-              ` - ` +
-              String(value[0]) +
-              ` GDD</div>
-            <div>` +
-              this.$moment().subtract(1, 'month').format('MMMM') +
-              ` - ` +
-              String(value[1]) +
-              ` GDD</div>
-            <div>` +
-              this.$moment().format('MMMM') +
-              ` - ` +
-              String(value[2]) +
-              ` GDD</div>
-            `
-            )
+            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
           },
         },
         { key: 'show_details', label: this.$t('details') },
@@ -87,7 +75,7 @@ export default {
   methods: {
     unconfirmedRegisterMails() {
       this.searchResult = this.searchResult.filter((user) => {
-        return user.emailChecked
+        return !user.emailChecked
       })
     },
     getUsers() {

backend/src/graphql/resolver/TransactionResolver.ts

@@ -503,7 +503,7 @@ export class TransactionResolver {
       email: userEntity.email,
     })
     if (!resultGDTSum.success) throw new Error(resultGDTSum.data)
-    transactions.gdtSum = resultGDTSum.data.sum || 0
+    transactions.gdtSum = Number(resultGDTSum.data.sum / 100) || 0
 
     // get balance
     const balanceRepository = getCustomRepository(BalanceRepository)

frontend/src/views/Pages/ResetPassword.spec.js

@@ -28,6 +28,9 @@ const createMockObject = (comingFrom) => {
           optin: '123',
           comingFrom,
         },
+        path: {
+          includes: (t) => t,
+        },
       },
       $toasted: {
         global: {

frontend/src/views/Pages/ResetPassword.vue

@@ -5,10 +5,10 @@
         <div class="header-body text-center mb-7">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-2">
-              <h1>{{ $t('settings.password.reset') }}</h1>
+              <h1>{{ $t(displaySetup.authenticated) }}</h1>
               <div class="pb-4">
                 <span>
-                  {{ $t('settings.password.reset-password.text') }}
+                  {{ $t(displaySetup.notAuthenticated) }}
                 </span>
               </div>
             </b-col>
@@ -49,14 +49,14 @@ import { setPassword } from '../../graphql/mutations'
 
 const textFields = {
   reset: {
-    authenticated: 'settings.password.reset-password.text',
-    notAuthenticated: 'settings.password.not-authenticated',
-    button: 'settings.password.reset',
+    authenticated: 'settings.password.change-password',
+    notAuthenticated: 'settings.password.reset-password.text',
+    button: 'settings.password.change-password',
     linkTo: '/login',
   },
   checkEmail: {
-    authenticated: 'settings.password.set-password.text',
-    notAuthenticated: 'settings.password.not-authenticated',
+    authenticated: 'settings.password.set',
+    notAuthenticated: 'settings.password.set-password.text',
     button: 'settings.password.set',
     linkTo: '/login',
   },
@@ -95,19 +95,17 @@ export default {
           this.$router.push('/thx/reset')
         })
         .catch((error) => {
-          if (error.message.includes('Code is older than 10 minutes')) {
-            this.$toasted.global.error(error.message)
+          this.$toasted.global.error(error.message)
+          if (error.message.includes('Code is older than 10 minutes'))
             this.$router.push('/password/reset')
-          } else {
-            this.$toasted.global.error(error.message)
-          }
         })
     },
     setDisplaySetup() {
-      if (!this.$route.params.comingFrom) {
+      if (this.$route.path.includes('checkEmail')) {
+        this.displaySetup = textFields.checkEmail
+      }
+      if (this.$route.path.includes('reset')) {
         this.displaySetup = textFields.reset
-      } else {
-        this.displaySetup = textFields[this.$route.params.comingFrom]
       }
     },
   },