diff --git a/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte index d2bee89b1d5fe6786a88dcadedbf573cf7e43110..b517587ad35711268ba77c781af88048afdbee1d 100644 --- a/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte @@ -14,14 +14,13 @@ import type { DisplayMode } from "$lib/displays" - let openChildrenParameters = $state(true) - interface Props { billParameter: NodeParameter bothFilteredParameter: NodeParameter budget: boolean | undefined date: string depth: number + isOtherParametersSection?: boolean displayMode: DisplayMode hideNull?: boolean lawParameter: NodeParameter | undefined @@ -40,8 +39,15 @@ lawParameter, name = undefined, revaluationParameter, + isOtherParametersSection = false, }: Props = $props() + let openChildrenParameters = $state(true) + + if (isOtherParametersSection) { + openChildrenParameters = false + } + function compareUsingOrder( order: string[], parameter1: Parameter, diff --git a/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte index 9658597dd4f567b4a1fdf03573cfa5b8ad459b1b..f4ad889124e1b3a35861a0a855e920c303202b1b 100644 --- a/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte @@ -146,7 +146,7 @@ ), ), ) - let openAllParameters = $state(false) + let openAllParameters = $state(true) </script> {#if billDecomposition !== undefined || billVariable !== undefined} @@ -275,24 +275,22 @@ {#if Object.keys(bothRootParameterById).length > 0} <button - class="mb-3 w-full border-b border-gray-300 py-1 pr-4 text-gray-600" + class=" w-full pr-4 pt-1 text-gray-600" onclick={() => (openAllParameters = !openAllParameters)} > - <div class="flex items-center"> + <div class="flex items-center font-serif"> <iconify-icon class="mr-1 align-[-0.2rem] text-xl" icon={openAllParameters ? "ri-arrow-down-s-line" : "ri-arrow-right-s-line"} ></iconify-icon> - <span class="tracking-wider" - >Autres paramètres affectant le dispositif</span - > + <span class="">Autres paramètres affectant le dispositif</span> </div> </button> {#if openAllParameters} - <section class="mb-3 ml-2 pb-3"> + <section class="mb-3 ml-2 border-l-2 pb-3 pl-0.5"> <ul> {#each [...iterVariableRootParameters(bothRootParameterById, rootParameter, revaluationRootParameter, billRootParameter)] as [bothFilteredParameter, lawParameter, revaluationParameter, billParameter]} <li> @@ -310,6 +308,7 @@ revaluationParameter={revaluationParameter as | NodeParameter | undefined} + isOtherParametersSection={true} /> {:else if billParameter.class === ParameterClass.Value} <VariableReferredValueParameter