fix: enrollements count (#534)

City-of-Helsinki · Feb 29, 2024 · 8f51b96 · 8f51b96
1 parent 2aea1e2
commit 8f51b96
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/common/translation/i18n/en.json b/src/common/translation/i18n/en.json
@@ -77,7 +77,7 @@
       }
     },
     "message": {
-      "eventVisitsThisYear": "You have attended events this year"
+      "eventVisitsThisYear": "Events you have registered this year"
     }
   },
   "combobox": {

diff --git a/src/common/translation/i18n/fi.json b/src/common/translation/i18n/fi.json
@@ -77,7 +77,7 @@
       }
     },
     "message": {
-      "eventVisitsThisYear": "Tapahtumakäynnit tänä vuonna"
+      "eventVisitsThisYear": "Ilmoittautumisesi tapahtumiin tänä vuonna"
     }
   },
   "combobox": {

diff --git a/src/common/translation/i18n/sv.json b/src/common/translation/i18n/sv.json
@@ -77,7 +77,7 @@
       }
     },
     "message": {
-      "eventVisitsThisYear": "Dina evenemangsbesök i år"
+      "eventVisitsThisYear": "Dina anmälningar till årets evenemang"
     }
   },
   "combobox": {

diff --git a/src/domain/child/ChildEnrolmentCount.tsx b/src/domain/child/ChildEnrolmentCount.tsx
@@ -12,14 +12,14 @@ export default function ChildEnrolmentCount({ childId }: Props) {
   const { t } = useTranslation();
   const {
     data,
-    convenience: { areAllEnrolmentsUsed },
+    convenience: { areAllCurrentEnrolmentsUsed },
   } = useChildEnrolmentCount({
     variables: {
       childId,
     },
   });
 
-  const enrolmentsUsed = data?.child?.pastEnrolmentCount ?? ' ';
+  const enrolmentsUsed = data?.child?.enrolmentCount ?? ' ';
   const loadingSpinner = (
     <LoadingSpinner
       theme={{
@@ -31,8 +31,8 @@ export default function ChildEnrolmentCount({ childId }: Props) {
 
   return (
     <KukkuuPill
-      variant={areAllEnrolmentsUsed ? 'success' : 'default'}
-      iconLeft={areAllEnrolmentsUsed && <IconCheck />}
+      variant={areAllCurrentEnrolmentsUsed ? 'success' : 'default'}
+      iconLeft={areAllCurrentEnrolmentsUsed && <IconCheck />}
       name={
         <>
           {t('child.message.eventVisitsThisYear')}:{' '}