From aa418a0c6530326055765d4fcf4ea81594613778 Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr>
Date: Thu, 3 Apr 2025 17:58:36 +0200
Subject: [PATCH] =?UTF-8?q?Referme=20le=20premier=20niveau=20des=20param?=
=?UTF-8?q?=C3=A8tres=20de=20la=20section=20Autres=20param=C3=A8tres=20et?=
=?UTF-8?q?=20harmonise=20le=20style?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../parameters/VariableReferredNodeParameter.svelte | 10 ++++++++--
.../parameters/VariableReferredParameters.svelte | 13 ++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
index d2bee89b1..b517587ad 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 9658597dd..f4ad88912 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
--
GitLab