Skip to content
Snippets Groups Projects
Commit 3a48d75a authored by benoit-cty's avatar benoit-cty
Browse files

Fix reload

parent 3836aa24
No related branches found
No related tags found
No related merge requests found
Pipeline #20699 failed
......@@ -80,23 +80,27 @@
let slider: Slider | undefined = $state(undefined)
const taxableHouseholdEntity = entityByKey[taxableHouseholdEntityKey]
let familySituation = $derived(situation[familyEntity.key_plural])
let familySituation = $derived(situation[familyEntity.key_plural!])
let childrenId = $derived(
Object.values(familySituation).reduce(
familySituation
? Object.values(familySituation).reduce(
(children: string[], family) => [
...children,
...((family[childrenKey] as string[] | undefined) ?? []),
...(((family as any)[childrenKey] as string[] | undefined) ?? []),
],
[],
),
)
: [],
)
let householdSituation = $derived(situation[householdEntity.key_plural])
let householdSituation = $derived(situation[householdEntity.key_plural!])
let personSituation = $derived(situation[personEntity.key_plural])
let personSituation = $derived(situation[personEntity.key_plural!])
let personsCount = $derived(Object.keys(personSituation).length)
let personsCount = $derived(
personSituation ? Object.keys(personSituation).length : 0,
)
run(() => {
slider = situation.sliders?.[0]
......@@ -120,15 +124,15 @@
let smicValue = $derived(smicLatestInstantValueCouple?.[1] as NumberValue)
let taxableHouseholdSituation = $derived(
situation[taxableHouseholdEntity.key_plural],
situation[taxableHouseholdEntity.key_plural!],
)
// Note: A reform variable is always more complete than a variable before reform.
let variableSummary = $derived(
billName === undefined
? variableSummaryByName[displayMode.parametersVariableName]
? variableSummaryByName[displayMode.parametersVariableName!]
: variableSummaryByNameByReformName[billName][
displayMode.parametersVariableName
displayMode.parametersVariableName!
],
)
......@@ -290,7 +294,7 @@
{#if mode !== "select" && situation.title !== undefined}
{@const situationDetails =
situation.linked_variables?.[displayMode.parametersVariableName]}
situation.linked_variables?.[displayMode.parametersVariableName!]}
{@const omitSlider = (obj: Situation) => {
const result = { ...obj }
if (result.slider !== undefined) {
......@@ -395,7 +399,7 @@
<PictoArbreMetropole />
</div> -->
{#each Object.keys(personSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(personSituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const activite = getVariableValue(situation, "activite", populationId)}
{@const handicap = getVariableValue(situation, "handicap", populationId)}
{#if !childrenId.includes(populationId)}
......@@ -419,7 +423,7 @@
{/if}
{/each}
{#each Object.keys(personSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(personSituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const date_naissance = getVariableValue(
situation,
"date_naissance",
......@@ -460,7 +464,7 @@
{/each}
<!-- Tag liés à la famille -->
<div>
{#each Object.keys(familySituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(familySituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const rsa =
getCalculatedVariableNumberValue(
situation,
......@@ -506,7 +510,7 @@
</div>
<!-- Ménages -->
{#each Object.keys(householdSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(householdSituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const loyer = getVariableNumberValue(situation, "loyer", populationId)}
{@const zone_apl =
getCalculatedVariableNumberValue(
......@@ -621,7 +625,7 @@
</div>
{/each}
<!-- Foyers fiscaux -->
{#each Object.keys(taxableHouseholdSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(taxableHouseholdSituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const assiette_csg_revenus_capital =
getCalculatedVariableNumberValue(
situation,
......@@ -729,7 +733,7 @@
>
<!-- Individus -->
{#each Object.keys(personSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{#each Object.keys(personSituation || {}).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const activite = getVariableValue(situation, "activite", populationId)}
{@const allocation_retour_emploi = getVariableValue(
situation,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment