Skip to content
Snippets Groups Projects
Commit f52db28f authored by Emmanuel Raviart's avatar Emmanuel Raviart
Browse files

Merge branch 'tag-PPV-PEPV' into 'master'

Tag ppv pepv

See merge request leximpact/leximpact-socio-fiscal-ui!94
parents 46531055 86ad68ff
No related branches found
No related tags found
1 merge request!94Tag ppv pepv
Pipeline #5096 passed
...@@ -49,8 +49,11 @@ ...@@ -49,8 +49,11 @@
{#if $billName !== undefined} {#if $billName !== undefined}
<div class="m-2 mb-4 lg:m-4"> <div class="m-2 mb-4 lg:m-4">
<h4 class="text-xs font-bold text-le-rouge-bill lg:text-sm"> <h4 class="text-xs font-bold text-le-rouge-bill lg:text-sm">
{reformMetadataByName[$billName].label}&nbsp;: Projet de loi du Gouvernement&nbsp;:
</h4> </h4>
<h5 class="text-sm">
{reformMetadataByName[$billName].label}&nbsp;:
</h5>
<ul class="list-inside"> <ul class="list-inside">
{#each Object.values(billChanges?.editable_processed_parameters ?? {}) as rootParameterChange} {#each Object.values(billChanges?.editable_processed_parameters ?? {}) as rootParameterChange}
{#each [...walkParametersChangeName(rootParameterChange)] as parameterName} {#each [...walkParametersChangeName(rootParameterChange)] as parameterName}
......
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</div> </div>
{#if legend} {#if legend}
<div class="ml-1 text-xs font-normal text-le-rouge-bill"> <div class="ml-1 text-xs font-normal text-le-rouge-bill">
(PLF/PLFSS) (Projet de loi)
</div> </div>
{/if} {/if}
</div> </div>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
<div <div
class="ml-1 self-center text-xs font-normal text-le-rouge-bill" class="ml-1 self-center text-xs font-normal text-le-rouge-bill"
> >
(PLF/PLFSS) (Projet de loi)
</div> </div>
{/if} {/if}
</div> </div>
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<div <div
class="ml-1 self-center text-xs font-normal text-le-rouge-bill" class="ml-1 self-center text-xs font-normal text-le-rouge-bill"
> >
(PLF/PLFSS) (Projet de loi)
</div> </div>
{/if} {/if}
</div> </div>
......
...@@ -444,6 +444,11 @@ ...@@ -444,6 +444,11 @@
"prime_partage_valeur", "prime_partage_valeur",
populationId, populationId,
)} )}
{@const prime_partage_valeur_exceptionnelle = getVariableValue(
situation,
"prime_partage_valeur_exceptionnelle",
populationId,
)}
<div class="my-2 "> <div class="my-2 ">
{#if !childrenId.includes(populationId) || (childrenId.includes(populationId) && activite !== "inactif")} {#if !childrenId.includes(populationId) || (childrenId.includes(populationId) && activite !== "inactif")}
...@@ -584,15 +589,36 @@ ...@@ -584,15 +589,36 @@
dont&nbsp;</span dont&nbsp;</span
>{euroAmountFormatter.format(prime_partage_valeur)} >{euroAmountFormatter.format(prime_partage_valeur)}
</span> </span>
<!--Prime de partage de la valeur (PPV) --> <!--Projet de loi n°19 : Prime de partage de la valeur (PPV) version pérenne -->
<span>
<span
class="my-1 rounded-2xl bg-le-rouge-bill py-0.5 px-2 text-xs text-white shadow-sm"
>
<abbr
class="text-xs"
title="Prime de partage de la valeur pérenne, du Projet de loi n°19"
>prime&nbsp;PPV pérenne</abbr
>
</span>
</span>
{/if}
{#if prime_partage_valeur_exceptionnelle !== 0}
<span class="text-base text-gray-800"
><span class="text-xs">
dont&nbsp;</span
>{euroAmountFormatter.format(
prime_partage_valeur_exceptionnelle,
)}
</span>
<!--Projet de loi n°19 : Prime de partage de la valeur (PPV) version exceptionnelle -->
<span> <span>
<span <span
class="my-1 rounded-2xl bg-le-rouge-bill py-0.5 px-2 text-xs text-white shadow-sm" class="my-1 rounded-2xl bg-le-rouge-bill py-0.5 px-2 text-xs text-white shadow-sm"
> >
<abbr <abbr
class="text-xs" class="text-xs"
title="Dispositif &quot;Prime de partage de la valeur&quot; appliqué" title="Prime de partage de la valeur exceptionnelle, du Projet de loi n°19"
>prime&nbsp;PPV</abbr >prime&nbsp;PPV exceptionnelle</abbr
> >
</span> </span>
</span> </span>
......
...@@ -884,22 +884,6 @@ ...@@ -884,22 +884,6 @@
class="h-[calc(100vh-10rem)] overflow-y-auto" class="h-[calc(100vh-10rem)] overflow-y-auto"
id="situation_color_code" id="situation_color_code"
> >
<div class="mx-2 mt-5 flex-col rounded text-xs">
<!--
<p class="mr-1 italic">Légende :</p>
<div class="flex-col">
<p class="mr-1 font-bold">Loi en vigueur</p>
<p
class="mr-1 text-le-rouge-bill font-bold"
title="en construction…"
>
PLF 2022
</p>
<p class="bg-le-jaune px-1">Votre réforme</p>
</div>
-->
</div>
<ReformsChanges {displayMode} /> <ReformsChanges {displayMode} />
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment