From 44bfaa8912037f729321b16e61ce338c68c22a66 Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr>
Date: Wed, 26 Feb 2025 14:56:12 +0100
Subject: [PATCH] =?UTF-8?q?Ajoute=20les=20composant=20variables=20de=20typ?=
=?UTF-8?q?e=20param=C3=A8tres=20dans=20parameters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../parameters}/VariableReferredNodeParameter.svelte | 8 ++++----
.../parameters}/VariableReferredParameterHeader.svelte | 0
.../parameters}/VariableReferredParameters.svelte | 8 ++++----
.../parameters}/VariableReferredScaleAtInstant.svelte | 4 ++--
.../parameters}/VariableReferredScaleParameter.svelte | 4 ++--
.../parameters}/VariableReferredValueEdit.svelte | 0
.../parameters}/VariableReferredValueParameter.svelte | 6 +++---
.../parameters}/VariableReferredValueView.svelte | 0
src/routes/+page.svelte | 2 +-
.../variables/[variable]/parameters/[date]/+page.svelte | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredNodeParameter.svelte (89%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredParameterHeader.svelte (100%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredParameters.svelte (96%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredScaleAtInstant.svelte (98%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredScaleParameter.svelte (98%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredValueEdit.svelte (100%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredValueParameter.svelte (97%)
rename src/lib/components/{variables => legislation_view/parameters}/VariableReferredValueView.svelte (100%)
diff --git a/src/lib/components/variables/VariableReferredNodeParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
similarity index 89%
rename from src/lib/components/variables/VariableReferredNodeParameter.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
index 1b9f2f293..b9ae5c800 100644
--- a/src/lib/components/variables/VariableReferredNodeParameter.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
- import VariableReferredNodeParameter from "./VariableReferredNodeParameter.svelte"
+ import VariableReferredNodeParameter from "$lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte"
import {
ParameterClass,
type NodeParameter,
@@ -8,9 +8,9 @@
type ValueParameter,
} from "@openfisca/json-model"
- import VariableReferredParameterHeader from "./VariableReferredParameterHeader.svelte"
- import VariableReferredScaleParameter from "./VariableReferredScaleParameter.svelte"
- import VariableReferredValueParameter from "./VariableReferredValueParameter.svelte"
+ import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte"
+ import VariableReferredScaleParameter from "$lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte"
+ import VariableReferredValueParameter from "$lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte"
import type { DisplayMode } from "$lib/displays"
diff --git a/src/lib/components/variables/VariableReferredParameterHeader.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte
similarity index 100%
rename from src/lib/components/variables/VariableReferredParameterHeader.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte
diff --git a/src/lib/components/variables/VariableReferredParameters.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
similarity index 96%
rename from src/lib/components/variables/VariableReferredParameters.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
index d454c249b..a265d0cc1 100644
--- a/src/lib/components/variables/VariableReferredParameters.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte
@@ -11,10 +11,10 @@
type ValueParameter,
} from "@openfisca/json-model"
- import VariableHeader from "./VariableHeader.svelte"
- import VariableReferredNodeParameter from "./VariableReferredNodeParameter.svelte"
- import VariableReferredScaleParameter from "./VariableReferredScaleParameter.svelte"
- import VariableReferredValueParameter from "./VariableReferredValueParameter.svelte"
+ import VariableHeader from "../../variables/VariableHeader.svelte"
+ import VariableReferredNodeParameter from "$lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte"
+ import VariableReferredScaleParameter from "$lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte"
+ import VariableReferredValueParameter from "$lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte"
import {
decompositionCoreByName,
diff --git a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte b/src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte
similarity index 98%
rename from src/lib/components/variables/VariableReferredScaleAtInstant.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte
index bd0e9f69e..ef7b667dd 100644
--- a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte
@@ -24,8 +24,8 @@
} from "@openfisca/json-model"
import { createEventDispatcher } from "svelte"
- import VariableReferredValueEdit from "$lib/components/variables/VariableReferredValueEdit.svelte"
- import VariableReferredValueView from "$lib/components/variables/VariableReferredValueView.svelte"
+ import VariableReferredValueEdit from "$lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte"
+ import VariableReferredValueView from "$lib/components/legislation_view/parameters/VariableReferredValueView.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import {
asAmountBracketAtInstant,
diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte
similarity index 98%
rename from src/lib/components/variables/VariableReferredScaleParameter.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte
index 23f692d2c..48a760cbd 100644
--- a/src/lib/components/variables/VariableReferredScaleParameter.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte
@@ -18,8 +18,8 @@
import LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte"
import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte"
import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte"
- import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
- import VariableReferredScaleAtInstant from "$lib/components/variables/VariableReferredScaleAtInstant.svelte"
+ import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte"
+ import VariableReferredScaleAtInstant from "$lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte"
import type { DisplayMode } from "$lib/displays"
import {
trackLawEditParameterArticles,
diff --git a/src/lib/components/variables/VariableReferredValueEdit.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte
similarity index 100%
rename from src/lib/components/variables/VariableReferredValueEdit.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte
diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte
similarity index 97%
rename from src/lib/components/variables/VariableReferredValueParameter.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte
index df94cac05..a236340e2 100644
--- a/src/lib/components/variables/VariableReferredValueParameter.svelte
+++ b/src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte
@@ -26,9 +26,9 @@
import LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte"
import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte"
import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte"
- import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
- import VariableReferredValueEdit from "$lib/components/variables/VariableReferredValueEdit.svelte"
- import VariableReferredValueView from "$lib/components/variables/VariableReferredValueView.svelte"
+ import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte"
+ import VariableReferredValueEdit from "$lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte"
+ import VariableReferredValueView from "$lib/components/legislation_view/parameters/VariableReferredValueView.svelte"
import type { DisplayMode } from "$lib/displays"
import {
trackLawEditParameterArticles,
diff --git a/src/lib/components/variables/VariableReferredValueView.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueView.svelte
similarity index 100%
rename from src/lib/components/variables/VariableReferredValueView.svelte
rename to src/lib/components/legislation_view/parameters/VariableReferredValueView.svelte
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index fc9adc45d..3e609ea71 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -46,7 +46,7 @@
import TestCaseView from "$lib/components/test_cases/TestCaseView.svelte"
import TestCaseSimulationSharingModal from "$lib/components/TestCaseSimulationSharingModal.svelte"
import VariableDetail from "$lib/components/variables/VariableDetail.svelte"
- import VariableReferredParameters from "$lib/components/variables/VariableReferredParameters.svelte"
+ import VariableReferredParameters from "$lib/components/legislation_view/parameters/VariableReferredParameters.svelte"
import VariableValueChange from "$lib/components/variables/VariableValueChange.svelte"
import LegislationPerimeterTree from "$lib/components/welcome_views/LegislationPerimeterTree.svelte"
import WithoutBudgetCard from "$lib/components/budget/WithoutBudgetCard.svelte"
diff --git a/src/routes/variables/[variable]/parameters/[date]/+page.svelte b/src/routes/variables/[variable]/parameters/[date]/+page.svelte
index 59f36b024..44482ac1e 100644
--- a/src/routes/variables/[variable]/parameters/[date]/+page.svelte
+++ b/src/routes/variables/[variable]/parameters/[date]/+page.svelte
@@ -2,7 +2,7 @@
import { setContext } from "svelte"
import { page } from "$app/stores"
- import VariableReferredParameters from "$lib/components/variables/VariableReferredParameters.svelte"
+ import VariableReferredParameters from "$lib/components/legislation_view/parameters/VariableReferredParameters.svelte"
import { waterfalls } from "$lib/decompositions"
import type { DisplayMode } from "$lib/displays"
import publicConfig from "$lib/public_config"
--
GitLab