renaming varibles

Author: cjonesof

src/lib/components/data-vis/axis/Ticks.svelte

@@ -11,23 +11,24 @@
     axisFunction,
     values,
     numberOfTicks,
-    baseline,
-    setMax,
+    minTick,
+    maxTick,
     orientation,
     yearsInput,
     generateTicksNum,
+    yearFormating,
   } = $props();
 
   $inspect(ticksArray);
 
-  function generateTicks(data, numTicks, baseline, setTick) {
+  function generateTicks(data, numTicks, minTick, maxTick) {
     let minVal =
-      baseline !== null
-        ? new Decimal(baseline)
+      minTick !== null
+        ? new Decimal(minTick)
         : Decimal.min(...data.map((val) => new Decimal(val)));
     let maxVal =
-      setTick !== null
-        ? new Decimal(setTick)
+      maxTick !== null
+        ? new Decimal(maxTick)
         : Decimal.max(...data.map((val) => new Decimal(val)));
     let rangeVal = maxVal.minus(minVal);
 
@@ -63,7 +64,7 @@
 
   numberOfTicks = tickCount(chartWidth);
 
-  ticksArray = generateTicks(values, numberOfTicks, baseline, setMax);
+  ticksArray = generateTicks(values, numberOfTicks, minTick, maxTick);
   let yearTicks = yearsInput ? yearsFormat(ticksArray) : [];
 </script>
 
@@ -103,7 +104,7 @@
             : "start"}
         fill="black"
       >
-        {yearsInput ? yearTicks[index] : `${prefix}${tick}${suffix}`}
+        {yearsInput ? yearTicks[index] : "${prefix{tick}{suffix}"}
       </text>
     </g>
   {/each}

src/wrappers/components/data-vis/axis/TicksWrapper.svelte

@@ -251,15 +251,15 @@
       {
         name: "prefix",
         category: "customisations",
-        value: "number of",
+        value: "",
       },
       {
         name: "suffix",
         category: "customisations",
-        value: "%",
+        value: "",
       },
-      { name: "baseline", category: "customisations", value: 0 },
-      { name: "setMax", category: "customisations", value: 100 },
+      { name: "minTick", category: "formatting", value: 0 },
+      { name: "maxTick", category: "formatting", value: 100 },
       { name: "generateTicksNum", category: "customisations", value: false },
       { name: "yearsInput", category: "customisations", value: false },
       {
@@ -280,6 +280,13 @@
         name: "orientation",
         category: "customisations",
       },
+      {
+        name: "yearFormating",
+        category: "formatting",
+        functionElements: {
+          functionAsString: `function yearsFormat(ticks) {return ticks.map((tick) => "FY {tick % 100}-{(tick % 100) + 1}");}`,
+        },
+      },
     ]),
   );
 
@@ -356,7 +363,7 @@
       "scaleLinear()": scaleLinear(),
       "scaleLog()": scaleLog(),
       "scaleTime()": scaleTime(),
-    }[getValue("yScaleType")]
+    }[getValue("xyScaleType")]
       .domain([Math.min(...ticksArray), Math.max(...ticksArray)])
       .range([
         getValue("svgHeight") -
@@ -375,11 +382,16 @@
     orientation?.axis === "x" ? xFunction : yFunction,
   );
 
+  let yearFormating = $derived(function yearsFormat(ticks) {
+    return ticks;
+  });
+
   let derivedParametersObject = $derived({
     chartWidth,
     chartHeight,
     orientation,
     axisFunction,
+    yearFormating,
   });
   /**
    * DONOTTOUCH *