Skip to main content
Sign in
Snippets Groups Projects
Commit f3236576 authored by Toufic Batache's avatar Toufic Batache
Browse files

Merge branch 'bugfix--salary_slider__test_case_impact' into 'master'

bugfix: Barre de changement du salaire (impact cas type) ne disparait plus lorsqu'elle est mise à 0

See merge request leximpact/leximpact-socio-fiscal-ui!134
parents f38d4f3a 27606e43
Branches
Tags
1 merge request!134bugfix: Barre de changement du salaire (impact cas type) ne disparait plus lorsqu'elle est mise à 0
Pipeline #8448 failed
...@@ -512,9 +512,9 @@ ...@@ -512,9 +512,9 @@
populationId, populationId,
)} )}
<div class="my-2 grow">
{#if !childrenId.includes(populationId) || (childrenId.includes(populationId) && activite !== "inactif")} {#if !childrenId.includes(populationId) || (childrenId.includes(populationId) && activite !== "inactif")}
<div class=""> <div class="my-2 lg:basis-1/2 lg:grow-0 flex-1">
<div>
{#if personsCount > 1} {#if personsCount > 1}
<div class="text-xs text-gray-400"> <div class="text-xs text-gray-400">
{populationId} {populationId}
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
<span> <span>
{#if contrat_de_travail_type === "cdd"} {#if contrat_de_travail_type === "cdd"}
<abbr <abbr
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm" class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm inline-block"
title="Contrat à durée déterminée" title="Contrat à durée déterminée"
>{#if contrat_duree_determinee_type === "contrat_usage"} >{#if contrat_duree_determinee_type === "contrat_usage"}
CDD d'usage CDD d'usage
...@@ -548,41 +548,40 @@ ...@@ -548,41 +548,40 @@
</abbr> </abbr>
{:else if contrat_de_travail_type === "cdi"} {:else if contrat_de_travail_type === "cdi"}
<abbr <abbr
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm" class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm inline-block"
title="Contrat à durée indéterminée">CDI</abbr title="Contrat à durée indéterminée">CDI</abbr
> >
{:else if contrat_de_travail_type === "ctt"} {:else if contrat_de_travail_type === "ctt"}
<abbr <abbr
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm" class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm inline-block"
title="Contrat de travail temporaire">CTT</abbr title="Contrat de travail temporaire">CTT</abbr
> >
{/if} {/if}
{#if salarie_regime_alsace_moselle} {#if salarie_regime_alsace_moselle}
<span <span
class="my-1 rounded-2xl bg-emerald-300 py-1 px-2 text-xs text-gray-800 shadow-sm" class="my-1 rounded-2xl bg-emerald-300 py-1 px-2 text-xs text-gray-800 shadow-sm inline-block"
>Régime&nbsp;Alsace&#8209;Moselle</span >Régime&nbsp;Alsace&#8209;Moselle</span
> >
{/if} {/if}
{#if apprenti} {#if apprenti}
<span <span
class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm" class="my-1 rounded-2xl bg-blue-200 py-1 px-2 text-xs text-gray-800 shadow-sm inline-block"
>Apprenti</span >Apprenti</span
> >
{/if} {/if}
{#if choix_exoneration_cotisations_employeur_agricole} {#if choix_exoneration_cotisations_employeur_agricole}
<abbr <abbr
class="m-1 rounded-2xl bg-violet-200 py-1 px-2 text-sm text-gray-800 shadow-sm" class="m-1 rounded-2xl bg-violet-200 py-1 px-2 text-sm text-gray-800 shadow-sm inline-block"
title="Travailleur saisonnier exonéré de cotisations patronales de sécurité sociale" title="Travailleur saisonnier exonéré de cotisations patronales de sécurité sociale"
>TO-DE</abbr >TO-DE</abbr
> >
{/if} {/if}
</span> </span>
</div> </div>
{/if}
<!--Salaire de base--> <!--Salaire de base-->
{#if getVariableNumberValue(situation, slider.name, populationId) !== 0} <div class="mb-2">
<div class="mb-2 flex">
<div class="flex flex-wrap items-end"> <div class="flex flex-wrap items-end">
<div class="mr-2"> <div class="mr-2">
<span class="text-xl font-bold text-gray-800"> <span class="text-xl font-bold text-gray-800">
...@@ -722,7 +721,6 @@ ...@@ -722,7 +721,6 @@
</div> </div>
</div> </div>
</div> </div>
{/if}
<!--Encadré entreprise--> <!--Encadré entreprise-->
{#if activite === "actif"} {#if activite === "actif"}
...@@ -759,6 +757,7 @@ ...@@ -759,6 +757,7 @@
{/if} {/if}
{/if} {/if}
</div> </div>
{/if}
{/each} {/each}
</div> </div>
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment