From 0a8d1ddb7614b770dd3c736aa411620c9934adc3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 14 Nov 2022 11:24:26 +0100
Subject: [PATCH 01/16] remove statistics from admin overview page

---
 admin/src/pages/Overview.vue | 40 ------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 57bf7ff8c..115fffb72 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,32 +28,13 @@
         </b-link>
       </b-card-text>
     </b-card>
-    <community-statistic class="mt-5" v-model="statistics" />
   </div>
 </template>
 <script>
-import { communityStatistics } from '@/graphql/communityStatistics.js'
-import CommunityStatistic from '../components/CommunityStatistic.vue'
 import { listUnconfirmedContributions } from '@/graphql/listUnconfirmedContributions.js'
 
 export default {
   name: 'overview',
-  components: {
-    CommunityStatistic,
-  },
-  data() {
-    return {
-      statistics: {
-        totalUsers: null,
-        activeUsers: null,
-        deletedUsers: null,
-        totalGradidoCreated: null,
-        totalGradidoDecayed: null,
-        totalGradidoAvailable: null,
-        totalGradidoUnbookedDecayed: null,
-      },
-    }
-  },
   methods: {
     getPendingCreations() {
       this.$apollo
@@ -65,30 +46,9 @@ export default {
           this.$store.commit('setOpenCreations', result.data.listUnconfirmedContributions.length)
         })
     },
-    getCommunityStatistics() {
-      this.$apollo
-        .query({
-          query: communityStatistics,
-        })
-        .then((result) => {
-          this.statistics.totalUsers = result.data.communityStatistics.totalUsers
-          this.statistics.activeUsers = result.data.communityStatistics.activeUsers
-          this.statistics.deletedUsers = result.data.communityStatistics.deletedUsers
-          this.statistics.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
-          this.statistics.totalGradidoDecayed = result.data.communityStatistics.totalGradidoDecayed
-          this.statistics.totalGradidoAvailable =
-            result.data.communityStatistics.totalGradidoAvailable
-          this.statistics.totalGradidoUnbookedDecayed =
-            result.data.communityStatistics.totalGradidoUnbookedDecayed
-        })
-        .catch(() => {
-          this.toastError('communityStatistics has no result, use default data')
-        })
-    },
   },
   created() {
     this.getPendingCreations()
-    this.getCommunityStatistics()
   },
 }
 </script>

From bd3593551e66bf1b02931efd12d18c97948e5d5f Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 14 Nov 2022 11:29:59 +0100
Subject: [PATCH 02/16] add separate statistic page to admin area

---
 admin/src/components/NavBar.vue                | 1 +
 admin/src/components/Tables/StatistcsTable.vue | 5 +++++
 admin/src/locales/de.json                      | 1 +
 admin/src/locales/en.json                      | 1 +
 4 files changed, 8 insertions(+)
 create mode 100644 admin/src/components/Tables/StatistcsTable.vue

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index f8dd008d1..87dd1e87c 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -10,6 +10,7 @@
       <b-collapse id="nav-collapse" is-nav>
         <b-navbar-nav>
           <b-nav-item to="/">{{ $t('navbar.overview') }}</b-nav-item>
+          <b-nav-item to="/statistic">{{ $t('navbar.statistic') }}</b-nav-item>
           <b-nav-item to="/user">{{ $t('navbar.user_search') }}</b-nav-item>
           <b-nav-item to="/creation">{{ $t('navbar.multi_creation') }}</b-nav-item>
           <b-nav-item
diff --git a/admin/src/components/Tables/StatistcsTable.vue b/admin/src/components/Tables/StatistcsTable.vue
new file mode 100644
index 000000000..a402adf68
--- /dev/null
+++ b/admin/src/components/Tables/StatistcsTable.vue
@@ -0,0 +1,5 @@
+<template>
+  <div class="statistics-table">
+    //
+  </div>
+</template>
\ No newline at end of file
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 456290ca7..987a42ca0 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -104,6 +104,7 @@
     "my-account": "Mein Konto",
     "open_creation": "Offene Schöpfungen",
     "overview": "Übersicht",
+    "statistic": "Statistik",
     "user_search": "Nutzersuche"
   },
   "not_open_creations": "Keine offenen Schöpfungen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 9bff733c5..824522a66 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -104,6 +104,7 @@
     "my-account": "My Account",
     "open_creation": "Open creations",
     "overview": "Overview",
+    "statistic": "Statistic",
     "user_search": "User search"
   },
   "not_open_creations": "No open creations",

From feb09e48fac38582acc08de7fa838c3d98a33750 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 14 Nov 2022 14:29:10 +0100
Subject: [PATCH 03/16] implement statistic table on separate statistic page in
 admin area

---
 admin/src/components/CommunityStatistic.vue   | 59 ---------------
 .../src/components/Tables/StatistcsTable.vue  |  5 --
 .../src/components/Tables/StatisticTable.vue  | 71 +++++++++++++++++++
 admin/src/locales/de.json                     |  2 +
 admin/src/locales/en.json                     |  2 +
 admin/src/pages/CommunityStatistic.vue        | 54 ++++++++++++++
 admin/src/router/routes.js                    |  4 ++
 7 files changed, 133 insertions(+), 64 deletions(-)
 delete mode 100644 admin/src/components/CommunityStatistic.vue
 delete mode 100644 admin/src/components/Tables/StatistcsTable.vue
 create mode 100644 admin/src/components/Tables/StatisticTable.vue
 create mode 100644 admin/src/pages/CommunityStatistic.vue

diff --git a/admin/src/components/CommunityStatistic.vue b/admin/src/components/CommunityStatistic.vue
deleted file mode 100644
index c19f8deec..000000000
--- a/admin/src/components/CommunityStatistic.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-  <div class="community-statistic">
-    <div>
-      <b-jumbotron bg-variant="info" text-variant="white" border-variant="dark">
-        <template #header>{{ $t('statistic.name') }}</template>
-
-        <hr class="my-4" />
-
-        <div>
-          {{ $t('statistic.totalUsers') }}{{ $t('math.colon') }}
-          <b>{{ value.totalUsers }}</b>
-        </div>
-        <div>
-          {{ $t('statistic.activeUsers') }}{{ $t('math.colon') }}
-          <b>{{ value.activeUsers }}</b>
-        </div>
-        <div>
-          {{ $t('statistic.deletedUsers') }}{{ $t('math.colon') }}
-          <b>{{ value.deletedUsers }}</b>
-        </div>
-        <div>
-          {{ $t('statistic.totalGradidoCreated') }}{{ $t('math.colon') }}
-          <b>{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b>
-          <small class="ml-5">{{ value.totalGradidoCreated }}</small>
-        </div>
-        <div>
-          {{ $t('statistic.totalGradidoDecayed') }}{{ $t('math.colon') }}
-          <b>{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b>
-          <small class="ml-5">{{ value.totalGradidoDecayed }}</small>
-        </div>
-        <div>
-          {{ $t('statistic.totalGradidoAvailable') }}{{ $t('math.colon') }}
-          <b>{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b>
-          <small class="ml-5">{{ value.totalGradidoAvailable }}</small>
-        </div>
-        <div>
-          {{ $t('statistic.totalGradidoUnbookedDecayed') }}{{ $t('math.colon') }}
-          <b>{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b>
-          <small class="ml-5">{{ value.totalGradidoUnbookedDecayed }}</small>
-        </div>
-      </b-jumbotron>
-    </div>
-  </div>
-</template>
-<script>
-import CONFIG from '@/config'
-
-export default {
-  name: 'CommunityStatistic',
-  props: {
-    value: { type: Object },
-  },
-  data() {
-    return {
-      CONFIG,
-    }
-  },
-}
-</script>
diff --git a/admin/src/components/Tables/StatistcsTable.vue b/admin/src/components/Tables/StatistcsTable.vue
deleted file mode 100644
index a402adf68..000000000
--- a/admin/src/components/Tables/StatistcsTable.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div class="statistics-table">
-    //
-  </div>
-</template>
\ No newline at end of file
diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
new file mode 100644
index 000000000..668854bb6
--- /dev/null
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="statistic-table">
+
+    <b-table-simple class="mt-5" :items="items" :fields="fields" striped stacked="md" responsive>
+      <b-thead>
+        <b-tr>
+          <b-th></b-th>
+          <b-th>{{ $t('statistic.count') }}</b-th>
+          <b-th>{{ $t('statistic.detail') }}</b-th>
+        </b-tr>
+      </b-thead>
+      <b-tbody>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.totalUsers') }}</b></b-td>
+          <b-td>{{ value.totalUsers }}</b-td>
+          <b-td></b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.activeUsers') }}</b></b-td>
+          <b-td>{{ value.activeUsers }}</b-td>
+          <b-td></b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.deletedUsers') }}</b></b-td>
+          <b-td>{{ value.deletedUsers }}</b-td>
+          <b-td></b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.totalGradidoCreated') }}</b></b-td>
+          <b-td>{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td>{{ value.totalGradidoCreated }}</b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.totalGradidoDecayed') }}</b></b-td>
+          <b-td>{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td>{{ value.totalGradidoDecayed }}</b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.totalGradidoAvailable') }}}</b></b-td>
+          <b-td>{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td>{{ value.totalGradidoAvailable }}</b-td>
+        </b-tr>
+        <b-tr>
+          <b-td><b>{{ $t('statistic.totalGradidoUnbookedDecayed') }}</b></b-td>
+          <b-td>{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td>{{ value.totalGradidoUnbookedDecayed }}</b-td>
+        </b-tr>
+      </b-tbody>
+    </b-table-simple>
+  </div>
+</template>
+<script>
+export default {
+  name: 'StatisticTable',
+  props: {
+    value: {
+      type: Array,
+      required: true,
+    },
+    fields: {
+      type: Array,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      // CONFIG,
+    }
+  },
+}
+</script>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 987a42ca0..714f554b9 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -126,7 +126,9 @@
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Aktive Mitglieder",
+    "count": "Menge",
     "deletedUsers": "Gelöschte Mitglieder",
+    "detail": "Detail",
     "name": "Statistik",
     "totalGradidoAvailable": "GDD insgesamt im Umlauf",
     "totalGradidoCreated": "GDD insgesamt geschöpft",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 824522a66..057f07b68 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -127,6 +127,8 @@
   "statistic": {
     "activeUsers": "Active members",
     "deletedUsers": "Deleted members",
+    "count": "Count",
+    "detail": "Detail",
     "name": "Statistic",
     "totalGradidoAvailable": "Total GDD in circulation",
     "totalGradidoCreated": "Total created GDD",
diff --git a/admin/src/pages/CommunityStatistic.vue b/admin/src/pages/CommunityStatistic.vue
new file mode 100644
index 000000000..562c9efc5
--- /dev/null
+++ b/admin/src/pages/CommunityStatistic.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="community-statistic">
+    <statistic-table v-model="statistics" />
+  </div>
+</template>
+<script>
+import { communityStatistics } from '@/graphql/communityStatistics.js'
+import StatisticTable from '../components/Tables/StatisticTable.vue'
+
+export default {
+  name: 'CommunityStatistic',
+  components: {
+    StatisticTable,
+  },
+  data() {
+    return {
+      statistics: {
+        totalUsers: null,
+        activeUsers: null,
+        deletedUsers: null,
+        totalGradidoCreated: null,
+        totalGradidoDecayed: null,
+        totalGradidoAvailable: null,
+        totalGradidoUnbookedDecayed: null,
+      },
+    }
+  },
+  methods: {
+    getCommunityStatistics() {
+      this.$apollo
+        .query({
+          query: communityStatistics,
+        })
+        .then((result) => {
+          this.statistics.totalUsers = result.data.communityStatistics.totalUsers
+          this.statistics.activeUsers = result.data.communityStatistics.activeUsers
+          this.statistics.deletedUsers = result.data.communityStatistics.deletedUsers
+          this.statistics.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
+          this.statistics.totalGradidoDecayed = result.data.communityStatistics.totalGradidoDecayed
+          this.statistics.totalGradidoAvailable =
+            result.data.communityStatistics.totalGradidoAvailable
+          this.statistics.totalGradidoUnbookedDecayed =
+            result.data.communityStatistics.totalGradidoUnbookedDecayed
+        })
+        .catch(() => {
+          this.toastError('communityStatistics has no result, use default data')
+        })
+    },
+  },
+  created() {
+    this.getCommunityStatistics()
+  },
+}
+</script>
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index ee82f128e..e365a6e40 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -6,6 +6,10 @@ const routes = [
     path: '/',
     component: () => import('@/pages/Overview.vue'),
   },
+  {
+    path: '/statistic',
+    component: () => import('@/pages/CommunityStatistic.vue'),
+  },
   {
     // TODO: Implement a "You are logged out"-Page
     path: '/logout',

From 14351f2004c7cb0042ada5b123109c44391eaaf7 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 14 Nov 2022 14:38:57 +0100
Subject: [PATCH 04/16] linting

---
 .../src/components/Tables/StatisticTable.vue  | 29 ++++++++++++++-----
 admin/src/locales/de.json                     |  2 --
 admin/src/locales/en.json                     |  2 --
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index 668854bb6..0095a8f57 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="statistic-table">
-
     <b-table-simple class="mt-5" :items="items" :fields="fields" striped stacked="md" responsive>
       <b-thead>
         <b-tr>
@@ -11,37 +10,51 @@
       </b-thead>
       <b-tbody>
         <b-tr>
-          <b-td><b>{{ $t('statistic.totalUsers') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.totalUsers') }}</b>
+          </b-td>
           <b-td>{{ value.totalUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.activeUsers') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.activeUsers') }}</b>
+          </b-td>
           <b-td>{{ value.activeUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.deletedUsers') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.deletedUsers') }}</b>
+          </b-td>
           <b-td>{{ value.deletedUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.totalGradidoCreated') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.totalGradidoCreated') }}</b>
+          </b-td>
           <b-td>{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b-td>
           <b-td>{{ value.totalGradidoCreated }}</b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.totalGradidoDecayed') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.totalGradidoDecayed') }}</b>
+          </b-td>
           <b-td>{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
           <b-td>{{ value.totalGradidoDecayed }}</b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.totalGradidoAvailable') }}}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.totalGradidoAvailable') }}</b>
+          </b-td>
           <b-td>{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b-td>
           <b-td>{{ value.totalGradidoAvailable }}</b-td>
         </b-tr>
         <b-tr>
-          <b-td><b>{{ $t('statistic.totalGradidoUnbookedDecayed') }}</b></b-td>
+          <b-td>
+            <b>{{ $t('statistic.totalGradidoUnbookedDecayed') }}</b>
+          </b-td>
           <b-td>{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
           <b-td>{{ value.totalGradidoUnbookedDecayed }}</b-td>
         </b-tr>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 714f554b9..01df3058e 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -85,7 +85,6 @@
   "hide_details": "Details verbergen",
   "lastname": "Nachname",
   "math": {
-    "colon": ":",
     "equals": "=",
     "exclaim": "!",
     "pipe": "|",
@@ -129,7 +128,6 @@
     "count": "Menge",
     "deletedUsers": "Gelöschte Mitglieder",
     "detail": "Detail",
-    "name": "Statistik",
     "totalGradidoAvailable": "GDD insgesamt im Umlauf",
     "totalGradidoCreated": "GDD insgesamt geschöpft",
     "totalGradidoDecayed": "GDD insgesamt verfallen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 057f07b68..f7a495e07 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -85,7 +85,6 @@
   "hide_details": "Hide details",
   "lastname": "Lastname",
   "math": {
-    "colon": ":",
     "equals": "=",
     "exclaim": "!",
     "pipe": "|",
@@ -129,7 +128,6 @@
     "deletedUsers": "Deleted members",
     "count": "Count",
     "detail": "Detail",
-    "name": "Statistic",
     "totalGradidoAvailable": "Total GDD in circulation",
     "totalGradidoCreated": "Total created GDD",
     "totalGradidoDecayed": "Total GDD decay",

From fa734edbbea67e74a3f3c9dfaf604269c9e22c2f Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 18:46:23 +0100
Subject: [PATCH 05/16] move statistics nav element to the right

---
 admin/src/components/NavBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 87dd1e87c..6bed8e6e4 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -10,7 +10,6 @@
       <b-collapse id="nav-collapse" is-nav>
         <b-navbar-nav>
           <b-nav-item to="/">{{ $t('navbar.overview') }}</b-nav-item>
-          <b-nav-item to="/statistic">{{ $t('navbar.statistic') }}</b-nav-item>
           <b-nav-item to="/user">{{ $t('navbar.user_search') }}</b-nav-item>
           <b-nav-item to="/creation">{{ $t('navbar.multi_creation') }}</b-nav-item>
           <b-nav-item
@@ -23,6 +22,7 @@
           <b-nav-item to="/contribution-links">
             {{ $t('navbar.automaticContributions') }}
           </b-nav-item>
+          <b-nav-item to="/statistic">{{ $t('navbar.statistic') }}</b-nav-item>
           <b-nav-item @click="wallet">{{ $t('navbar.my-account') }}</b-nav-item>
           <b-nav-item @click="logout">{{ $t('navbar.logout') }}</b-nav-item>
         </b-navbar-nav>

From 116dfa8acae123d3d86c6286dcd638eae7d74ddb Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 18:48:37 +0100
Subject: [PATCH 06/16] set auto width for statistics table and right align
 text in colunms

---
 .../src/components/Tables/StatisticTable.vue  | 39 +++++++------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index 0095a8f57..624619a95 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="statistic-table">
-    <b-table-simple class="mt-5" :items="items" :fields="fields" striped stacked="md" responsive>
+    <b-table-simple style="width: auto;" class="mt-5" :items="items" :fields="fields" striped stacked="md">
       <b-thead>
         <b-tr>
           <b-th></b-th>
-          <b-th>{{ $t('statistic.count') }}</b-th>
-          <b-th>{{ $t('statistic.detail') }}</b-th>
+          <b-th class="text-right">{{ $t('statistic.count') }}</b-th>
+          <b-th class="text-right">{{ $t('statistic.detail') }}</b-th>
         </b-tr>
       </b-thead>
       <b-tbody>
@@ -13,50 +13,50 @@
           <b-td>
             <b>{{ $t('statistic.totalUsers') }}</b>
           </b-td>
-          <b-td>{{ value.totalUsers }}</b-td>
+          <b-td class="text-right">{{ value.totalUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.activeUsers') }}</b>
           </b-td>
-          <b-td>{{ value.activeUsers }}</b-td>
+          <b-td class="text-right">{{ value.activeUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.deletedUsers') }}</b>
           </b-td>
-          <b-td>{{ value.deletedUsers }}</b-td>
+          <b-td class="text-right">{{ value.deletedUsers }}</b-td>
           <b-td></b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoCreated') }}</b>
           </b-td>
-          <b-td>{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b-td>
-          <b-td>{{ value.totalGradidoCreated }}</b-td>
+          <b-td class="text-right">{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">{{ value.totalGradidoCreated }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoDecayed') }}</b>
           </b-td>
-          <b-td>{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
-          <b-td>{{ value.totalGradidoDecayed }}</b-td>
+          <b-td class="text-right">{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">{{ value.totalGradidoDecayed }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoAvailable') }}</b>
           </b-td>
-          <b-td>{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b-td>
-          <b-td>{{ value.totalGradidoAvailable }}</b-td>
+          <b-td class="text-right">{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">{{ value.totalGradidoAvailable }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoUnbookedDecayed') }}</b>
           </b-td>
-          <b-td>{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
-          <b-td>{{ value.totalGradidoUnbookedDecayed }}</b-td>
+          <b-td class="text-right">{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">{{ value.totalGradidoUnbookedDecayed }}</b-td>
         </b-tr>
       </b-tbody>
     </b-table-simple>
@@ -67,18 +67,9 @@ export default {
   name: 'StatisticTable',
   props: {
     value: {
-      type: Array,
+      type: Object,
       required: true,
     },
-    fields: {
-      type: Array,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      // CONFIG,
-    }
   },
 }
 </script>

From cc835dc9609e56c78cbdea58cc6619fef623d401 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 19:12:49 +0100
Subject: [PATCH 07/16] linting

---
 .../src/components/Tables/StatisticTable.vue  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index 624619a95..0f0828f0f 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -1,6 +1,14 @@
+<!-- eslint-disable vue/no-static-inline-styles -->
 <template>
   <div class="statistic-table">
-    <b-table-simple style="width: auto;" class="mt-5" :items="items" :fields="fields" striped stacked="md">
+    <b-table-simple
+      style="width: auto"
+      class="mt-5"
+      :items="items"
+      :fields="fields"
+      striped
+      stacked="md"
+    >
       <b-thead>
         <b-tr>
           <b-th></b-th>
@@ -34,28 +42,36 @@
           <b-td>
             <b>{{ $t('statistic.totalGradidoCreated') }}</b>
           </b-td>
-          <b-td class="text-right">{{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">
+            {{ $n(value.totalGradidoCreated, 'decimal') }} {{ $t('GDD') }}
+          </b-td>
           <b-td class="text-right">{{ value.totalGradidoCreated }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoDecayed') }}</b>
           </b-td>
-          <b-td class="text-right">{{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">
+            {{ $n(value.totalGradidoDecayed, 'decimal') }} {{ $t('GDD') }}
+          </b-td>
           <b-td class="text-right">{{ value.totalGradidoDecayed }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoAvailable') }}</b>
           </b-td>
-          <b-td class="text-right">{{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">
+            {{ $n(value.totalGradidoAvailable, 'decimal') }} {{ $t('GDD') }}
+          </b-td>
           <b-td class="text-right">{{ value.totalGradidoAvailable }}</b-td>
         </b-tr>
         <b-tr>
           <b-td>
             <b>{{ $t('statistic.totalGradidoUnbookedDecayed') }}</b>
           </b-td>
-          <b-td class="text-right">{{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}</b-td>
+          <b-td class="text-right">
+            {{ $n(value.totalGradidoUnbookedDecayed, 'decimal') }} {{ $t('GDD') }}
+          </b-td>
           <b-td class="text-right">{{ value.totalGradidoUnbookedDecayed }}</b-td>
         </b-tr>
       </b-tbody>

From 419dca99e8026f737261fdbb10bb7af9e8010bd6 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 19:23:03 +0100
Subject: [PATCH 08/16] adapt and write unit tests for statistics page in admin
 area

---
 .../src/components/CommunityStatistic.spec.js | 39 ---------------
 admin/src/components/NavBar.spec.js           | 12 ++++-
 .../components/Tables/StatisticTable.spec.js  | 50 +++++++++++++++++++
 admin/src/pages/CommunityStatistic.spec.js    | 44 ++++++++++++++++
 admin/src/pages/Overview.spec.js              | 22 --------
 admin/src/router/router.test.js               |  4 +-
 6 files changed, 106 insertions(+), 65 deletions(-)
 delete mode 100644 admin/src/components/CommunityStatistic.spec.js
 create mode 100644 admin/src/components/Tables/StatisticTable.spec.js
 create mode 100644 admin/src/pages/CommunityStatistic.spec.js

diff --git a/admin/src/components/CommunityStatistic.spec.js b/admin/src/components/CommunityStatistic.spec.js
deleted file mode 100644
index dbcca5fed..000000000
--- a/admin/src/components/CommunityStatistic.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { mount } from '@vue/test-utils'
-import CommunityStatistic from './CommunityStatistic'
-
-const localVue = global.localVue
-
-const mocks = {
-  $t: jest.fn((t) => t),
-  $n: jest.fn((n) => n),
-}
-
-const propsData = {
-  value: {
-    totalUsers: '123',
-    activeUsers: '100',
-    deletedUsers: '5',
-    totalGradidoCreated: '2500',
-    totalGradidoDecayed: '200',
-    totalGradidoAvailable: '500',
-    totalGradidoUnbookedDecayed: '111',
-  },
-}
-
-describe('CommunityStatistic', () => {
-  let wrapper
-
-  const Wrapper = () => {
-    return mount(CommunityStatistic, { localVue, mocks, propsData })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('renders the Div Element ".community-statistic"', () => {
-      expect(wrapper.find('div.community-statistic').exists()).toBe(true)
-    })
-  })
-})
diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index 8956564bd..139172c30 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -49,28 +49,36 @@ describe('NavBar', () => {
     it('has a link to overview', () => {
       expect(wrapper.findAll('.nav-item').at(0).find('a').attributes('href')).toBe('/')
     })
+
     it('has a link to /user', () => {
       expect(wrapper.findAll('.nav-item').at(1).find('a').attributes('href')).toBe('/user')
     })
+
     it('has a link to /creation', () => {
       expect(wrapper.findAll('.nav-item').at(2).find('a').attributes('href')).toBe('/creation')
     })
+
     it('has a link to /creation-confirm', () => {
       expect(wrapper.findAll('.nav-item').at(3).find('a').attributes('href')).toBe(
         '/creation-confirm',
       )
     })
+
     it('has a link to /contribution-links', () => {
       expect(wrapper.findAll('.nav-item').at(4).find('a').attributes('href')).toBe(
         '/contribution-links',
       )
     })
+
+    it('has a link to /statistic', () => {
+      expect(wrapper.findAll('.nav-item').at(5).find('a').attributes('href')).toBe('/statistic')
+    })
   })
 
   describe('wallet', () => {
     const assignLocationSpy = jest.fn()
     beforeEach(async () => {
-      await wrapper.findAll('.nav-item').at(5).find('a').trigger('click')
+      await wrapper.findAll('.nav-item').at(6).find('a').trigger('click')
     })
 
     it.skip('changes window location to wallet', () => {
@@ -89,7 +97,7 @@ describe('NavBar', () => {
       window.location = {
         assign: windowLocationMock,
       }
-      await wrapper.findAll('.nav-item').at(6).find('a').trigger('click')
+      await wrapper.findAll('.nav-item').at(7).find('a').trigger('click')
     })
 
     it('redirects to /logout', () => {
diff --git a/admin/src/components/Tables/StatisticTable.spec.js b/admin/src/components/Tables/StatisticTable.spec.js
new file mode 100644
index 000000000..876728aff
--- /dev/null
+++ b/admin/src/components/Tables/StatisticTable.spec.js
@@ -0,0 +1,50 @@
+import { mount } from '@vue/test-utils'
+import StatisticTable from './StatisticTable.vue'
+
+const localVue = global.localVue
+
+const propsData = {
+  value: {
+    totalUsers: 3113,
+    activeUsers: 1057,
+    deletedUsers: 35,
+    totalGradidoCreated: '4083774.05000000000000000000',
+    totalGradidoDecayed: '-1062639.13634129622923372197',
+    totalGradidoAvailable: '2513565.869444365732411569',
+    totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+  },
+}
+
+const mocks = {
+  $t: jest.fn((t) => t),
+  $n: jest.fn((n) => n),
+  $d: jest.fn((d) => d),
+}
+
+describe('StatisticTable', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(StatisticTable, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV element with the class .statistic-table', () => {
+      expect(wrapper.find('div.statistic-table').exists()).toBe(true)
+    })
+
+    describe('renders the table', () => {
+      it('with three colunms', () => {
+        expect(wrapper.findAll('thead > tr > th')).toHaveLength(3)
+      })
+
+      it('with seven rows', () => {
+        expect(wrapper.findAll('tbody > tr')).toHaveLength(7)
+      })
+    })
+  })
+})
diff --git a/admin/src/pages/CommunityStatistic.spec.js b/admin/src/pages/CommunityStatistic.spec.js
new file mode 100644
index 000000000..80ee93820
--- /dev/null
+++ b/admin/src/pages/CommunityStatistic.spec.js
@@ -0,0 +1,44 @@
+import { mount } from '@vue/test-utils'
+import CommunityStatistic from './CommunityStatistic.vue'
+
+const localVue = global.localVue
+
+const apolloQueryMock = jest.fn().mockResolvedValue({
+  data: {
+    communityStatistics: {
+      totalUsers: 3113,
+      activeUsers: 1057,
+      deletedUsers: 35,
+      totalGradidoCreated: '4083774.05000000000000000000',
+      totalGradidoDecayed: '-1062639.13634129622923372197',
+      totalGradidoAvailable: '2513565.869444365732411569',
+      totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+    },
+  },
+})
+
+const mocks = {
+  $t: jest.fn((t) => t),
+  $n: jest.fn((n) => n),
+  $apollo: {
+    query: apolloQueryMock,
+  },
+}
+
+describe('CommunityStatistic', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(CommunityStatistic, { localVue, mocks })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the Div Element ".community-statistic"', () => {
+      expect(wrapper.find('div.community-statistic').exists()).toBe(true)
+    })
+  })
+})
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index affd018a7..8c714853f 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,5 @@
 import { mount } from '@vue/test-utils'
 import Overview from './Overview.vue'
-import { communityStatistics } from '@/graphql/communityStatistics.js'
 import { listUnconfirmedContributions } from '@/graphql/listUnconfirmedContributions.js'
 
 const localVue = global.localVue
@@ -22,19 +21,6 @@ const apolloQueryMock = jest
       ],
     },
   })
-  .mockResolvedValueOnce({
-    data: {
-      communityStatistics: {
-        totalUsers: 3113,
-        activeUsers: 1057,
-        deletedUsers: 35,
-        totalGradidoCreated: '4083774.05000000000000000000',
-        totalGradidoDecayed: '-1062639.13634129622923372197',
-        totalGradidoAvailable: '2513565.869444365732411569',
-        totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
-      },
-    },
-  })
   .mockResolvedValue({
     data: {
       listUnconfirmedContributions: [
@@ -88,14 +74,6 @@ describe('Overview', () => {
       )
     })
 
-    it('calls communityStatistics', () => {
-      expect(apolloQueryMock).toBeCalledWith(
-        expect.objectContaining({
-          query: communityStatistics,
-        }),
-      )
-    })
-
     it('commits three pending creations to store', () => {
       expect(storeCommitMock).toBeCalledWith('setOpenCreations', 3)
     })
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index 22273c15b..cb5a4080d 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -44,8 +44,8 @@ describe('router', () => {
     })
 
     describe('routes', () => {
-      it('has seven routes defined', () => {
-        expect(routes).toHaveLength(8)
+      it('has eight routes defined', () => {
+        expect(routes).toHaveLength(9)
       })
 
       it('has "/overview" as default', async () => {

From 0cf556542afe01dd1a3cb5e4d273dfa3a16ce1a5 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 21:20:08 +0100
Subject: [PATCH 09/16] fix order in en.json

---
 admin/src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f7a495e07..bed9796ab 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -125,8 +125,8 @@
   "save": "Speichern",
   "statistic": {
     "activeUsers": "Active members",
-    "deletedUsers": "Deleted members",
     "count": "Count",
+    "deletedUsers": "Deleted members",
     "detail": "Detail",
     "totalGradidoAvailable": "Total GDD in circulation",
     "totalGradidoCreated": "Total created GDD",

From 5abc930987551a8676031df149bc03d3ff2e94e3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 17 Nov 2022 22:09:39 +0100
Subject: [PATCH 10/16] change locales details key to plural

---
 admin/src/components/Tables/StatisticTable.vue | 2 +-
 admin/src/locales/de.json                      | 2 +-
 admin/src/locales/en.json                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index 0f0828f0f..1068a340d 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -13,7 +13,7 @@
         <b-tr>
           <b-th></b-th>
           <b-th class="text-right">{{ $t('statistic.count') }}</b-th>
-          <b-th class="text-right">{{ $t('statistic.detail') }}</b-th>
+          <b-th class="text-right">{{ $t('statistic.details') }}</b-th>
         </b-tr>
       </b-thead>
       <b-tbody>
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 01df3058e..ad7a668e2 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -127,7 +127,7 @@
     "activeUsers": "Aktive Mitglieder",
     "count": "Menge",
     "deletedUsers": "Gelöschte Mitglieder",
-    "detail": "Detail",
+    "details": "Details",
     "totalGradidoAvailable": "GDD insgesamt im Umlauf",
     "totalGradidoCreated": "GDD insgesamt geschöpft",
     "totalGradidoDecayed": "GDD insgesamt verfallen",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index bed9796ab..3f8751fa1 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -127,7 +127,7 @@
     "activeUsers": "Active members",
     "count": "Count",
     "deletedUsers": "Deleted members",
-    "detail": "Detail",
+    "details": "Details",
     "totalGradidoAvailable": "Total GDD in circulation",
     "totalGradidoCreated": "Total created GDD",
     "totalGradidoDecayed": "Total GDD decay",

From fa78db6d8b6084d518277708afbd1ba2aa6b22d3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Sun, 20 Nov 2022 11:13:30 +0100
Subject: [PATCH 11/16] use apollo object in community statistics page

---
 admin/src/pages/CommunityStatistic.vue | 34 +++++++++-----------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/admin/src/pages/CommunityStatistic.vue b/admin/src/pages/CommunityStatistic.vue
index 562c9efc5..3b4865ee3 100644
--- a/admin/src/pages/CommunityStatistic.vue
+++ b/admin/src/pages/CommunityStatistic.vue
@@ -25,30 +25,18 @@ export default {
       },
     }
   },
-  methods: {
-    getCommunityStatistics() {
-      this.$apollo
-        .query({
-          query: communityStatistics,
-        })
-        .then((result) => {
-          this.statistics.totalUsers = result.data.communityStatistics.totalUsers
-          this.statistics.activeUsers = result.data.communityStatistics.activeUsers
-          this.statistics.deletedUsers = result.data.communityStatistics.deletedUsers
-          this.statistics.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
-          this.statistics.totalGradidoDecayed = result.data.communityStatistics.totalGradidoDecayed
-          this.statistics.totalGradidoAvailable =
-            result.data.communityStatistics.totalGradidoAvailable
-          this.statistics.totalGradidoUnbookedDecayed =
-            result.data.communityStatistics.totalGradidoUnbookedDecayed
-        })
-        .catch(() => {
-          this.toastError('communityStatistics has no result, use default data')
-        })
+  apollo: {
+    CommunityStatistics: {
+      query() {
+        return communityStatistics
+      },
+      update({ communityStatistics }) {
+        this.statistics = communityStatistics
+      },
+      error({ message }) {
+        this.toastError(message)
+      },
     },
   },
-  created() {
-    this.getCommunityStatistics()
-  },
 }
 </script>

From 7c4e2527574fe1528fd4703f37f032b4a2d401e1 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 22 Nov 2022 09:01:55 +0100
Subject: [PATCH 12/16] fix typo in unit test

---
 admin/src/router/router.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index cb5a4080d..20563a13d 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -44,7 +44,7 @@ describe('router', () => {
     })
 
     describe('routes', () => {
-      it('has eight routes defined', () => {
+      it('has nine routes defined', () => {
         expect(routes).toHaveLength(9)
       })
 

From 7ef66e9da4219f4726b92aa6583b7b4ff4ec9527 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 22 Nov 2022 09:17:23 +0100
Subject: [PATCH 13/16] remove undefines elements from StatisticTable compoment

---
 admin/src/components/Tables/StatisticTable.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/admin/src/components/Tables/StatisticTable.vue b/admin/src/components/Tables/StatisticTable.vue
index 1068a340d..a72e007a3 100644
--- a/admin/src/components/Tables/StatisticTable.vue
+++ b/admin/src/components/Tables/StatisticTable.vue
@@ -1,14 +1,7 @@
 <!-- eslint-disable vue/no-static-inline-styles -->
 <template>
   <div class="statistic-table">
-    <b-table-simple
-      style="width: auto"
-      class="mt-5"
-      :items="items"
-      :fields="fields"
-      striped
-      stacked="md"
-    >
+    <b-table-simple style="width: auto" class="mt-5" striped stacked="md">
       <b-thead>
         <b-tr>
           <b-th></b-th>

From 8348d612b6471bade9931d07e9f5bbbb476c507d Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 22 Nov 2022 13:08:14 +0100
Subject: [PATCH 14/16] adapt unit test for admin area statistics page

---
 admin/src/pages/CommunityStatistic.spec.js | 52 ++++++++++++++++++----
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/admin/src/pages/CommunityStatistic.spec.js b/admin/src/pages/CommunityStatistic.spec.js
index 80ee93820..d3e18b467 100644
--- a/admin/src/pages/CommunityStatistic.spec.js
+++ b/admin/src/pages/CommunityStatistic.spec.js
@@ -1,10 +1,20 @@
 import { mount } from '@vue/test-utils'
 import CommunityStatistic from './CommunityStatistic.vue'
+import { communityStatistics } from '@/graphql/communityStatistics.js'
+import { toastErrorSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
+localVue.use(VueApollo)
 
-const apolloQueryMock = jest.fn().mockResolvedValue({
-  data: {
+const defaultData = () => {
+  return {
     communityStatistics: {
       totalUsers: 3113,
       activeUsers: 1057,
@@ -14,22 +24,28 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
       totalGradidoAvailable: '2513565.869444365732411569',
       totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
     },
-  },
-})
+  }
+}
 
 const mocks = {
   $t: jest.fn((t) => t),
   $n: jest.fn((n) => n),
-  $apollo: {
-    query: apolloQueryMock,
-  },
 }
 
 describe('CommunityStatistic', () => {
   let wrapper
 
+  const communityStatisticsMock = jest.fn()
+
+  mockClient.setRequestHandler(
+    communityStatistics,
+    communityStatisticsMock
+      .mockRejectedValueOnce({ message: 'Ouch!' })
+      .mockResolvedValue({ data: defaultData() }),
+  )
+
   const Wrapper = () => {
-    return mount(CommunityStatistic, { localVue, mocks })
+    return mount(CommunityStatistic, { localVue, mocks, apolloProvider })
   }
 
   describe('mount', () => {
@@ -40,5 +56,25 @@ describe('CommunityStatistic', () => {
     it('renders the Div Element ".community-statistic"', () => {
       expect(wrapper.find('div.community-statistic').exists()).toBe(true)
     })
+
+    describe('server response for get statistics is an error', () => {
+      it('toast an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('Ouch!')
+      })
+    })
+
+    describe('server response for getting statistics is success', () => {
+      it('has received the correct data', () => {
+        expect(wrapper.vm.statistics.activeUsers).toEqual(1057)
+        expect(wrapper.vm.statistics.deletedUsers).toEqual(35)
+        expect(wrapper.vm.statistics.totalGradidoAvailable).toEqual('2513565.869444365732411569')
+        expect(wrapper.vm.statistics.totalGradidoCreated).toEqual('4083774.05000000000000000000')
+        expect(wrapper.vm.statistics.totalGradidoDecayed).toEqual('-1062639.13634129622923372197')
+        expect(wrapper.vm.statistics.totalGradidoUnbookedDecayed).toEqual(
+          '-500474.6738366222166261272',
+        )
+        expect(wrapper.vm.statistics.totalUsers).toEqual(3113)
+      })
+    })
   })
 })

From abe61f9c8c7c73f15e3f165d715093262e5014e7 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Tue, 22 Nov 2022 13:41:09 +0100
Subject: [PATCH 15/16] adapt unit test for admin area routing

---
 admin/src/router/router.test.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index 20563a13d..fdc4b0b83 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -82,12 +82,19 @@ describe('router', () => {
       })
 
       describe('contribution-links', () => {
-        it('loads the "ContributionLinks" component', async () => {
+        it('loads the "ContributionLinks" page', async () => {
           const component = await routes.find((r) => r.path === '/contribution-links').component()
           expect(component.default.name).toBe('ContributionLinks')
         })
       })
 
+      describe('statistics', () => {
+        it('loads the "CommunityStatistic" page', async () => {
+          const component = await routes.find((r) => r.path === '/statistic').component()
+          expect(component.default.name).toBe('CommunityStatistic')
+        })
+      })
+
       describe('not found page', () => {
         it('renders the "NotFound" component', async () => {
           const component = await routes.find((r) => r.path === '*').component()

From 4dfd78ebd78e2b36c3a01b0f0ef43bba838cb4f0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 23 Nov 2022 08:58:39 +0100
Subject: [PATCH 16/16] adapt unit test to test rendering of the data on admin
 area statistics page

---
 admin/src/pages/CommunityStatistic.spec.js | 34 +++++++++++++++++-----
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/admin/src/pages/CommunityStatistic.spec.js b/admin/src/pages/CommunityStatistic.spec.js
index d3e18b467..50e04d11f 100644
--- a/admin/src/pages/CommunityStatistic.spec.js
+++ b/admin/src/pages/CommunityStatistic.spec.js
@@ -64,16 +64,34 @@ describe('CommunityStatistic', () => {
     })
 
     describe('server response for getting statistics is success', () => {
-      it('has received the correct data', () => {
-        expect(wrapper.vm.statistics.activeUsers).toEqual(1057)
-        expect(wrapper.vm.statistics.deletedUsers).toEqual(35)
-        expect(wrapper.vm.statistics.totalGradidoAvailable).toEqual('2513565.869444365732411569')
-        expect(wrapper.vm.statistics.totalGradidoCreated).toEqual('4083774.05000000000000000000')
-        expect(wrapper.vm.statistics.totalGradidoDecayed).toEqual('-1062639.13634129622923372197')
-        expect(wrapper.vm.statistics.totalGradidoUnbookedDecayed).toEqual(
+      it('renders the data correctly', () => {
+        expect(wrapper.findAll('tr').at(1).findAll('td').at(1).text()).toEqual('3113')
+        expect(wrapper.findAll('tr').at(2).findAll('td').at(1).text()).toEqual('1057')
+        expect(wrapper.findAll('tr').at(3).findAll('td').at(1).text()).toEqual('35')
+        expect(wrapper.findAll('tr').at(4).findAll('td').at(1).text()).toEqual(
+          '4083774.05000000000000000000 GDD',
+        )
+        expect(wrapper.findAll('tr').at(4).findAll('td').at(2).text()).toEqual(
+          '4083774.05000000000000000000',
+        )
+        expect(wrapper.findAll('tr').at(5).findAll('td').at(1).text()).toEqual(
+          '-1062639.13634129622923372197 GDD',
+        )
+        expect(wrapper.findAll('tr').at(5).findAll('td').at(2).text()).toEqual(
+          '-1062639.13634129622923372197',
+        )
+        expect(wrapper.findAll('tr').at(6).findAll('td').at(1).text()).toEqual(
+          '2513565.869444365732411569 GDD',
+        )
+        expect(wrapper.findAll('tr').at(6).findAll('td').at(2).text()).toEqual(
+          '2513565.869444365732411569',
+        )
+        expect(wrapper.findAll('tr').at(7).findAll('td').at(1).text()).toEqual(
+          '-500474.6738366222166261272 GDD',
+        )
+        expect(wrapper.findAll('tr').at(7).findAll('td').at(2).text()).toEqual(
           '-500474.6738366222166261272',
         )
-        expect(wrapper.vm.statistics.totalUsers).toEqual(3113)
       })
     })
   })