From d7b3e9434389b2b32b74bfe92c7306ec2e762dd0 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 21 Feb 2022 19:16:22 +0100
Subject: [PATCH] change icon managment in adminarea nutzersuche

---
 admin/src/components/DeletedUserFormular.vue  |  23 +++-
 .../src/components/Tables/SearchUserTable.vue | 103 +++++++-----------
 admin/src/locales/de.json                     |   2 +-
 admin/src/locales/en.json                     |   2 +-
 admin/src/pages/UserSearch.vue                |  10 +-
 5 files changed, 61 insertions(+), 79 deletions(-)

diff --git a/admin/src/components/DeletedUserFormular.vue b/admin/src/components/DeletedUserFormular.vue
index 2e9b46bec..75f630fcc 100644
--- a/admin/src/components/DeletedUserFormular.vue
+++ b/admin/src/components/DeletedUserFormular.vue
@@ -1,13 +1,24 @@
 <template>
   <div>
     {{ item }}
-    <div class="mt-5">
-      <b-form-checkbox switch size="lg" v-model="checked">deleted User</b-form-checkbox>
+    <div v-if="item.userId === $store.state.moderator.id" class="mt-5 mb-5">
+      Als Admin / Moderator kannst du dich nicht selber löschen.
     </div>
-    <div class="mt-3">GDD Stand: 20 GDD</div>
-    <div class="mt-3 mb-5">
-      <b-button v-if="checked" variant="danger" @click="deleteUser">Delete User</b-button>
-      <b-button v-if="checked" variant="success" @click="unDeleteUser">Undelete User</b-button>
+    <div v-else class="mt-5">
+      <b-form-checkbox switch size="lg" v-model="checked" value="xxsxsx">
+        <div v-if="item.deletedAt === null">delete user</div>
+        <div v-if="item.deletedAt !== null">unDelete user</div>
+      </b-form-checkbox>
+
+      <div class="mt-3">GDD Stand: 20 GDD</div>
+      <div class="mt-3 mb-5">
+        <b-button v-if="checked && item.deletedAt === null" variant="danger" @click="deleteUser">
+          Delete User
+        </b-button>
+        <b-button v-if="checked && item.deletedAt !== null" variant="success" @click="unDeleteUser">
+          Undelete User
+        </b-button>
+      </div>
     </div>
   </div>
 </template>
diff --git a/admin/src/components/Tables/SearchUserTable.vue b/admin/src/components/Tables/SearchUserTable.vue
index a25243bb2..328b85d40 100644
--- a/admin/src/components/Tables/SearchUserTable.vue
+++ b/admin/src/components/Tables/SearchUserTable.vue
@@ -2,51 +2,35 @@
   <div class="search-user-table">
     <b-table-lite :items="items" :fields="fields" caption-top striped hover stacked="md">
       <template #cell(creation)="data">
-        <div v-html="data.value"></div>
+        <div v-html="data.value" @click="rowToogleDetails(row, 0)"></div>
       </template>
-      <template #cell(enabled)="row">
-        <b-icon
-          @click="rowToogleDetails(row, 3)"
-          :variant="row.item.enabled ? 'dark' : 'dark'"
-          :icon="row.item.enabled ? 'gear' : 'gear'"
-          :title="row.item.enabled ? $t('enabled') : $t('deleted')"
-        ></b-icon>
-      </template>
-      <template #cell(show_details)="row">
-        <b-button
-          variant="info"
-          size="md"
-          v-if="row.item.emailChecked"
-          @click="rowToogleDetails(row, 0)"
-          class="mr-2"
-        >
-          <b-icon :icon="row.detailsShowing ? 'eye-slash-fill' : 'eye-fill'"></b-icon>
-        </b-button>
-      </template>
-      <template #cell(confirm_mail)="row">
-        <b-button
-          :variant="row.item.emailChecked ? 'success' : 'danger'"
-          size="md"
-          @click="rowToogleDetails(row, 1)"
-          class="mr-2"
-        >
-          <b-icon
-            :icon="row.item.emailChecked ? 'envelope-open' : 'envelope'"
-            aria-label="Help"
-          ></b-icon>
-        </b-button>
-      </template>
-      <template #cell(has_elopage)="row">
-        <b-icon
-          :variant="row.item.hasElopage ? 'success' : 'danger'"
-          :icon="row.item.hasElopage ? 'check-circle' : 'x-circle'"
-        ></b-icon>
-      </template>
-      <template #cell(transactions_list)="row">
-        <b-button variant="warning" size="md" @click="rowToogleDetails(row, 2)" class="mr-2">
-          <b-icon icon="list"></b-icon>
-        </b-button>
+
+      <template #cell(status)="row">
+        <div @click="rowToogleDetails(row, 0)" class="text-right">
+          <b-table-simple fixed-width small>
+            <b-tr>
+              <b-td>
+                <b-badge v-if="!row.item.emailChecked" variant="danger" class="mr-2">
+                  <b-icon class="h4" icon="envelope" aria-label="Help"></b-icon>
+                </b-badge>
+              </b-td>
+              <b-td>
+                <b-badge v-if="!row.item.hasElopage" variant="danger" class="mr-2">
+                  <b-icon class="h4" icon="x-circle"></b-icon>
+                </b-badge>
+              </b-td>
+              <b-td>
+                <b-icon
+                  variant="dark"
+                  :icon="row.detailsShowing ? 'caret-up-fill' : 'caret-down'"
+                  :title="row.item.enabled ? $t('enabled') : $t('deleted')"
+                ></b-icon>
+              </b-td>
+            </b-tr>
+          </b-table-simple>
+        </div>
       </template>
+
       <template #row-details="row">
         <row-details
           :row="row"
@@ -55,19 +39,15 @@
           :index="slotIndex"
           @row-toogle-details="rowToogleDetails"
         >
-          <template #show-creation>
-            <div>
-              <creation-formular
-                type="singleCreation"
-                pagetype="singleCreation"
-                :creation="row.item.creation"
-                :item="row.item"
-                :creationUserData="creationUserData"
-                @update-user-data="updateUserData"
-              />
-            </div>
-          </template>
-          <template #show-register-mail>
+          <template #show-collaps>
+            <creation-formular
+              type="singleCreation"
+              pagetype="singleCreation"
+              :creation="row.item.creation"
+              :item="row.item"
+              :creationUserData="creationUserData"
+              @update-user-data="updateUserData"
+            />
             <confirm-register-mail-formular
               :checked="row.item.emailChecked"
               :email="row.item.email"
@@ -77,11 +57,7 @@
                   : ''
               "
             />
-          </template>
-          <template #show-transaction-list>
             <creation-transaction-list-formular :userId="row.item.userId" />
-          </template>
-          <template #show-deleted-user>
             <deleted-user-formular :item="row.item" />
           </template>
         </row-details>
@@ -97,12 +73,7 @@ import CreationTransactionListFormular from '../CreationTransactionListFormular.
 import DeletedUserFormular from '../DeletedUserFormular.vue'
 import { toggleRowDetails } from '../../mixins/toggleRowDetails'
 
-const slotNames = [
-  'show-creation',
-  'show-register-mail',
-  'show-transaction-list',
-  'show-deleted-user',
-]
+const slotNames = ['show-collaps']
 
 export default {
   name: 'SearchUserTable',
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 06df8a2f0..784768c02 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -26,7 +26,7 @@
   "deleted_user": "alle gelöschten Nutzer",
   "details": "Details",
   "edit": "Bearbeiten",
-  "enabled": "aktiviert",
+  "status": "Status",
   "e_mail": "E-Mail",
   "firstname": "Vorname",
   "gradido_admin_footer": "Gradido Akademie Adminkonsole",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 50dc9afd4..44a0bf65d 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -26,7 +26,7 @@
   "deleted_user": "all deleted user",
   "details": "Details",
   "edit": "Edit",
-  "enabled": "enabled",
+  "status": "Status",
   "e_mail": "E-mail",
   "firstname": "Firstname",
   "gradido_admin_footer": "Gradido Academy Admin Console",
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index ff823ad4b..f80654efa 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -115,11 +115,11 @@ export default {
             return value.join(' | ')
           },
         },
-        { key: 'show_details', label: this.$t('details') },
-        { key: 'confirm_mail', label: this.$t('confirmed') },
-        { key: 'has_elopage', label: 'elopage' },
-        { key: 'transactions_list', label: this.$t('transaction') },
-        { key: 'enabled', label: this.$t('enabled') },
+        // { key: 'show_details', label: this.$t('details') },
+        // { key: 'confirm_mail', label: this.$t('confirmed') },
+        // { key: 'has_elopage', label: 'elopage' },
+        // { key: 'transactions_list', label: this.$t('transaction') },
+        { key: 'status', label: this.$t('status') },
       ]
     },
   },