IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2157-remove-fetchPolicy-network-only-from-statistics

Browse Source
This commit is contained in:
Wolfgang Huß 2022-08-25 09:45:47 +02:00 committed by GitHub
commit e60d10c9cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/locales/de.json
View File

@ -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": {

7
frontend/src/locales/en.json
View File

@ -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": {

5
frontend/src/locales/es.json
View File

@ -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": {

5
frontend/src/locales/fr.json
View File

@ -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": {

5
frontend/src/locales/nl.json
View File

@ -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": {

6
frontend/src/pages/InfoStatistic.spec.js
View File

@ -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',
},
},
})

23
frontend/src/pages/InfoStatistic.vue
View File

@ -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: {
@ -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')