Set one PLF activation mode for all components

f3768441 · sandcha · 59794905 · f3768441 · f3768441 · f3768441
Commit f3768441 authored Mar 22, 2022 by sandcha
--- a/src/lib/components/budget/HistogramPane.svelte
+++ b/src/lib/components/budget/HistogramPane.svelte
@@ -17,10 +17,11 @@

  export let title: string | undefined = undefined
  export let description: string | undefined = undefined
-  export let year: string | undefined = undefined
+
  export let variablesToDraw: string[] | undefined = undefined
  export let dataJson: ApiResponse | undefined = undefined

+  export let year: string | undefined = undefined
  export let activatePlf: boolean | undefined = undefined
  //TODO Or use dataJson content and check if there is a dataJson.result.plf
  //but check default value at first display.
@@ -342,7 +343,7 @@
          (updatingHistogram == true) on reform calculation -->
      <Spinner />
    {:else}
-      <VerticalHistogram data={updateHistogram(dataJson)} />
+      <VerticalHistogram {activatePlf} data={updateHistogram(dataJson)} />
    {/if}
  </div>
  <div class="px-5 ">

--- a/src/lib/components/budget/histogram/Column.svelte
+++ b/src/lib/components/budget/histogram/Column.svelte
@@ -4,9 +4,6 @@
  const { data, xGet, y, yGet, yRange, xScale, yScale } =
    getContext("LayerCake")

-  const ACTIVATE_PLF = false
-  const LAWS_COUNT = ACTIVATE_PLF ? 3 : 2
-
  $: columnWidth = (d) => {
    const vals = $xGet(d)
    return Math.max(0, vals[1] - vals[0])
@@ -29,10 +26,12 @@
   */
  export let stroke = ""
  export let strokeWidth = 0
+  export let activatePlf: boolean | undefined = undefined

  const gray = "#CCD3E7"
  const red = "#ff6b6b"
  const yellow = "#ded500"
+  const LAWS_COUNT = activatePlf ? 3 : 2

  $: lawColor = (law) => {
    return law == "plf" ? red : law == "amendement" ? yellow : gray

--- a/src/lib/components/budget/histogram/VerticalHistogram.svelte
+++ b/src/lib/components/budget/histogram/VerticalHistogram.svelte
@@ -23,8 +23,9 @@
  // PROPERTIES & FUNCTIONS
  // ----------------------

+  export let activatePlf: boolean | undefined = undefined
  export let data = undefined
-  let displayPlf: boolean = true
+
  let displayAmendement: boolean = true

  function getColumnsMaxValue(data): [number, number] {
@@ -41,7 +42,7 @@

      columnsValues.push(
        quantileY.base,
-        displayPlf ? plfValue : 0,
+        activatePlf ? plfValue : 0,
        displayAmendement ? amendementValue : 0,
      )
    })
@@ -65,7 +66,7 @@
      {data}
    >
      <ScaledSvg>
-        <Column />
+        <Column {activatePlf} />
      </ScaledSvg>

      <Html>