diff --git a/src/lib/components/BudgetConnexionModal.svelte b/src/lib/components/BudgetConnexionModal.svelte
index 24c1995a7e8fccf3497c35b2d79eb797d1dcff1b..5bc8170fd50d8c774e59d430ccd322a2d71592f8 100644
--- a/src/lib/components/BudgetConnexionModal.svelte
+++ b/src/lib/components/BudgetConnexionModal.svelte
@@ -168,44 +168,46 @@
</a>
</div>
</div>
- <div class="mt-10 flex flex-col items-center">
- <h2 class="w-full text-left text-xl font-bold">
- Consultez la liste des simulations budgétaires déjà
- disponibles :
- </h2>
- <table class="w-full text-sm mt-2">
- {#each cachedSimulations as cachedSimulation}
- <tr
- class="even:bg-white even:bg-opacity-30 odd:bg-gray-200"
- >
- <td class="pl-3 pr-10 py-2 text-start"
- >{cachedSimulation.date}</td
+ {#if cachedSimulations !== undefined && cachedSimulations.length > 0}
+ <div class="mt-10 flex flex-col items-center">
+ <h2 class="w-full text-left text-xl font-bold">
+ Consultez la liste des simulations budgétaires déjà
+ disponibles :
+ </h2>
+ <table class="w-full text-sm mt-2">
+ {#each cachedSimulations as cachedSimulation}
+ <tr
+ class="even:bg-white even:bg-opacity-30 odd:bg-gray-200"
>
- <td class="py-2 text-start font-bold font-serif"
- >{cachedSimulation.title}</td
- >
- <td class="pl-10 pr-3 py-2 text-end"
- ><a
- href="/simulations_budget/{cachedSimulation.hash}"
- class="underline text-gray-600"
- >Voir cette simulation</a
- ></td
- >
- </tr>
- {/each}
- </table>
- <a
- class="mt-2 flex items-center gap-2 py-2 px-5 hover:bg-gray-200 active:bg-gray-300 rounded-md underline text-gray-600 text-sm font-bold tracking-[0.085em] uppercase"
- data-sveltekit-reload
- href="/"
- title="Voir toutes les simulations"
- >
- Voir toutes les simulations<iconify-icon
- class="ml-2 align-[-0.25rem] text-xl"
- icon="ri-arrow-right-line"
- />
- </a>
- </div>
+ <td class="pl-3 pr-10 py-2 text-start"
+ >{cachedSimulation.date}</td
+ >
+ <td class="py-2 text-start font-bold font-serif"
+ >{cachedSimulation.title}</td
+ >
+ <td class="pl-10 pr-3 py-2 text-end"
+ ><a
+ href="/simulations_budget/{cachedSimulation.hash}"
+ class="underline text-gray-600"
+ >Voir cette simulation</a
+ ></td
+ >
+ </tr>
+ {/each}
+ </table>
+ <a
+ class="mt-2 flex items-center gap-2 py-2 px-5 hover:bg-gray-200 active:bg-gray-300 rounded-md underline text-gray-600 text-sm font-bold tracking-[0.085em] uppercase"
+ data-sveltekit-reload
+ href="/"
+ title="Voir toutes les simulations"
+ >
+ Voir toutes les simulations<iconify-icon
+ class="ml-2 align-[-0.25rem] text-xl"
+ icon="ri-arrow-right-line"
+ />
+ </a>
+ </div>
+ {/if}
</div>
</DialogDescription>
</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 89ecc9b900a08d39e93174168e915c350b12b4ac..0181d007adff4f07eb84c07988de993678d2a130 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -306,7 +306,7 @@
quantile_base_variable: ["rfr"],
quantile_compare_variables: ["irpp"],
quantile_nb: 10,
- // plf: 2024,
+ plf: 2024,
}
: {
amendement: budgetParametricReform,
@@ -322,7 +322,7 @@
"csg_imposable_salaire",
],
quantile_nb: 10,
- // plf: 2024,
+ plf: 2024,
},
null,
2,
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 81017da25f663d42a84be1d6ee23262a08c76474..cb5eacc6845e6a27e5522937f1b80bbdaf6742c0 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -312,128 +312,172 @@
.start()
}
- // TODO tgb: remove this
+ // TODO tgb: fix this when api changes
$: if (user === undefined) {
- console.log("replaced")
- $budgetSimulation = {
- result: {
- base: {
- state_budget: {
- rfr: 1141166010364.9878,
- irpp: -84198987029.96613,
- },
- quantiles: [
- {
- irpp_max: 1205.9132080078125,
- irpp_mean: 106.90776079980795,
- irpp_min: 0,
- irpp_sum: 357033036.8133356,
- count: 3339636.2821769714,
- quantile_num: 1,
- fraction: 0.1,
- },
- {
- irpp_max: 787.8517456054688,
- irpp_mean: 132.23992868572972,
- irpp_min: 0,
- irpp_sum: 441519184.4162087,
- count: 3338773.612510681,
- quantile_num: 2,
- fraction: 0.2,
- },
- {
- irpp_max: 694.7799072265625,
- irpp_mean: 176.71526607597514,
- irpp_min: -95,
- irpp_sum: 590097695.0551947,
- count: 3339257.0328445435,
- quantile_num: 3,
- fraction: 0.3,
- },
- {
- irpp_max: 646.0764770507812,
- irpp_mean: -27.312243370198726,
- irpp_min: -742,
- irpp_sum: -91165366.36509918,
- count: 3337893.747116089,
- quantile_num: 4,
- fraction: 0.4,
- },
- {
- irpp_max: 732.6367797851562,
- irpp_mean: -346.4191971591506,
- irpp_min: -1507,
- irpp_sum: -1156896952.5983489,
- count: 3339586.726387024,
- quantile_num: 5,
- fraction: 0.5,
- },
- {
- irpp_max: 705.9767456054688,
- irpp_mean: -771.3320849231815,
- irpp_min: -3124,
- irpp_sum: -2575853166.281143,
- count: 3339486.605873108,
- quantile_num: 6,
- fraction: 0.6,
- },
- {
- irpp_max: 626.471435546875,
- irpp_mean: -1544.5756883978845,
- irpp_min: -5407,
- irpp_sum: -5157190056.149861,
- count: 3338904.072418213,
- quantile_num: 7,
- fraction: 0.7,
- },
- {
- irpp_max: 639.8275146484375,
- irpp_mean: -2696.538456758809,
- irpp_min: -8422,
- irpp_sum: -9003908666.682943,
- count: 3339061.842086792,
- quantile_num: 8,
- fraction: 0.8,
- },
- {
- irpp_max: 2021.9317626953125,
- irpp_mean: -4744.9083619954945,
- irpp_min: -13666,
- irpp_sum: -15844180696.774479,
- count: 3339196.3528060913,
- quantile_num: 9,
- fraction: 0.9,
+ if (
+ $budgetSimulationCache !== undefined &&
+ deepEqual($budgetSimulationCache?.parametricReform, $parametricReform)
+ ) {
+ console.log("showing cached budget simulation")
+ $budgetSimulation = $budgetSimulationCache.budgetSimulation
+ } else {
+ console.log("showing fake budget simulation")
+ $budgetSimulation = {
+ result: {
+ base: {
+ state_budget: {
+ rfr: 1141166010364.9878,
+ irpp: -84198987029.96613,
},
- {
- irpp_max: 15176.8203125,
- irpp_mean: -15500.926367717611,
- irpp_min: -968522,
- irpp_sum: -51758442041.398994,
- count: 3339054.764442444,
- quantile_num: 10,
- fraction: 1,
+ quantiles: [
+ {
+ irpp_max: 1205.9132080078125,
+ irpp_mean: 106.90776079980795,
+ irpp_min: 0,
+ irpp_sum: 357033036.8133356,
+ rfr_max: 4930.01220703125,
+ rfr_mean: 1399.2841849688537,
+ rfr_min: 0,
+ rfr_sum: 4673100233.198416,
+ count: 3339636.2821769714,
+ quantile_num: 1,
+ fraction: 0.1,
+ },
+ {
+ irpp_max: 787.8517456054688,
+ irpp_mean: 132.23992868572972,
+ irpp_min: 0,
+ irpp_sum: 441519184.4162087,
+ rfr_max: 11357.0029296875,
+ rfr_mean: 8376.618875474238,
+ rfr_min: 4930.9990234375,
+ rfr_sum: 27967634063.49228,
+ count: 3338773.612510681,
+ quantile_num: 2,
+ fraction: 0.2,
+ },
+ {
+ irpp_max: 694.7799072265625,
+ irpp_mean: 176.71526607597514,
+ irpp_min: -95,
+ irpp_sum: 590097695.0551947,
+ rfr_max: 16581.705078125,
+ rfr_mean: 13943.609470937565,
+ rfr_min: 11357.2294921875,
+ rfr_sum: 46561295989.06605,
+ count: 3339257.0328445435,
+ quantile_num: 3,
+ fraction: 0.3,
+ },
+ {
+ irpp_max: 646.0764770507812,
+ irpp_mean: -27.312243370198726,
+ irpp_min: -742,
+ irpp_sum: -91165366.36509918,
+ rfr_max: 20640.91796875,
+ rfr_mean: 18600.66068102042,
+ rfr_min: 16582,
+ rfr_sum: 62087028979.40615,
+ count: 3337893.747116089,
+ quantile_num: 4,
+ fraction: 0.4,
+ },
+ {
+ irpp_max: 732.6367797851562,
+ irpp_mean: -346.4191971591506,
+ irpp_min: -1507,
+ irpp_sum: -1156896952.5983489,
+ rfr_max: 25428.14453125,
+ rfr_mean: 22909.216515526234,
+ rfr_min: 20641,
+ rfr_sum: 76507315387.1778,
+ count: 3339586.726387024,
+ quantile_num: 5,
+ fraction: 0.5,
+ },
+ {
+ irpp_max: 705.9767456054688,
+ irpp_mean: -771.3320849231815,
+ irpp_min: -3124,
+ irpp_sum: -2575853166.281143,
+ rfr_max: 31768.51171875,
+ rfr_mean: 28596.52621441492,
+ rfr_min: 25428.701171875,
+ rfr_sum: 95497716267.53784,
+ count: 3339486.605873108,
+ quantile_num: 6,
+ fraction: 0.6,
+ },
+ {
+ irpp_max: 626.471435546875,
+ irpp_mean: -1544.5756883978845,
+ irpp_min: -5407,
+ irpp_sum: -5157190056.149861,
+ rfr_max: 39383.71875,
+ rfr_mean: 35431.90982272599,
+ rfr_min: 31769.994140625,
+ rfr_sum: 118303748000.65468,
+ count: 3338904.072418213,
+ quantile_num: 7,
+ fraction: 0.7,
+ },
+ {
+ irpp_max: 639.8275146484375,
+ irpp_mean: -2696.538456758809,
+ irpp_min: -8422,
+ irpp_sum: -9003908666.682943,
+ rfr_max: 49484.77734375,
+ rfr_mean: 44133.02085030298,
+ rfr_min: 39384.33203125,
+ rfr_sum: 147362885897.26746,
+ count: 3339061.842086792,
+ quantile_num: 8,
+ fraction: 0.8,
+ },
+ {
+ irpp_max: 2021.9317626953125,
+ irpp_mean: -4744.9083619954945,
+ irpp_min: -13666,
+ irpp_sum: -15844180696.774479,
+ rfr_max: 66955.0859375,
+ rfr_mean: 57118.00797096622,
+ rfr_min: 49487,
+ rfr_sum: 190728243896.19965,
+ count: 3339196.3528060913,
+ quantile_num: 9,
+ fraction: 0.9,
+ },
+ {
+ irpp_max: 15176.8203125,
+ irpp_mean: -15500.926367717611,
+ irpp_min: -968522,
+ irpp_sum: -51758442041.398994,
+ rfr_max: 2104588,
+ rfr_mean: 111252.15603135424,
+ rfr_min: 66956.421875,
+ rfr_sum: 371477041650.98755,
+ count: 3339054.764442444,
+ quantile_num: 10,
+ fraction: 1,
+ },
+ ],
+ compare_before_after: {
+ total: 33390851,
+ non_zero_before: 33390851,
+ non_zero_after: 33390851,
+ above_after: 0,
+ lower_after: 33390851,
+ neutral: 0,
+ tolerance_factor_used: 0.1,
+ weight_factor: 1,
},
- ],
- compare_before_after: {
- total: 33390851,
- non_zero_before: 33390851,
- non_zero_after: 33390851,
- above_after: 0,
- lower_after: 33390851,
- neutral: 0,
- tolerance_factor_used: 0.1,
- weight_factor: 1,
},
},
- },
- errors: [],
+ errors: [],
+ }
}
}
- $: if ($budgetSimulationCache !== undefined) {
- $budgetSimulation = $budgetSimulationCache.budgetSimulation
- }
-
$: isModificationsOpen = isUserModificationsOpen && modificationsCount > 0
$: loadParameter($searchParameterName)