fix rules table

Author: wbglaeser

package.json

@@ -8,7 +8,7 @@
     "@babel/plugin-transform-private-property-in-object": "^7.24.7",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@foerderfunke/matching-engine": "^1.0.2",
+    "@foerderfunke/matching-engine": "^1.0.3",
     "@mui/icons-material": "^5.15.19",
     "@mui/material": "^5.15.19",
     "@mui/x-charts": "^7.6.2",

src/core/managers/matchingEngineManager.js

@@ -103,6 +103,8 @@ const matchingEngineManager = {
         const userProfileTurtle = await convertUserProfileToTurtle(userProfile);
         const expandedRp = expand(requirementProfile);
 
+        console.log("Fetching detailed matching report for user:", userId, "with RP:", expandedRp);
+
         return this.matchingEngineInstance.detailedSingleRequirementProfileValidation(
             userProfileTurtle,
             expandedRp

src/ui/language/translations.js

@@ -207,18 +207,20 @@ const translations = {
                 legalBasis: "Legal basis",
                 furtherInformation: "Further information",
                 rulesTable: {
-                    header: "Who is eligible?",
-                    yourAnswer: "Your answer",
-                    mustBeAnswered: "Must be answered",
-                    mustBe: "Must be",
-                    mustNotBe: "Must not be",
-                    oneOf: "one of",
-                    oneOrBothTrue: "One or both of the following must be true",
-                    inferredFrom: "inferred from your answer to",
-                    yes: "yes",
-                    no: "no",
-                    unknown: "unknown",
-                    orRule: "Or-Rule"
+                    header: "Eligibility conditions",
+                    yes: "Yes",
+                    no: "No",
+                    description: "This table shows the conditions that need to be met in order to be eligible for this benefit. The conditions are based on the data fields you provided in your profile.",
+                    andConditions: "All of the following conditions must be met",
+                    orConditions: "At least one of the following conditions must be met",
+                    datafieldQuestion: "Datafield question",
+                    actualValue: "Provided answer",
+                    responseMustNotBe: "The answer must not be",
+                    responseNeedsToBe: "The answer needs to be",
+                    responseMustBeLessThan: "The answer must be less than",
+                    responseMustBeGreaterThanOrEqualTo: "The answer must be greater than or equal to",
+                    responseMustNotBeOneOf: "The answer must not be one of the following",
+                    responseMustBeOneOf: "The answer must be one of the following",
                 },
                 moreInfo: "More information available here"
             }
@@ -463,17 +465,19 @@ const translations = {
                 furtherInformation: "Weitere Informationen",
                 rulesTable: {
                     header: "Wer ist anspruchsberechtigt?",
-                    yourAnswer: "Deine Antwort",
-                    mustBeAnswered: "Muss beantwortet werden",
-                    mustBe: "Muss sein",
-                    mustNotBe: "Darf nicht sein",
-                    oneOf: "eines von",
-                    oneOrBothTrue: "Eines oder beide der folgenden müssen zutreffen",
-                    inferredFrom: "abgeleitet von deiner Antwort auf",
-                    yes: "ja",
-                    no: "nein",
-                    unknown: "unbekannt",
-                    orRule: "Oder-Regel"
+                    yes: "Ja",
+                    no: "Nein",
+                    description: "Diese Tabelle zeigt die Bedingungen, die erfüllt sein müssen, um für diese Leistung anspruchsberechtigt zu sein. Die Bedingungen basieren auf den Datenfeldern, die du in deinem Profil angegeben hast.",
+                    andConditions: "Alle der folgenden Bedingungen müssen erfüllt sein",
+                    orConditions: "Eine der folgenden Bedingungen muss erfüllt sein",
+                    datafieldQuestion: "Die Frage",
+                    actualValue: "Die folgende Antwort wurde gegeben",
+                    responseMustNotBe: "Die Antwort darf nicht sein",
+                    responseNeedsToBe: "Die Antwort muss sein",
+                    responseMustBeLessThan: "Die Antwort muss kleiner sein als",
+                    responseMustBeGreaterThanOrEqualTo: "Die Antwort muss gleich oder größer sein als",
+                    responseMustNotBeOneOf: "Die Antwort darf nicht eine der folgenden sein",
+                    responseMustBeOneOf: "Die Antwort muss eine der folgenden sein",
                 },
                 moreInfo: "Weitere Informationen sind hier verfügbar"
             }

src/ui/screens/benefit-page/BenefitPageScreen.js

@@ -7,7 +7,6 @@ import BenefitPageInfoList from './components/BenefitPageInfoList';
 import BenefitPageRequiredDocuments from './components/BenefitPageRequiredDocuments';
 import BenefitPageLinksList from './components/BenefitPageLinksList';
 import BenefitPageExampleList from './components/BenefitPageExampleList';
-import BenefitPageRules from "./components/BenefitPageRules";
 import BenefitPageHeader from "./components/BenefitPageHeader";
 import AppScreenWrapperContainer from '@/ui/shared-components/app-screen-wrapper/AppScreenWrapperContainer';
 import RecursiveRulesTable from './components/RecursiveRulesTable';
@@ -31,7 +30,6 @@ const BenefitPageScreen = ({
                         flexDirection: "column",
                         width: '100%'
                     }}>
-                        <RecursiveRulesTable graphRoot={matchingGraph?.root} />
                         <VBox
                             sx={{
                                 backgroundColor: 'white.main',
@@ -44,7 +42,6 @@ const BenefitPageScreen = ({
                                 <Typography sx={{ marginTop: 1 }} variant="body1">{benefitPageData?.description || t('app.noData')}</Typography>
                             </VBox>
                         </VBox>
-                        <BenefitPageRules benefitId={id} validatedStatus={validatedStatus} />
                         {
                             benefitPageData?.examples.title && (
                                 <BenefitPageExampleList listTitle={t('app.benefitPage.examples')} data={benefitPageData?.examples} />
@@ -80,6 +77,8 @@ const BenefitPageScreen = ({
                                 <BenefitPageLinksList listTitle={t('app.benefitPage.furtherInformation')} data={benefitPageData?.furtherInformation} />
                             )
                         }
+                        <RecursiveRulesTable graphRoot={matchingGraph?.root} t={t} />
+
                     </Box>
                 </VBox>
             </AppScreenWrapperContainer>

src/ui/screens/benefit-page/BenefitPageScreenContainer.js

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useMemo } from 'react';
+import React, { useState, useEffect } from 'react';
 import { useParams } from "react-router-dom";
 import useTranslation from "@/ui/language/useTranslation";
 import useFetchStaticBenefitPageData from './hooks/useFetchStaticBenefitPageData';
@@ -8,7 +8,6 @@ import BenefitPageScreen from './BenefitPageScreen';
 import { useLanguageStore } from '@/ui/storage/useLanguageStore';
 import matchingEngineManager from "@/core/managers/matchingEngineManager";
 import { useUserStore } from '@/ui/storage/zustand';
-import buildFlow from './hooks/buildFlow';
 
 const BenefitPageScreenContainer = () => {
     const { id } = useParams();