From 84237a70a15b37244000967ab9103c2de5253a51 Mon Sep 17 00:00:00 2001 From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr> Date: Wed, 26 Feb 2025 16:58:37 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20derniers=20dossiers=20et=20d=C3=A9placeme?= =?UTF-8?q?nts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/{ => impacts_view}/SourcesMethodTooltip.svelte | 0 src/lib/components/{ => impacts_view}/ValueChange.svelte | 0 src/lib/components/impacts_view/VariableValueChange.svelte | 2 +- .../impacts_view/budget_view/BudgetDetailView.svelte | 4 ++-- .../impacts_view/budget_view/GagnantsPerdantsView.svelte | 4 ++-- .../test_cases_view/test_case_selected/OilSpendingBill.svelte | 2 +- .../test_cases_view/test_case_selected/PaySlipView.svelte | 2 +- .../test_cases_view/test_case_selected/TestCaseView.svelte | 3 +-- .../test_case_selected/edition_mode/VariableInput.svelte | 2 +- .../test_case_selected/graph/TestCaseGraph.svelte | 2 +- .../{ => legislation_view}/ModificationsPanel.svelte | 2 +- .../components/{ => legislation_view}/ReformsChanges.svelte | 0 .../variables/details_modal/VariableDetail.svelte | 2 +- .../variables/details_modal/VariableDetailBudget.svelte | 2 +- src/routes/+page.svelte | 2 +- src/routes/accueil/+page.svelte | 2 +- 16 files changed, 15 insertions(+), 16 deletions(-) rename src/lib/components/{ => impacts_view}/SourcesMethodTooltip.svelte (100%) rename src/lib/components/{ => impacts_view}/ValueChange.svelte (100%) rename src/lib/components/{ => legislation_view}/ModificationsPanel.svelte (99%) rename src/lib/components/{ => legislation_view}/ReformsChanges.svelte (100%) diff --git a/src/lib/components/SourcesMethodTooltip.svelte b/src/lib/components/impacts_view/SourcesMethodTooltip.svelte similarity index 100% rename from src/lib/components/SourcesMethodTooltip.svelte rename to src/lib/components/impacts_view/SourcesMethodTooltip.svelte diff --git a/src/lib/components/ValueChange.svelte b/src/lib/components/impacts_view/ValueChange.svelte similarity index 100% rename from src/lib/components/ValueChange.svelte rename to src/lib/components/impacts_view/ValueChange.svelte diff --git a/src/lib/components/impacts_view/VariableValueChange.svelte b/src/lib/components/impacts_view/VariableValueChange.svelte index 312e180d9..089b50249 100644 --- a/src/lib/components/impacts_view/VariableValueChange.svelte +++ b/src/lib/components/impacts_view/VariableValueChange.svelte @@ -1,5 +1,5 @@ <script lang="ts"> - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import type { EvaluationByName } from "$lib/decompositions" import { billName, date, revaluationName, shared } from "$lib/shared.svelte" import { getUnitAtDate } from "$lib/units" diff --git a/src/lib/components/impacts_view/budget_view/BudgetDetailView.svelte b/src/lib/components/impacts_view/budget_view/BudgetDetailView.svelte index 4f3f34d8c..21d5605b9 100644 --- a/src/lib/components/impacts_view/budget_view/BudgetDetailView.svelte +++ b/src/lib/components/impacts_view/budget_view/BudgetDetailView.svelte @@ -12,9 +12,9 @@ import PictoBudgetDecileIr from "$lib/components/ui_transverse_components/pictos/PictoBudgetDecileIr.svelte" import PictoBudgetDecileIrFoyer from "$lib/components/ui_transverse_components/pictos/PictoBudgetDecileIrFoyer.svelte" import PictoBudgetEtatIr from "$lib/components/ui_transverse_components/pictos/PictoBudgetEtatIr.svelte" - import SourcesMethodTooltip from "$lib/components/SourcesMethodTooltip.svelte" + import SourcesMethodTooltip from "$lib/components/impacts_view/SourcesMethodTooltip.svelte" import Tooltip from "$lib/components/ui_transverse_components/Tooltip.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import type { DisplayMode } from "$lib/displays" import { yearPLF } from "$lib/shared.svelte" import { removeNegativeZero } from "$lib/values" diff --git a/src/lib/components/impacts_view/budget_view/GagnantsPerdantsView.svelte b/src/lib/components/impacts_view/budget_view/GagnantsPerdantsView.svelte index a900f6b53..462fd05e5 100644 --- a/src/lib/components/impacts_view/budget_view/GagnantsPerdantsView.svelte +++ b/src/lib/components/impacts_view/budget_view/GagnantsPerdantsView.svelte @@ -1,9 +1,9 @@ <script lang="ts"> import type { BudgetSimulation } from "$lib/budgets" import PictoBudgetGagnantsPerdants from "$lib/components/ui_transverse_components/pictos/PictoBudgetGagnantsPerdants.svelte" - import SourcesMethodTooltip from "$lib/components/SourcesMethodTooltip.svelte" + import SourcesMethodTooltip from "$lib/components/impacts_view/SourcesMethodTooltip.svelte" import Tooltip from "$lib/components/ui_transverse_components/Tooltip.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import ValueChangeGagnantsPerdants from "$lib/components/impacts_view/budget_view/ValueChangeGagnantsPerdants.svelte" import type { DisplayMode } from "$lib/displays" import type { BudgetVariable } from "$lib/variables" diff --git a/src/lib/components/impacts_view/test_cases_view/test_case_selected/OilSpendingBill.svelte b/src/lib/components/impacts_view/test_cases_view/test_case_selected/OilSpendingBill.svelte index 0b828bc70..7e263a5d1 100644 --- a/src/lib/components/impacts_view/test_cases_view/test_case_selected/OilSpendingBill.svelte +++ b/src/lib/components/impacts_view/test_cases_view/test_case_selected/OilSpendingBill.svelte @@ -7,7 +7,7 @@ calculationNames, type CalculationName, } from "$lib/calculations.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import { entityByKey } from "$lib/entities" import publicConfig from "$lib/public_config" import { getSituationVariableValue, type Situation } from "$lib/situations" diff --git a/src/lib/components/impacts_view/test_cases_view/test_case_selected/PaySlipView.svelte b/src/lib/components/impacts_view/test_cases_view/test_case_selected/PaySlipView.svelte index 19e9330bb..fc44777c8 100644 --- a/src/lib/components/impacts_view/test_cases_view/test_case_selected/PaySlipView.svelte +++ b/src/lib/components/impacts_view/test_cases_view/test_case_selected/PaySlipView.svelte @@ -5,7 +5,7 @@ import OilSpendingBill from "$lib/components/impacts_view/test_cases_view/test_case_selected/OilSpendingBill.svelte" import TestCaseGraph from "$lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraph.svelte" import Tooltip from "$lib/components/ui_transverse_components/Tooltip.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import VariableValueChange from "$lib/components/impacts_view/VariableValueChange.svelte" import { isNullVariableValueByCalculationName, diff --git a/src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseView.svelte b/src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseView.svelte index f15d3dfd6..01e834480 100644 --- a/src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseView.svelte +++ b/src/lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseView.svelte @@ -1,6 +1,5 @@ <script lang="ts"> - import SourcesMethodTooltip from "$lib/components/SourcesMethodTooltip.svelte" - + import SourcesMethodTooltip from "$lib/components/impacts_view/SourcesMethodTooltip.svelte" import TestCaseSummary from "$lib/components/impacts_view/test_cases_view/test_case_selected/TestCaseSummary.svelte" import PaySlipView from "$lib/components/impacts_view/test_cases_view/test_case_selected/PaySlipView.svelte" import { waterfalls } from "$lib/decompositions" diff --git a/src/lib/components/impacts_view/test_cases_view/test_case_selected/edition_mode/VariableInput.svelte b/src/lib/components/impacts_view/test_cases_view/test_case_selected/edition_mode/VariableInput.svelte index 05473e16d..5f15e4555 100644 --- a/src/lib/components/impacts_view/test_cases_view/test_case_selected/edition_mode/VariableInput.svelte +++ b/src/lib/components/impacts_view/test_cases_view/test_case_selected/edition_mode/VariableInput.svelte @@ -6,7 +6,7 @@ import { requestAllTestCasesCalculations } from "$lib/calculations.svelte" import Autocomplete from "$lib/components/impacts_view/test_cases_view/test_case_selected/edition_mode/Autocomplete.svelte" import Tooltip from "$lib/components/ui_transverse_components/Tooltip.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import { entityByKey } from "$lib/entities" import publicConfig from "$lib/public_config" import { diff --git a/src/lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraph.svelte b/src/lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraph.svelte index 477bd275f..7dc069f1e 100644 --- a/src/lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraph.svelte +++ b/src/lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraph.svelte @@ -33,7 +33,7 @@ import type { GraphDomain } from "$lib/components/ui_transverse_components/piece_of_cake/types" import TestCaseGraphXlsxExport from "$lib/components/impacts_view/test_cases_view/test_case_selected/graph/TestCaseGraphXlsxExport.svelte" import Tooltip from "$lib/components/ui_transverse_components/Tooltip.svelte" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import { buildVisibleDecompositionsForGraph, type EvaluationByName, diff --git a/src/lib/components/ModificationsPanel.svelte b/src/lib/components/legislation_view/ModificationsPanel.svelte similarity index 99% rename from src/lib/components/ModificationsPanel.svelte rename to src/lib/components/legislation_view/ModificationsPanel.svelte index 8568c5ab7..7d32f4d8a 100644 --- a/src/lib/components/ModificationsPanel.svelte +++ b/src/lib/components/legislation_view/ModificationsPanel.svelte @@ -7,7 +7,7 @@ requestAllTestCasesCalculations, } from "$lib/calculations.svelte" import PersistentPopover from "$lib/components/ui_transverse_components/PersistentPopover.svelte" - import ReformsChanges from "$lib/components/ReformsChanges.svelte" + import ReformsChanges from "$lib/components/legislation_view/ReformsChanges.svelte" import { buildDecompositionByNameFromCore, type DecompositionByName, diff --git a/src/lib/components/ReformsChanges.svelte b/src/lib/components/legislation_view/ReformsChanges.svelte similarity index 100% rename from src/lib/components/ReformsChanges.svelte rename to src/lib/components/legislation_view/ReformsChanges.svelte diff --git a/src/lib/components/legislation_view/variables/details_modal/VariableDetail.svelte b/src/lib/components/legislation_view/variables/details_modal/VariableDetail.svelte index 12e739bb1..b9041793b 100644 --- a/src/lib/components/legislation_view/variables/details_modal/VariableDetail.svelte +++ b/src/lib/components/legislation_view/variables/details_modal/VariableDetail.svelte @@ -11,7 +11,7 @@ import Accordion from "$lib/components/ui_transverse_components/accordion/Accordion.svelte" import AccordionItem from "$lib/components/ui_transverse_components/accordion/AccordionItem.svelte" import PictoBudgetEtat from "$lib/components/ui_transverse_components/pictos/PictoBudgetEtat.svelte" - import TestCaseFilters from "$lib/components/test_cases/TestCaseFilters.svelte" + import TestCaseFilters from "$lib/components/impacts_view/test_cases_view/test_cases_library/TestCaseFilters.svelte" import TestCasePictos from "$lib/components/impacts_view/test_cases_view/test_case_selected/TestCasePictos.svelte" import VariableDetailBudget from "$lib/components/legislation_view/variables/details_modal/VariableDetailBudget.svelte" import VariableValueChange from "$lib/components/impacts_view/VariableValueChange.svelte" diff --git a/src/lib/components/legislation_view/variables/details_modal/VariableDetailBudget.svelte b/src/lib/components/legislation_view/variables/details_modal/VariableDetailBudget.svelte index 8404377cd..91ede505b 100644 --- a/src/lib/components/legislation_view/variables/details_modal/VariableDetailBudget.svelte +++ b/src/lib/components/legislation_view/variables/details_modal/VariableDetailBudget.svelte @@ -3,7 +3,7 @@ import type { Writable } from "svelte/store" import type { BudgetSimulation } from "$lib/budgets" - import ValueChange from "$lib/components/ValueChange.svelte" + import ValueChange from "$lib/components/impacts_view/ValueChange.svelte" import { type BudgetVariable, budgetVariableNameByVariableName, diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index ba116ae2a..eceb4f013 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -32,7 +32,7 @@ import BudgetLayout from "$lib/components/impacts_view/budget_view/BudgetLayout.svelte" import BudgetConnexionModal from "$lib/components/impacts_view/budget_view/BudgetConnexionModal.svelte" import BudgetSimulationSharingModal from "$lib/components/impacts_view/budget_view/BudgetSimulationSharingModal.svelte" - import ModificationsPanel from "$lib/components/ModificationsPanel.svelte" + import ModificationsPanel from "$lib/components/legislation_view/ModificationsPanel.svelte" import PlfVariablesListIntro from "$lib/components/welcome_views/PlfVariablesListIntro.svelte" import SkeletonLoaderBudget from "$lib/components/impacts_view/budget_view/SkeletonLoaderBudget.svelte" import StaticAggregates from "$lib/components/impacts_view/budget_view/StaticAggregates.svelte" diff --git a/src/routes/accueil/+page.svelte b/src/routes/accueil/+page.svelte index 0633c984a..e406bd0b0 100644 --- a/src/routes/accueil/+page.svelte +++ b/src/routes/accueil/+page.svelte @@ -13,7 +13,7 @@ import PictoOpenFisca from "$lib/components/ui_transverse_components/pictos/PictoOpenFisca.svelte" import PlfVariablesListIntro from "$lib/components/welcome_views/PlfVariablesListIntro.svelte" import WelcomeSearch from "$lib/components/ui_transverse_components/search/WelcomeSearch.svelte" - import TestCaseSelectModal from "$lib/components/test_cases/TestCaseSelectModal.svelte" + import TestCaseSelectModal from "$lib/components/impacts_view/test_cases_view/test_cases_library/TestCaseSelectModal.svelte" import AnchorTitle from "$lib/components/ui_transverse_components/AnchorTitle.svelte" import Footer from "$lib/components/Footer.svelte" import VariableDetail from "$lib/components/legislation_view/variables/details_modal/VariableDetail.svelte" -- GitLab