mirror of
https://github.com/betagouv/mon-entreprise
synced 2025-03-13 02:45:04 +00:00
fix(pam): correction de l'affichage des questions de l'assistant PAM
This commit is contained in:
parent
ca46960a85
commit
f58286bddf
2 changed files with 41 additions and 2 deletions
|
@ -0,0 +1,30 @@
|
|||
import { DottedName } from 'modele-social'
|
||||
import Engine from 'publicodes'
|
||||
import React from 'react'
|
||||
|
||||
import { useEngine } from '../utils/EngineContext'
|
||||
|
||||
export function WhenAlreadyDefinedMulti({
|
||||
dottedNames,
|
||||
children,
|
||||
engine,
|
||||
}: {
|
||||
dottedNames: DottedName[]
|
||||
children: React.ReactNode
|
||||
engine?: Engine<DottedName>
|
||||
}) {
|
||||
const defaultEngine = useEngine()
|
||||
|
||||
const engineValue = engine ?? defaultEngine
|
||||
|
||||
const notAllAlreadyDefined = dottedNames.some(
|
||||
(dottedName) =>
|
||||
engineValue.evaluate({ 'est non défini': dottedName }).nodeValue
|
||||
)
|
||||
|
||||
if (notAllAlreadyDefined) {
|
||||
return null
|
||||
}
|
||||
|
||||
return <>{children}</>
|
||||
}
|
|
@ -1,5 +1,6 @@
|
|||
import { AssistantGoal } from '@/components/Assistant/AssistantGoal'
|
||||
import { WhenAlreadyDefined } from '@/components/EngineValue/WhenAlreadyDefined'
|
||||
import { WhenAlreadyDefinedMulti } from '@/components/EngineValue/WhenAlreadyDefinedMulti'
|
||||
import { WhenApplicable } from '@/components/EngineValue/WhenApplicable'
|
||||
import { H2 } from '@/design-system/typography/heading'
|
||||
|
||||
|
@ -10,9 +11,17 @@ export default function Formulaire() {
|
|||
<>
|
||||
<H2>Profession</H2>
|
||||
<SimpleField dottedName="déclaration revenus PAMC . profession" />
|
||||
<SimpleField dottedName="déclaration revenus PAMC . statut" />
|
||||
|
||||
<WhenAlreadyDefined dottedName="déclaration revenus PAMC . profession">
|
||||
<SimpleField dottedName="déclaration revenus PAMC . statut" />
|
||||
</WhenAlreadyDefined>
|
||||
|
||||
<WhenAlreadyDefinedMulti
|
||||
dottedNames={[
|
||||
'déclaration revenus PAMC . profession',
|
||||
'déclaration revenus PAMC . statut',
|
||||
]}
|
||||
>
|
||||
<H2>Recettes</H2>
|
||||
<AssistantGoal dottedName="déclaration revenus PAMC . recettes brutes totales" />
|
||||
<AssistantGoal dottedName="déclaration revenus PAMC . revenus imposables" />
|
||||
|
@ -56,7 +65,7 @@ export default function Formulaire() {
|
|||
<H2>Revenus de remplacement</H2>
|
||||
<SimpleField dottedName="déclaration revenus PAMC . revenus de remplacement" />
|
||||
<AssistantGoal dottedName="déclaration revenus PAMC . revenus de remplacement . AJPA" />
|
||||
</WhenAlreadyDefined>
|
||||
</WhenAlreadyDefinedMulti>
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue