From 5044bf165e4fb94f479e218cf1e429b3cb1221b3 Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr>
Date: Thu, 3 Apr 2025 17:18:43 +0200
Subject: [PATCH] N'affiche pas le noeud de premier niveau pour les
mainparameters
---
.../parameters/VariableReferredNodeParameter.svelte | 10 +++++++---
.../parameters/VariableReferredParameterHeader.svelte | 6 +++---
.../parameters/VariableReferredParameters.svelte | 3 ++-
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
index adda17be1..7cc76a4ed 100644
--- a/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
@@ -90,14 +90,14 @@
yield [bothChild, lawChild, revaluationChild, billChild]
}
}
- // Vérifie si le nœud parent a le même nom que le nœud enfant
+ // Vérifie si le nœud parent a le même nom que le nœud enfant afin de ne pas l'afficher (exemple du barème de l'IR)
const hasSameNameAsChild = Object.values(
bothFilteredParameter.children ?? [],
).some((child) => child.title === bothFilteredParameter.title)
</script>
<section>
- {#if !hasSameNameAsChild}
+ {#if !hasSameNameAsChild && depth !== 0}
<div class="flex w-full items-end text-gray-600">
<button
aria-label={openChildrenParameters ? "fermer" : "ouvrir"}
@@ -120,7 +120,11 @@
{#if billParameter.children !== undefined}
{#if openChildrenParameters}
- <ul class="ml-2 {hasSameNameAsChild ? '' : 'border-l-2 pl-0.5'}">
+ <ul
+ class="ml-2 {depth === 0 || hasSameNameAsChild
+ ? ''
+ : 'border-l-2 pl-0.5'}"
+ >
{#each [...iterChildren(bothFilteredParameter, lawParameter, revaluationParameter, billParameter)] as [bothFilteredChild, lawChild, revaluationChild, billChild]}
<li>
{#if billChild.class === ParameterClass.Node}
diff --git a/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte
index 06364eead..2807ff52d 100644
--- a/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte
@@ -100,11 +100,11 @@
onenterViewport={() => (isElementInViewport = true)}
class="mr-4 font-serif text-le-gris-dispositif-dark {parameter.class !==
ParameterClass.Node
- ? 'w-full rounded-t-md bg-gray-100 pt-1 italic'
+ ? 'w-full rounded-t-md bg-gray-100 pt-1 italic'
: depth === 0
- ? 'my-1 font-bold'
+ ? 'my-1'
: depth === 1
- ? 'my-1 '
+ ? 'my-1 font-bold'
: depth === 2
? 'my-1 text-sm'
: 'my-1 text-sm'}"
diff --git a/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
index 85e7429cb..9658597dd 100644
--- a/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
@@ -297,12 +297,13 @@
{#each [...iterVariableRootParameters(bothRootParameterById, rootParameter, revaluationRootParameter, billRootParameter)] as [bothFilteredParameter, lawParameter, revaluationParameter, billParameter]}
<li>
{#if billParameter.class === ParameterClass.Node}
+ <!--Depth passée à 1, pour que le noeud de niveau 1 soit affiché (en raison du filtre dans variableReferredNodeParameter qui cache tous les noeuds de niveau 0 pour les main parameters)-->
<VariableReferredNodeParameter
{billParameter}
bothFilteredParameter={bothFilteredParameter as NodeParameter}
budget={displayMode.budget}
{date}
- depth={0}
+ depth={1}
{displayMode}
hideNull
lawParameter={lawParameter as NodeParameter | undefined}
--
GitLab