Merge branch '2038-Community-contribution-site-and-form' of github.com:gradido/gradido into 2038-Community-contribution-site-and-form

backend/src/graphql/model/Contribution.ts

@@ -15,6 +15,7 @@ export class Contribution {
     this.deletedAt = contribution.deletedAt
     this.confirmedAt = contribution.confirmedAt
     this.confirmedBy = contribution.confirmedBy
+    this.contributionDate = contribution.contributionDate
   }
 
   @Field(() => Number)
@@ -43,6 +44,9 @@ export class Contribution {
 
   @Field(() => Number, { nullable: true })
   confirmedBy: number | null
+
+  @Field(() => Date)
+  contributionDate: Date
 }
 
 @ObjectType()

database/entity/0039-contributions_table/User.ts

@@ -0,0 +1,83 @@
+import {
+  BaseEntity,
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  DeleteDateColumn,
+  OneToMany,
+  JoinColumn,
+} from 'typeorm'
+import { Contribution } from '../Contribution'
+
+@Entity('users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
+export class User extends BaseEntity {
+  @PrimaryGeneratedColumn('increment', { unsigned: true })
+  id: number
+
+  @Column({ name: 'public_key', type: 'binary', length: 32, default: null, nullable: true })
+  pubKey: Buffer
+
+  @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true })
+  privKey: Buffer
+
+  @Column({ length: 255, unique: true, nullable: false, collation: 'utf8mb4_unicode_ci' })
+  email: string
+
+  @Column({
+    name: 'first_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  firstName: string
+
+  @Column({
+    name: 'last_name',
+    length: 255,
+    nullable: true,
+    default: null,
+    collation: 'utf8mb4_unicode_ci',
+  })
+  lastName: string
+
+  @DeleteDateColumn()
+  deletedAt: Date | null
+
+  @Column({ type: 'bigint', default: 0, unsigned: true })
+  password: BigInt
+
+  @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true })
+  emailHash: Buffer
+
+  @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP', nullable: false })
+  createdAt: Date
+
+  @Column({ name: 'email_checked', type: 'bool', nullable: false, default: false })
+  emailChecked: boolean
+
+  @Column({ length: 4, default: 'de', collation: 'utf8mb4_unicode_ci', nullable: false })
+  language: string
+
+  @Column({ name: 'is_admin', type: 'datetime', nullable: true, default: null })
+  isAdmin: Date | null
+
+  @Column({ name: 'referrer_id', type: 'int', unsigned: true, nullable: true, default: null })
+  referrerId?: number | null
+
+  @Column({ name: 'publisher_id', default: 0 })
+  publisherId: number
+
+  @Column({
+    type: 'text',
+    name: 'passphrase',
+    collation: 'utf8mb4_unicode_ci',
+    nullable: true,
+    default: null,
+  })
+  passphrase: string
+
+  @OneToMany(() => Contribution, (contribution) => contribution.user)
+  @JoinColumn({ name: 'user_id' })
+  contributions?: Contribution[]
+}

frontend/src/components/Contributions/ContributionForm.vue

@@ -74,7 +74,7 @@
         </b-col>
         <b-col class="text-right">
           <b-button class="test-submit" type="submit" variant="primary" :disabled="disabled">
-            {{ id === null ? $t('contribution.submit') : $t('form.edit') }}
+            {{ value.id ? $t('form.edit') : $t('contribution.submit') }}
           </b-button>
         </b-col>
       </b-row>
@@ -89,8 +89,6 @@ export default {
   },
   data() {
     return {
-      maxGddLastMonth: this.$store.state.creation[1],
-      maxGddThisMonth: this.$store.state.creation[2],
       minlength: 50,
       maxlength: 255,
       maximalDate: new Date(),
@@ -100,10 +98,10 @@ export default {
   },
   methods: {
     submit() {
-      if (this.id === null) {
-        this.$emit('set-contribution', this.form)
+      if (this.value.id) {
+        this.$emit('update-contribution', this.form)
       } else {
-        this.$emit('edit-contribution', this.form)
+        this.$emit('set-contribution', this.form)
       }
       this.reset()
     },
@@ -137,20 +135,36 @@ export default {
       // new Date().getMonth === 1 If the current month is January, then one year must be gone back in the previous month
       const obj = {
         monthAndYear: this.$d(new Date(this.minimalDate), 'monthAndYear'),
-        creation: this.$store.state.creation[1],
+        creation: this.id
+          ? this.$store.state.creation[1] + this.form.amount
+          : this.$store.state.creation[1],
       }
       return this.$t('contribution.formText.openAmountForMonth', obj)
     },
     thisMonthObject() {
       const obj = {
         monthAndYear: this.$d(new Date(), 'monthAndYear'),
-        creation: this.$store.state.creation[2],
+        creation: this.id
+          ? parseInt(this.$store.state.creation[2]) + parseInt(this.form.amount)
+          : this.$store.state.creation[2],
       }
       return this.$t('contribution.formText.openAmountForMonth', obj)
     },
     isThisMonth() {
       return new Date(this.form.date).getMonth() === new Date().getMonth()
     },
+    maxGddLastMonth() {
+      // When edited, the amount is added back on top of the amount
+      return this.id
+        ? parseInt(this.$store.state.creation[1]) + parseInt(this.form.amount)
+        : this.$store.state.creation[1]
+    },
+    maxGddThisMonth() {
+      // When edited, the amount is added back on top of the amount
+      return this.id
+        ? parseInt(this.$store.state.creation[2]) + parseInt(this.form.amount)
+        : this.$store.state.creation[2]
+    },
   },
 }
 </script>

frontend/src/components/Contributions/ContributionList.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="contribution-list container">
     <div class="list-group" v-for="item in items" :key="item.id">
-      <contribution-list-item v-bind="item" @update-contribution-form="updateContributionForm" />
+      <contribution-list-item
+        v-bind="item"
+        @update-contribution-form="updateContributionForm"
+        @delete-contribution="deleteContribution"
+      />
     </div>
     <b-pagination
       v-if="isPaginationVisible"
@@ -53,6 +57,11 @@ export default {
     updateContributionForm(item) {
       this.$emit('update-contribution-form', item)
     },
+    deleteContribution(id) {
+      this.$emit('delete-contribution', {
+        id: id,
+      })
+    },
   },
   computed: {
     isPaginationVisible() {

frontend/src/components/Contributions/ContributionListItem.vue

@@ -12,19 +12,23 @@
           <div class="mx-2">{{ $d(new Date(date), 'short') }}</div>
         </div>
         <div class="mr-2">{{ memo }}</div>
-        <div
-          v-if="type === 'pending' && !firstName"
-          class="text-right pointer"
-          @click="
-            $emit('update-contribution-form', {
-              id: id,
-              createdAt: createdAt,
-              memo: memo,
-              amount: amount,
-            })
-          "
-        >
-          <b-icon icon="pencil" class="h2"></b-icon>
+        <div v-if="type === 'pending' && !firstName" class="d-flex flex-row-reverse">
+          <div
+            class="pointer ml-5"
+            @click="
+              $emit('update-contribution-form', {
+                id: id,
+                contributionDate: contributionDate,
+                memo: memo,
+                amount: amount,
+              })
+            "
+          >
+            <b-icon icon="pencil" class="h2"></b-icon>
+          </div>
+          <div class="pointer" @click="deleteContribution(id)">
+            <b-icon icon="trash" class="h2"></b-icon>
+          </div>
         </div>
       </div>
     </slot>
@@ -54,6 +58,9 @@ export default {
     createdAt: {
       type: String,
     },
+    contributionDate: {
+      type: String,
+    },
     deletedAt: {
       type: String,
     },
@@ -83,13 +90,21 @@ export default {
     date() {
       if (this.deletedAt) return this.deletedAt
       if (this.confirmedAt) return this.confirmedAt
-      return this.createdAt
+      return this.contributionDate
     },
   },
   methods: {
     updateContributionForm(item) {
       this.$emit('update-contribution-form', item)
     },
+    deleteContribution(id) {
+      this.boxOne = ''
+      this.$bvModal.msgBoxConfirm('Delete Contribution! Are you sure?').then((value) => {
+        this.$emit('delete-contribution', {
+          id: id,
+        })
+      })
+    },
   },
 }
 </script>

frontend/src/graphql/mutations.js

@@ -113,3 +113,9 @@ export const updateContribution = gql`
     }
   }
 `
+
+export const deleteContribution = gql`
+  mutation($id: Int!) {
+    deleteContribution(id: $id)
+  }
+`

frontend/src/graphql/queries.js

@@ -182,8 +182,10 @@ export const listContributions = gql`
         amount
         memo
         createdAt
+        contributionDate
         confirmedAt
         confirmedBy
+        deletedAt
       }
     }
   }
@@ -200,6 +202,7 @@ export const listAllContributions = gql`
         amount
         memo
         createdAt
+        contributionDate
         confirmedAt
         confirmedBy
       }

frontend/src/pages/Community.vue

@@ -6,6 +6,7 @@
           <contribution-form
             @set-contribution="setContribution"
             @update-contribution="updateContribution"
+            @delete-contribution="deleteContribution"
             v-model="form"
           />
         </b-tab>
@@ -36,7 +37,7 @@
 <script>
 import ContributionForm from '@/components/Contributions/ContributionForm.vue'
 import ContributionList from '@/components/Contributions/ContributionList.vue'
-import { createContribution, updateContribution } from '@/graphql/mutations'
+import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
 import { listContributions, listAllContributions, verifyLogin } from '@/graphql/queries'
 
 export default {
@@ -111,6 +112,28 @@ export default {
           this.toastError(err.message)
         })
     },
+    deleteContribution(id) {
+      this.$apollo
+        .mutate({
+          fetchPolicy: 'no-cache',
+          mutation: deleteContribution,
+          variables: {
+            id: id,
+          },
+        })
+        .then((result) => {
+          // console.log('result', result.data)
+          this.toastSuccess(result.data)
+          this.updateListContributions({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+          })
+          this.verifyLogin()
+        })
+        .catch((err) => {
+          this.toastError(err.message)
+        })
+    },
     updateListAllContributions(pagination) {
       this.$apollo
         .query({
@@ -171,7 +194,7 @@ export default {
     },
     updateContributionForm(item) {
       this.form.id = item.id
-      this.form.date = item.createdAt
+      this.form.date = item.contributionDate
       this.form.memo = item.memo
       this.form.amount = item.amount
       this.tabIndex = 0