Merge branch 'master' into 2131-crud-for-messages

admin/src/pages/Overview.vue

@@ -89,7 +89,6 @@ export default {
       this.$apollo
         .query({
           query: communityStatistics,
-          fetchPolicy: 'network-only',
         })
         .then((result) => {
           this.statistics.totalUsers = result.data.communityStatistics.totalUsers

frontend/src/components/LanguageSwitch2.vue

@@ -1,14 +1,18 @@
 <template>
   <div class="language-switch">
-    <span
-      v-for="lang in locales"
-      :key="lang.code"
-      class="pointer"
-      :class="$store.state.language === lang.code ? 'c-grey' : 'c-blau'"
-    >
-      <span v-if="lang.code === $store.state.language" class="locales mr-1">{{ lang.name }}</span>
-    </span>
-    <b-icon v-b-toggle.collapse-1 icon="caret-down-fill" aria-hidden="true"></b-icon>
+    <div v-b-toggle.collapse-1>
+      <span
+        v-for="lang in locales"
+        :key="lang.code"
+        class="pointer"
+        :class="$store.state.language === lang.code ? 'c-grey' : 'c-blau'"
+      >
+        <span v-if="lang.code === $store.state.language" class="locales mr-1">
+          {{ lang.name }}
+        </span>
+      </span>
+      <b-icon icon="caret-down-fill" aria-hidden="true"></b-icon>
+    </div>
     <b-collapse id="collapse-1" class="mt-4">
       <span
         v-for="(lang, index) in locales"

frontend/src/locales/de.json

@@ -304,12 +304,9 @@
     }
   },
   "statistic": {
-    "activeUsers": "Aktive Mitglieder",
-    "deletedUsers": "Gelöschte Mitglieder",
     "totalGradidoAvailable": "GDD insgesamt im Umlauf",
     "totalGradidoCreated": "GDD insgesamt geschöpft",
-    "totalGradidoDecayed": "GDD insgesamt verfallen",
-    "totalGradidoUnbookedDecayed": "Gesamter ungebuchter GDD Verfall"
+    "totalGradidoDecayed": "GDD insgesamt verfallen"
   },
   "success": "Erfolg",
   "time": {

frontend/src/locales/en.json

@@ -304,12 +304,9 @@
     }
   },
   "statistic": {
-    "activeUsers": "Active members",
-    "deletedUsers": "Deleted members",
     "totalGradidoAvailable": "Total GDD in circulation",
-    "totalGradidoCreated": "Total created GDD",
-    "totalGradidoDecayed": "Total GDD decay",
-    "totalGradidoUnbookedDecayed": "Total unbooked GDD decay"
+    "totalGradidoCreated": "Total GDD created",
+    "totalGradidoDecayed": "Total GDD decayed"
   },
   "success": "Success",
   "time": {

frontend/src/locales/es.json

@@ -304,12 +304,9 @@
     }
   },
   "statistic": {
-    "activeUsers": "miembros activos",
-    "deletedUsers": "miembros eliminados",
     "totalGradidoAvailable": "GDD total en circulación",
     "totalGradidoCreated": "GDD total creado",
-    "totalGradidoDecayed": "GDD total decaído",
-    "totalGradidoUnbookedDecayed": "GDD no contabilizado decaído"
+    "totalGradidoDecayed": "GDD total decaído"
   },
   "success": "Lo lograste",
   "time": {

frontend/src/locales/fr.json

@@ -304,12 +304,9 @@
     }
   },
   "statistic": {
-    "activeUsers": "Membres actifs",
-    "deletedUsers": "Membres supprimés",
     "totalGradidoAvailable": "GDD total en circulation",
     "totalGradidoCreated": "GDD total puisé",
-    "totalGradidoDecayed": "Total de GDD écoulé",
-    "totalGradidoUnbookedDecayed": "Total GDD non comptabilisé écoulé"
+    "totalGradidoDecayed": "Total de GDD écoulé"
   },
   "success": "Avec succès",
   "time": {

frontend/src/locales/nl.json

@@ -304,12 +304,9 @@
     }
   },
   "statistic": {
-    "activeUsers": "Actieve leden",
-    "deletedUsers": "Verwijderde leden",
     "totalGradidoAvailable": "Totaal GDD in omloop",
     "totalGradidoCreated": "Totaal GDD geschept",
-    "totalGradidoDecayed": "Totaal GDD vervallen",
-    "totalGradidoUnbookedDecayed": "Totaal niet geboekte GDD vervallen"
+    "totalGradidoDecayed": "Totaal GDD vervallen"
   },
   "success": "Succes",
   "time": {

frontend/src/pages/InfoStatistic.spec.js

@@ -45,12 +45,12 @@ const apolloQueryMock = jest
     data: {
       communityStatistics: {
         totalUsers: 3113,
-        activeUsers: 1057,
-        deletedUsers: 35,
+        // activeUsers: 1057,
+        // deletedUsers: 35,
         totalGradidoCreated: '4083774.05000000000000000000',
         totalGradidoDecayed: '-1062639.13634129622923372197',
         totalGradidoAvailable: '2513565.869444365732411569',
-        totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+        // totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
       },
     },
   })
@@ -86,7 +86,6 @@ describe('InfoStatistic', () => {
       expect(apolloQueryMock).toBeCalledWith(
         expect.objectContaining({
           query: listContributionLinks,
-          fetchPolicy: 'network-only',
         }),
       )
     })
@@ -95,7 +94,6 @@ describe('InfoStatistic', () => {
       expect(apolloQueryMock).toBeCalledWith(
         expect.objectContaining({
           query: searchAdminUsers,
-          fetchPolicy: 'network-only',
         }),
       )
     })
@@ -104,7 +102,6 @@ describe('InfoStatistic', () => {
       expect(apolloQueryMock).toBeCalledWith(
         expect.objectContaining({
           query: communityStatistics,
-          fetchPolicy: 'network-only',
         }),
       )
     })

frontend/src/pages/InfoStatistic.vue

@@ -51,14 +51,6 @@
           {{ $t('community.members') }}
           <span class="h4">{{ totalUsers }}</span>
         </div>
-        <div>
-          {{ $t('statistic.activeUsers') }}
-          <span class="h4">{{ activeUsers }}</span>
-        </div>
-        <div>
-          {{ $t('statistic.deletedUsers') }}
-          <span class="h4">{{ deletedUsers }}</span>
-        </div>
         <div>
           {{ $t('statistic.totalGradidoCreated') }}
           <span class="h4">{{ totalGradidoCreated | GDD }}</span>
@@ -71,10 +63,6 @@
           {{ $t('statistic.totalGradidoAvailable') }}
           <span class="h4">{{ totalGradidoAvailable | GDD }}</span>
         </div>
-        <div>
-          {{ $t('statistic.totalGradidoUnbookedDecayed') }}
-          <span class="h4">{{ totalGradidoUnbookedDecayed | GDD }}</span>
-        </div>
       </div>
     </b-container>
   </div>
@@ -95,12 +83,9 @@ export default {
       supportMail: 'support@supportemail.de',
       membersCount: '1203',
       totalUsers: null,
-      activeUsers: null,
-      deletedUsers: null,
       totalGradidoCreated: null,
       totalGradidoDecayed: null,
       totalGradidoAvailable: null,
-      totalGradidoUnbookedDecayed: null,
     }
   },
   methods: {
@@ -108,7 +93,6 @@ export default {
       this.$apollo
         .query({
           query: listContributionLinks,
-          fetchPolicy: 'network-only',
         })
         .then((result) => {
           this.count = result.data.listContributionLinks.count
@@ -122,7 +106,6 @@ export default {
       this.$apollo
         .query({
           query: searchAdminUsers,
-          fetchPolicy: 'network-only',
         })
         .then((result) => {
           this.countAdminUser = result.data.searchAdminUsers.userCount
@@ -136,17 +119,14 @@ export default {
       this.$apollo
         .query({
           query: communityStatistics,
-          fetchPolicy: 'network-only',
         })
         .then((result) => {
           this.totalUsers = result.data.communityStatistics.totalUsers
-          this.activeUsers = result.data.communityStatistics.activeUsers
-          this.deletedUsers = result.data.communityStatistics.deletedUsers
-          this.totalGradidoCreated = result.data.communityStatistics.totalGradidoCreated
+          this.totalGradidoCreated =
+            Number(result.data.communityStatistics.totalGradidoCreated) -
+            Number(result.data.communityStatistics.totalGradidoUnbookedDecayed)
           this.totalGradidoDecayed = result.data.communityStatistics.totalGradidoDecayed
           this.totalGradidoAvailable = result.data.communityStatistics.totalGradidoAvailable
-          this.totalGradidoUnbookedDecayed =
-            result.data.communityStatistics.totalGradidoUnbookedDecayed
         })
         .catch(() => {
           this.toastError('communityStatistics has no result, use default data')