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

Retire les boutons "foyer" et "budget" de la page sans dispositifs...

Retire les boutons "foyer" et "budget" de la page sans dispositifs sélectionnés. Ajout du dispositif du RSA
parent 57d6ecdf
Branches
Tags
1 merge request!143Remplace décile par dixième
Pipeline #8859 passed
...@@ -658,58 +658,32 @@ ...@@ -658,58 +658,32 @@
{ {
title: "Impôt sur le revenu", title: "Impôt sur le revenu",
icon: "picto-impot-sur-le-revenu.png", icon: "picto-impot-sur-le-revenu.png",
foyer: {
budget: undefined,
parametersVariableName: "irpp_economique",
},
budget: {
budget: true,
parametersVariableName: "irpp_economique", parametersVariableName: "irpp_economique",
}, },
},
{ {
title: "Contribution sociale généralisée - CSG", title: "Contribution sociale généralisée - CSG",
icon: "picto-csg.png", icon: "picto-csg.png",
foyer: {
budget: undefined,
parametersVariableName: "csg_imposable_salaire", parametersVariableName: "csg_imposable_salaire",
}, },
budget: {
budget: true,
parametersVariableName: "csg_imposable_salaire",
},
},
{ {
title: "Prime de partage de la valeur", title: "Prime de partage de la valeur",
icon: "illustration-pepa.png", icon: "illustration-pepa.png",
foyer: {
mobileLaw: true,
budget: undefined,
parametersVariableName: "prime_partage_valeur_exoneree", parametersVariableName: "prime_partage_valeur_exoneree",
testCasesIndex: [3, 4],
waterfallName: "brut_to_super_brut",
}, },
{
title: "Revenu de solidarité active",
icon: "illustration-rsa.png",
parametersVariableName: "rsa",
}, },
{ {
title: "Taxes sur les carburants", title: "Taxes sur les carburants",
icon: "illustration-ticpe.png", icon: "illustration-ticpe.png",
foyer: {
mobileLaw: true,
budget: undefined,
parametersVariableName: "essence_sp95_e10_ticpe", parametersVariableName: "essence_sp95_e10_ticpe",
testCasesIndex: [15],
},
}, },
{ {
title: "Exonération TO-DE", title: "Exonération TO-DE",
icon: "illustration-exoneration-tode.png", icon: "illustration-exoneration-tode.png",
foyer: {
mobileLaw: true,
budget: undefined,
parametersVariableName: "exoneration_cotisations_employeur_tode", parametersVariableName: "exoneration_cotisations_employeur_tode",
testCasesIndex: [13, 14],
waterfallName: "brut_to_super_brut",
},
}, },
] ]
...@@ -867,7 +841,7 @@ ...@@ -867,7 +841,7 @@
<!-- DESKTOP - Modifications en cours --> <!-- DESKTOP - Modifications en cours -->
<div class="hidden md:block"> <div class="hidden md:block">
<button <button
class="mx-4 flex h-8 grow-0 items-center rounded-md bg-le-jaune px-2 py-1 text-sm sm:text-xs 2xl:text-sm uppercase text-black shadow-md hover:bg-le-jaune-dark hover:text-white focus:outline-none md:mx-0" class="mx-4 flex h-8 grow-0 items-center rounded-md bg-le-jaune px-2 py-1 text-sm uppercase text-black shadow-md hover:bg-le-jaune-dark hover:text-white focus:outline-none sm:text-xs md:mx-0 2xl:text-sm"
class:!bg-gray-200={Object.keys($parametricReform).length === 0} class:!bg-gray-200={Object.keys($parametricReform).length === 0}
class:!text-gray-500={Object.keys($parametricReform).length === class:!text-gray-500={Object.keys($parametricReform).length ===
0} 0}
...@@ -988,13 +962,21 @@ ...@@ -988,13 +962,21 @@
<div class="w-full overflow-y-scroll bg-white p-4"> <div class="w-full overflow-y-scroll bg-white p-4">
<!-- Vue par défaut - choix de dispositifs --> <!-- Vue par défaut - choix de dispositifs -->
{#if displayMode.parametersVariableName === undefined && displayMode.parameterName === undefined} {#if displayMode.parametersVariableName === undefined && displayMode.parameterName === undefined}
<div class="grid grid-cols-1 gap-8 text-center sm:grid-cols-2"> <div class="grid grid-cols-1 gap-4 text-center sm:grid-cols-2">
{#each dispositifsTypes as dispositifType} {#each dispositifsTypes as dispositifType}
<a
class="flex gap-2 rounded-lg border bg-white p-3 shadow-md hover:bg-gray-200"
href={newSimulationUrl({
...displayMode,
parametersVariableName:
dispositifType.parametersVariableName,
})}
>
<div <div
class="flex flex-col items-center justify-between gap-4 rounded-lg border bg-white p-5 shadow-md" class="flex w-full flex-col items-center justify-center"
> >
<h3 <h3
class="mb-2 text-xl font-bold sm:text-base lg:text-xl 2xl:text-xl" class="mb-2 text-center text-lg font-bold sm:text-base lg:text-xl 2xl:text-xl"
> >
{dispositifType.title} {dispositifType.title}
</h3> </h3>
...@@ -1003,34 +985,8 @@ ...@@ -1003,34 +985,8 @@
src={dispositifType.icon} src={dispositifType.icon}
alt="Pictogramme représentant une feuille d'impôt" alt="Pictogramme représentant une feuille d'impôt"
/> />
<div class="flex gap-2 md:flex-col">
{#if dispositifType.foyer !== undefined}
<a
class="inline-flex justify-between gap-2 rounded-lg border-2 border-le-bleu p-2 px-5 text-center text-base uppercase tracking-wide text-le-bleu shadow-md hover:border-blue-900 hover:bg-blue-900 hover:text-white"
href={newSimulationUrl({
...displayMode,
...dispositifType.foyer,
tab: "dispositif",
})}
>
<span>Foyer</span>
<PictoFemme />
</a>
{/if}
{#if dispositifType.budget !== undefined}
<a
class="inline-flex justify-between gap-2 rounded-lg border-2 border-le-bleu p-2 px-5 text-center text-base uppercase tracking-wide text-le-bleu shadow-md hover:border-blue-900 hover:bg-blue-900 hover:text-white"
href={newSimulationUrl({
...displayMode,
...dispositifType.budget,
})}
>
<span>Budget</span>
<PictoEtat />
</a>
{/if}
</div>
</div> </div>
</a>
{/each} {/each}
</div> </div>
<!-- Vue modification de la loi --> <!-- Vue modification de la loi -->
......
static/illustration-rsa.png

12.3 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment