diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 140e8c228..7c9f37370 100644 --- a/frontend/src/locales/de.json +++ b/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": { diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 2e44f5d04..8fe5f31ad 100644 --- a/frontend/src/locales/en.json +++ b/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": { diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 369759479..f95344b23 100644 --- a/frontend/src/locales/es.json +++ b/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": { diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 4ff620997..44a08cd82 100644 --- a/frontend/src/locales/fr.json +++ b/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": { diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 61e702204..f817d1458 100644 --- a/frontend/src/locales/nl.json +++ b/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": { diff --git a/frontend/src/pages/InfoStatistic.spec.js b/frontend/src/pages/InfoStatistic.spec.js index d907f9661..b7b7b4a5c 100644 --- a/frontend/src/pages/InfoStatistic.spec.js +++ b/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', }, }, }) diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue index 4ea55ab58..481e34dd6 100644 --- a/frontend/src/pages/InfoStatistic.vue +++ b/frontend/src/pages/InfoStatistic.vue @@ -51,14 +51,6 @@ {{ $t('community.members') }} {{ totalUsers }} -
- {{ $t('statistic.activeUsers') }} - {{ activeUsers }} -
-
- {{ $t('statistic.deletedUsers') }} - {{ deletedUsers }} -
{{ $t('statistic.totalGradidoCreated') }} {{ totalGradidoCreated | GDD }} @@ -71,10 +63,6 @@ {{ $t('statistic.totalGradidoAvailable') }} {{ totalGradidoAvailable | GDD }}
-
- {{ $t('statistic.totalGradidoUnbookedDecayed') }} - {{ totalGradidoUnbookedDecayed | GDD }} -
@@ -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: { @@ -137,13 +122,11 @@ export default { }) .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')