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

N'affiche pas le noeud de premier niveau pour les mainparameters

parent f8b5fa9e
No related branches found
No related tags found
1 merge request!307Arborescence des paramètres
...@@ -90,14 +90,14 @@ ...@@ -90,14 +90,14 @@
yield [bothChild, lawChild, revaluationChild, billChild] 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( const hasSameNameAsChild = Object.values(
bothFilteredParameter.children ?? [], bothFilteredParameter.children ?? [],
).some((child) => child.title === bothFilteredParameter.title) ).some((child) => child.title === bothFilteredParameter.title)
</script> </script>
<section> <section>
{#if !hasSameNameAsChild} {#if !hasSameNameAsChild && depth !== 0}
<div class="flex w-full items-end text-gray-600"> <div class="flex w-full items-end text-gray-600">
<button <button
aria-label={openChildrenParameters ? "fermer" : "ouvrir"} aria-label={openChildrenParameters ? "fermer" : "ouvrir"}
...@@ -120,7 +120,11 @@ ...@@ -120,7 +120,11 @@
{#if billParameter.children !== undefined} {#if billParameter.children !== undefined}
{#if openChildrenParameters} {#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]} {#each [...iterChildren(bothFilteredParameter, lawParameter, revaluationParameter, billParameter)] as [bothFilteredChild, lawChild, revaluationChild, billChild]}
<li> <li>
{#if billChild.class === ParameterClass.Node} {#if billChild.class === ParameterClass.Node}
......
...@@ -102,9 +102,9 @@ ...@@ -102,9 +102,9 @@
ParameterClass.Node 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 : depth === 0
? 'my-1 font-bold'
: depth === 1
? 'my-1' ? 'my-1'
: depth === 1
? 'my-1 font-bold'
: depth === 2 : depth === 2
? 'my-1 text-sm' ? 'my-1 text-sm'
: 'my-1 text-sm'}" : 'my-1 text-sm'}"
......
...@@ -297,12 +297,13 @@ ...@@ -297,12 +297,13 @@
{#each [...iterVariableRootParameters(bothRootParameterById, rootParameter, revaluationRootParameter, billRootParameter)] as [bothFilteredParameter, lawParameter, revaluationParameter, billParameter]} {#each [...iterVariableRootParameters(bothRootParameterById, rootParameter, revaluationRootParameter, billRootParameter)] as [bothFilteredParameter, lawParameter, revaluationParameter, billParameter]}
<li> <li>
{#if billParameter.class === ParameterClass.Node} {#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 <VariableReferredNodeParameter
{billParameter} {billParameter}
bothFilteredParameter={bothFilteredParameter as NodeParameter} bothFilteredParameter={bothFilteredParameter as NodeParameter}
budget={displayMode.budget} budget={displayMode.budget}
{date} {date}
depth={0} depth={1}
{displayMode} {displayMode}
hideNull hideNull
lawParameter={lawParameter as NodeParameter | undefined} lawParameter={lawParameter as NodeParameter | undefined}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment