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

Résoud problème alignement et renomme dernière date

parent 51f44eb3
No related branches found
No related tags found
1 merge request!99UI modale des articles de loi
Pipeline #5714 passed
...@@ -177,16 +177,10 @@ ...@@ -177,16 +177,10 @@
href="/parameters/{billParameter.name}" href="/parameters/{billParameter.name}"
target="_blank" target="_blank"
> >
<!--Remixicon.com - history-fill --> <Icon
<svg class="mr-1 inline-flex h-4 w-4"
aria-hidden="true" icon="ri-history-line"
class="mr-1 inline h-4 w-4 fill-current stroke-transparent text-gray-600" />Historique</a
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
><path
d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12h2c0 4.418 3.582 8 8 8s8-3.582 8-8-3.582-8-8-8C9.536 4 7.332 5.114 5.865 6.865L8 9H2V3l2.447 2.446C6.28 3.336 8.984 2 12 2zm1 5v4.585l3.243 3.243-1.415 1.415L11 12.413V7h2z"
/></svg
>Historique</a
> >
</div> </div>
</div> </div>
...@@ -197,22 +191,29 @@ ...@@ -197,22 +191,29 @@
{#if (billReferences !== undefined && billReferences.length > 0) || ["impot_revenu.bareme_ir_depuis_1945.bareme"].includes(billParameter.name)} {#if (billReferences !== undefined && billReferences.length > 0) || ["impot_revenu.bareme_ir_depuis_1945.bareme"].includes(billParameter.name)}
<!--Référence législative--> <!--Référence législative-->
<div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2"> <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
<p class="pb-2 text-sm"> <div>
Barème depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} <p class="pb-2 text-xs">
Barème en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]}&nbsp;:
</p> </p>
<ul class="text-xs"> </div>
<ul>
{#each billReferences as { href, note, title }} {#each billReferences as { href, note, title }}
<li class="text-sm"> <li class="text-xs">
{#if href === undefined}<p class="inline-flex items-center"> {#if href === undefined}<p class="text-left">
<Icon class="mr-1 h-4 w-4" icon="ri-file-text-line" />{title} <Icon
class="mr-1 inline-flex h-4 w-4"
icon="ri-file-text-line"
/>{title}
</p>{:else} </p>{:else}
<button <button
class="link inline-flex items-center" class="link text-left"
on:click={() => (isArticleModalOpen = true)} on:click={() => (isArticleModalOpen = true)}
title="Voir le paramètre dans l'article de loi" title="Voir le paramètre dans l'article de loi"
> >
<Icon class="mr-1 h-4 w-4" icon="ri-file-text-line" />{title ?? <Icon
"Source"} class="mr-1 inline-flex h-4 w-4"
icon="ri-file-text-line"
/>{title ?? "Source"}
</button> </button>
{/if} {/if}
{#if note} {#if note}
......
...@@ -202,28 +202,27 @@ ...@@ -202,28 +202,27 @@
{#if billReferences !== undefined && billReferences.length > 0} {#if billReferences !== undefined && billReferences.length > 0}
<div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2"> <div class="rounded-b bg-le-gris-dispositif-ultralight py-2 px-2">
<!--Date du paramètre--> <!--Date du paramètre-->
<p class="pb-2 text-sm"> <p class="pb-2 text-xs">
Valeur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]} Valeur en vigueur depuis le {billLatestInstantSplit[1]}/{billLatestInstantSplit[0]}&nbsp;:
</p> </p>
{#if (billLegalReferences ?? []).length > 0 || ["impot_revenu.calcul_impot_revenu.plaf_qf.general", "impot_revenu.calcul_impot_revenu.plaf_qf.celib", "impot_revenu.calcul_impot_revenu.plaf_qf.celib_enf", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond_veuf", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_celib", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_couple", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.taux", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv2", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.conj", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf2", "impot_revenu.calcul_revenus_imposables.abat_rni.enfant_marie.montant", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.isol"].includes(billParameter.name)} {#if (billLegalReferences ?? []).length > 0 || ["impot_revenu.calcul_impot_revenu.plaf_qf.general", "impot_revenu.calcul_impot_revenu.plaf_qf.celib", "impot_revenu.calcul_impot_revenu.plaf_qf.celib_enf", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond", "impot_revenu.calcul_impot_revenu.plaf_qf.reduc_postplafond_veuf", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.plaf_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuadMarReu", "impot_revenu.calcul_impot_revenu.plaf_qf.abat_dom.taux_GuyMay", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_celib", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.seuil_couple", "impot_revenu.calcul_impot_revenu.plaf_qf.decote.taux", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv2", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.conj", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.enf2", "impot_revenu.calcul_revenus_imposables.abat_rni.enfant_marie.montant", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.inv1", "impot_revenu.calcul_impot_revenu.plaf_qf.quotient_familial.isol"].includes(billParameter.name)}
<div class="mt-2"> <ul>
<span class="">
{#each billReferences as { href, note, title }} {#each billReferences as { href, note, title }}
<li class=" text-sm "> <li class="text-xs">
{#if href === undefined}<p class="inline-flex items-center"> {#if href === undefined}<p class="text-left">
<Icon <Icon
class="mr-1 h-4 w-4" class="mr-1 inline-flex h-4 w-4"
icon="ri-file-text-line" icon="ri-file-text-line"
/>{title} />{title}
</p>{:else} </p>{:else}
<button <button
class="link inline-flex items-center " class="link text-left"
on:click={() => (isArticleModalOpen = true)} on:click={() => (isArticleModalOpen = true)}
title="Voir le paramètre dans l'article de loi" title="Voir le paramètre dans l'article de loi"
> >
<Icon <Icon
class="mr-1 h-4 w-4" class="mr-1 inline-flex h-4 w-4"
icon="ri-file-text-line" icon="ri-file-text-line"
/>{title ?? "Référence législative sans titre"} />{title ?? "Référence législative sans titre"}
</button> </button>
...@@ -232,14 +231,13 @@ ...@@ -232,14 +231,13 @@
<p>{note}</p> <p>{note}</p>
{/if} {/if}
</li> </li>
{/each}</span {/each}
> </ul>
<ArticleModal <ArticleModal
{billLegalReferences} {billLegalReferences}
{billParameter} {billParameter}
bind:isOpen={isArticleModalOpen} bind:isOpen={isArticleModalOpen}
/> />
</div>
{/if} {/if}
</div> </div>
{/if} {/if}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment