Skip to content
Snippets Groups Projects
Unverified Commit 70621824 authored by Dorine Lambinet's avatar Dorine Lambinet
Browse files

Cache la variable niveau de vie si le waterfall est celui de l'employeur et...

Cache la variable niveau de vie si le waterfall est celui de l'employeur et prévois de retirer la variable revenu dispo après taxes qui est faux
parent db3e331b
No related branches found
No related tags found
1 merge request!211Petites modifications UI simulateur
Pipeline #13554 passed
......@@ -1142,6 +1142,7 @@
</div>
<!--AJout de la variable niveau de vie-->
{#if $waterfall.name === "brut_to_disponible"}
<div class="relative flex flex-col">
{#if Object.values($calculationByName).filter((calculation) => calculation.running && (calculation.situationIndex === undefined || calculation.situationIndex === situationIndex)).length > 0}
<div class="absolute inset-0 z-10 bg-le-jaune bg-opacity-20" />
......@@ -1161,8 +1162,17 @@
"unites_consommation",
populationId,
) ?? 0}
{@const taxes_tous_carburants =
getCalculatedVariableNumberValue(
situation,
valuesByCalculationNameByVariableName,
"taxes_tous_carburants",
populationId,
) ?? 0}
{#if unites_consommation !== 0}
<div class="border-t flex items-center justify-between text-gray-500">
<div
class="border-t flex items-center justify-between text-gray-500"
>
<a
href={newSimulationUrl({
...displayMode,
......@@ -1186,7 +1196,9 @@
</div>
{/if}
{#if niveau_de_vie !== 0}
<div class="border-t flex items-center justify-between text-gray-500">
<div
class="border-t flex items-center justify-between text-gray-500"
>
<a
href={newSimulationUrl({
...displayMode,
......@@ -1208,8 +1220,38 @@
</p>
</div>
{/if}
{#if taxes_tous_carburants !== 0}
<div
class="border-t pt-4 flex items-center justify-between text-black font-serif cursor-pointer overflow-x-hidden text-ellipsis text-base hover:z-20 hover:overflow-x-visible hover:bg-white hover:text-le-gris-dispositif hover:underline"
>
<a
href={newSimulationUrl({
...displayMode,
parametersVariableName: "taxes_tous_carburants",
})}
class="ml-4 hover:underline"
>
Taxes carburants
</a>
<p
class="flex gap-2 text-base mr-4 text-black font-bold font-sans"
>
- <ValueChange
unitName={"currency-EUR"}
valueByCalculationName={getCalculatedVariableValueByCalculationName(
situation,
valuesByCalculationNameByVariableName,
variableSummaryByName["taxes_tous_carburants"],
populationId,
)}
/>
</p>
</div>
{/if}
{/each}
</div>
{/if}
<!-- Choix d'affichage des montant nuls -->
<div
......
......@@ -242,6 +242,7 @@ export const summaryCalculatedVariablesName = [
export const otherCalculatedVariablesName = [
"niveau_de_vie",
"unites_consommation",
"taxes_tous_carburants",
]
export const variableSummaryByName =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment