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

ajoute la variable UC et ajuste le design

parent c91549e2
Branches
Tags
1 merge request!211Petites modifications UI simulateur
Pipeline #13520 passed
...@@ -1139,7 +1139,9 @@ ...@@ -1139,7 +1139,9 @@
</div> </div>
</div> </div>
</div> </div>
coucou
<!--AJout de la variable niveau de vie-->
{#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 niveau_de_vie = {@const niveau_de_vie =
getCalculatedVariableNumberValue( getCalculatedVariableNumberValue(
...@@ -1148,12 +1150,33 @@ ...@@ -1148,12 +1150,33 @@
"niveau_de_vie", "niveau_de_vie",
populationId, populationId,
) ?? 0} ) ?? 0}
{@const unites_consommation =
getCalculatedVariableNumberValue(
situation,
valuesByCalculationNameByVariableName,
"unites_consommation",
populationId,
) ?? 0}
{#if unites_consommation !== 0}
<div class="border-t flex items-center justify-between text-gray-500">
<p class="border-t border-gray-400 ml-4">
Unités de consommation du ménage
</p>
<p class="text-sm mr-4">
÷ {unites_consommation}
</p>
</div>
{/if}
{#if niveau_de_vie !== 0} {#if niveau_de_vie !== 0}
<span class="text-xs"> <div class="border-t flex items-center justify-between text-gray-500">
{euroAmountFormatter(niveau_de_vie)} <p class="border-t border-gray-400 ml-4">Niveau de vie</p>
</span> <p class="text-sm mr-4 border-t border-gray-400 p-0.5">
= {euroAmountFormatter(niveau_de_vie)}
</p>
</div>
{/if} {/if}
{/each} {/each}
<!-- Choix d'affichage des montant nuls --> <!-- Choix d'affichage des montant nuls -->
<div <div
class="mx-6 mt-3 flex" class="mx-6 mt-3 flex"
......
...@@ -377,6 +377,7 @@ ...@@ -377,6 +377,7 @@
{situation} {situation}
{situationIndex} {situationIndex}
{variableSummaryByName} {variableSummaryByName}
{valuesByCalculationNameByVariableName}
{year} {year}
/> />
</div> </div>
......
...@@ -224,6 +224,7 @@ export const summaryCalculatedVariablesName = [ ...@@ -224,6 +224,7 @@ export const summaryCalculatedVariablesName = [
"plus_values_base_large", "plus_values_base_large",
"rente_viagere_titre_onereux_net", "rente_viagere_titre_onereux_net",
"rsa", "rsa",
"unites_consommation",
].concat( ].concat(
oilTypes.reduce((names: string[], name: string) => { oilTypes.reduce((names: string[], name: string) => {
names.push( names.push(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment