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

suite

parent fab31a28
No related branches found
No related tags found
1 merge request!141UI variables liées
Pipeline #8760 passed
......@@ -134,7 +134,8 @@
<!--MONTANT REVENU DISPONIBLE-->
<div class="flex justify-between gap-4">
<div class="pt-3">
<div class="flex flex-col">
<div class="py-3">
<!--MONTANT DISPOSITIF SELECTIONNE-->
{#if displayMode.parametersVariableName !== undefined}
<!-- Note: A reform variable is always more complete than a variable before reform. -->
......@@ -147,7 +148,7 @@
displayMode.parametersVariableName
]}
{#if variableSummary !== undefined}
<div class="mb-6 flex-col">
<div class="flex-col">
<p class="mb-3 text-xl font-bold">
{variableSummary.short_label ??
variableSummary.label ??
......@@ -166,12 +167,15 @@
{/if}
{/if}
</div>
<div class="border-l-2 border-gray-300 pl-2">
<!--Dispositifs additionnées ex : "dont CSG déductible"-->
{#if displayMode.parametersVariableName !== undefined}
<!-- Note: A reform variable is always more complete than a variable before reform. -->
{@const variableSummary =
$billName === undefined
? variableSummaryByName[displayMode.parametersVariableName]
? variableSummaryByName[
displayMode.parametersVariableName
]
: variableSummaryByNameByReformName[$billName][
displayMode.parametersVariableName
]}
......@@ -186,8 +190,6 @@
),
)}
{#if $showNulls || !linkedVariablesValueByCalculationName.every(isNullVariableValueByCalculationName)}
<section>
<h4 class="font-semibold">Dispositifs additionnés</h4>
<ul>
{#each variableSummary.linked_added_variables as linkedVariableName, index}
{@const linkedVariableValueByCalculationName =
......@@ -199,19 +201,20 @@
: variableSummaryByNameByReformName[
$billName
][linkedVariableName]}
<li>
<li class="flex">
dont&nbsp;
<a
class="cursor-pointer text-base hover:underline"
href={newSimulationUrl({
...displayMode,
parametersVariableName: linkedVariableName,
parametersVariableName:
linkedVariableName,
})}
data-sveltekit-noscroll
>{linkedVariableSummary.short_label ??
linkedVariableSummary.label ??
linkedVariableName}</a
>&nbsp;:
>&nbsp;:&#160;
<VariableValueChange
{evaluationByName}
name={linkedVariableName}
......@@ -221,9 +224,24 @@
{/if}
{/each}
</ul>
</section>
{/if}
{/if}
{/if}
{/if}
</div>
</div>
<div class="border-l-2 border-gray-200">
{#if displayMode.parametersVariableName !== undefined}
<!-- Note: A reform variable is always more complete than a variable before reform. -->
{@const variableSummary =
$billName === undefined
? variableSummaryByName[
displayMode.parametersVariableName
]
: variableSummaryByNameByReformName[$billName][
displayMode.parametersVariableName
]}
{#if variableSummary !== undefined}
{#if variableSummary.linked_other_variables !== undefined}
{@const linkedVariablesValueByCalculationName =
variableSummary.linked_other_variables.map((name) =>
......@@ -254,7 +272,8 @@
class="cursor-pointer text-base hover:underline"
href={newSimulationUrl({
...displayMode,
parametersVariableName: linkedVariableName,
parametersVariableName:
linkedVariableName,
})}
data-sveltekit-noscroll
>{linkedVariableSummary.short_label ??
......@@ -301,7 +320,8 @@
class="cursor-pointer text-base hover:underline"
href={newSimulationUrl({
...displayMode,
parametersVariableName: linkedVariableName,
parametersVariableName:
linkedVariableName,
})}
data-sveltekit-noscroll
>{linkedVariableSummary.short_label ??
......@@ -322,6 +342,7 @@
{/if}
{/if}
{/if}
</div>
<!--TICKET DE CARBURANT-->
{#if displayMode.parametersVariableName === "taxes_tous_carburants" || (displayMode.parametersVariableName !== undefined && oilTypes.some( (oilType) => displayMode.parametersVariableName?.includes(oilType), ))}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment