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

Merge branch 'fix-ui-fonctionnaires' into 'master'

Ajoute le salaire + prime des fonctionnaires

See merge request !221
parents 171d6ff1 22cb93f1
No related branches found
No related tags found
1 merge request!221Ajoute le salaire + prime des fonctionnaires
Pipeline #13996 passed
......@@ -740,6 +740,11 @@
"salaire_de_base",
populationId,
)}
{@const traitement_indiciaire_brut = getVariableValue(
situation,
"traitement_indiciaire_brut",
populationId,
)}
{@const secteur_activite_employeur = getVariableValue(
situation,
"secteur_activite_employeur",
......@@ -856,7 +861,7 @@
</span>
</div>
<!--Salaire de base-->
<!--Revenu principal (salaire de base, retraite, etc)-->
<div class="flex flex-col flex-wrap md:flex-row md:items-center">
<div class="mr-2">
{#if allocation_retour_emploi}
......@@ -914,6 +919,57 @@
).toFixed(2),
)} <span class="text-sm font-normal">Smic</span>
</span>
{:else if traitement_indiciaire_brut}
<span class="text-lg font-bold text-gray-800 2xl:text-xl">
{euroAmountFormatter(
(getVariableNumberValue(
situation,
"traitement_indiciaire_brut",
populationId,
) ?? 0) +
(getVariableNumberValue(
situation,
"primes_fonction_publique",
populationId,
) ?? 0),
)}
<abbr
class="text-xs font-normal"
title="Ce montant correspond à la somme du traitement indiciaire brut ({euroAmountFormatter(
getVariableNumberValue(
situation,
'traitement_indiciaire_brut',
populationId,
) ?? 0,
)}) et des primes de la fonction publique ({euroAmountFormatter(
getVariableNumberValue(
situation,
'primes_fonction_publique',
populationId,
) ?? 0,
)}) du cas type"
>TIB et primes/an
</abbr>
</span>
<span
class="text-nowrap text-base text-black bg-gray-300 py-0.5 px-2 rounded-full font-bold"
>
{parseFloat(
(
((getVariableNumberValue(
situation,
"traitement_indiciaire_brut",
populationId,
) ?? 0) +
(getVariableNumberValue(
situation,
"primes_fonction_publique",
populationId,
) ?? 0)) /
(smicValue.value * 12)
).toFixed(1),
)} <span class="text-sm font-normal">Smic</span>
</span>
{:else if salaire_de_base !== 0}
<span class="text-lg font-bold text-gray-800 2xl:text-xl">
{euroAmountFormatter(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment