Merge branch 'master' of github.com:gradido/gradido into 1685-refactor-notActivated-isDeleted

admin/src/components/Tables/SearchUserTable.vue

@@ -49,30 +49,40 @@
 
       <template #row-details="row">
         <b-card ref="rowDetails" class="shadow-lg pl-3 pr-3 mb-5 bg-white rounded">
-          <creation-formular
+          <b-tabs content-class="mt-3">
-            v-if="!row.item.deletedAt"
+            <b-tab :title="$t('creation')" active :disabled="row.item.deletedAt !== null">
-            type="singleCreation"
+              <creation-formular
-            pagetype="singleCreation"
+                v-if="!row.item.deletedAt"
-            :creation="row.item.creation"
+                type="singleCreation"
-            :item="row.item"
+                pagetype="singleCreation"
-            :creationUserData="creationUserData"
+                :creation="row.item.creation"
-            @update-user-data="updateUserData"
+                :item="row.item"
-          />
+                :creationUserData="creationUserData"
-          <div v-else>{{ $t('userIsDeleted') }}</div>
+                @update-user-data="updateUserData"
-          <confirm-register-mail-formular
+              />
-            v-if="!row.item.deletedAt"
+            </b-tab>
-            :checked="row.item.emailChecked"
+            <b-tab :title="$t('e_mail')" :disabled="row.item.deletedAt !== null">
-            :email="row.item.email"
+              <confirm-register-mail-formular
-            :dateLastSend="
+                v-if="!row.item.deletedAt"
-              row.item.emailConfirmationSend
+                :checked="row.item.emailChecked"
-                ? $d(new Date(row.item.emailConfirmationSend), 'long')
+                :email="row.item.email"
-                : ''
+                :dateLastSend="
-            "
+                  row.item.emailConfirmationSend
-          />
+                    ? $d(new Date(row.item.emailConfirmationSend), 'long')
-          <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
+                    : ''
-          <transaction-link-list :userId="row.item.userId" />
+                "
-
+              />
-          <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+            </b-tab>
+            <b-tab :title="$t('creationList')" :disabled="row.item.deletedAt !== null">
+              <creation-transaction-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
+            </b-tab>
+            <b-tab :title="$t('transactionlink.name')" :disabled="row.item.deletedAt !== null">
+              <transaction-link-list v-if="!row.item.deletedAt" :userId="row.item.userId" />
+            </b-tab>
+            <b-tab :title="$t('delete_user')">
+              <deleted-user-formular :item="row.item" @updateDeletedAt="updateDeletedAt" />
+            </b-tab>
+          </b-tabs>
         </b-card>
       </template>
     </b-table>

admin/src/components/TransactionLinkList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="transaction-link-list">
     <div v-if="items.length > 0">
-      <div class="h3">{{ $t('transactionlink.form_header') }}</div>
+      <div class="h3">{{ $t('transactionlink.name') }}</div>
       <b-table striped hover :fields="fields" :items="items"></b-table>
     </div>
     <b-pagination

admin/src/locales/de.json

@@ -2,6 +2,7 @@
   "all_emails": "Alle Nutzer",
   "back": "zurück",
   "creation": "Schöpfung",
+  "creationList": "Schöpfungsliste",
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
@@ -78,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Erstellt",
-    "form_header": "Transaktion-Links",
+    "name": "Transaktion-Links",
     "valid_until": "Gültig bis"
   },
   "transactionlist": {
@@ -100,7 +101,6 @@
     "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({email}) gesendet.",
     "text_true": " Die Email wurde bestätigt."
   },
-  "userIsDeleted": "Der Nutzer ist gelöscht. Es können keine GDD mehr geschöpft werden.",
   "user_deleted": "Nutzer ist gelöscht.",
   "user_recovered": "Nutzer ist wiederhergestellt.",
   "user_search": "Nutzer-Suche"

admin/src/locales/en.json

@@ -2,6 +2,7 @@
   "all_emails": "All users",
   "back": "back",
   "creation": "Creation",
+  "creationList": "Creation list",
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
@@ -78,7 +79,7 @@
   "text": "Text",
   "transactionlink": {
     "created": "Created",
-    "form_header": "Transaction links",
+    "name": "Transaction links",
     "valid_until": "Valid until"
   },
   "transactionlist": {
@@ -100,7 +101,6 @@
     "text_false": "The last email was sent to the member ({email}) on {date}.",
     "text_true": "The email was confirmed."
   },
-  "userIsDeleted": "The user is deleted. No more GDD can be created.",
   "user_deleted": "User is deleted.",
   "user_recovered": "User is recovered.",
   "user_search": "User search"