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

Place le RSA à côté des pictos visages qui constituent la famille

parent 1fe5392f
Branches
Tags
1 merge request!87Resolve "Faire apparaître les revenus du capital et de rente et RSA dans les étiquettes cas types"
Pipeline #3897 passed
......@@ -275,8 +275,8 @@
{/if}
</div>
<div class="flex items-start justify-between space-x-6">
<!-- <h1 class="font-bold text-gray-600 truncate">{situation.title}</h1> -->
<div class="flex items-end">
<!-- État des lieux de la famille -->
<div class="flex items-center">
<!-- Territoire -->
<!-- <div class="flex">
<PictoArbreMetropole />
......@@ -337,6 +337,26 @@
</div>
{/if}
{/each}
<!-- Tag liés à la famille -->
<div>
<!--Affiche le RSA-->
{#each Object.keys(familySituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const rsa =
getCalculatedVariableNumberValue(
situation,
valuesByCalculationNameByVariableName,
"rsa",
populationId,
) ?? 0}
{#if rsa !== 0}
<abbr
class="m-1 rounded-2xl bg-violet-200 py-1 px-2 text-sm text-gray-800 shadow-sm"
title="Ce cas type touche le revenu de solidarité active">RSA</abbr
>
{/if}
{/each}
</div>
</div>
{#if mode === "view"}
......@@ -421,13 +441,12 @@
</div>
{/if}
<div class="flex gap-2">
<div class="text-lg font-bold">
{generateActivityLabel(situation, populationId)}
</div>
<div class="">
<span class="mr-1 text-lg font-bold">
{generateActivityLabel(situation, populationId)}</span
>
<!-- Tags -->
<div>
<span>
{#if contrat_de_travail_type === "cdd"}
<abbr
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm"
......@@ -457,7 +476,7 @@
>Apprenti</span
>
{/if}
</div>
</span>
</div>
{/if}
<!--Salaire de base-->
......@@ -542,25 +561,6 @@
</div>
{/each}
<!-- Familles -->
{#each Object.keys(familySituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const rsa =
getCalculatedVariableNumberValue(
situation,
valuesByCalculationNameByVariableName,
"rsa",
populationId,
) ?? 0}
<div class="my-2">
{#if rsa !== 0}
<abbr
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm"
title="Revenu de solidarité active">RSA</abbr
>
{/if}
</div>
{/each}
<!-- Foyers fiscaux -->
{#each Object.keys(taxableHouseholdSituation).sort( (populationId1, populationId2) => populationId1.localeCompare(populationId2), ) as populationId}
{@const assiette_csg_revenus_capital =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment