diff --git a/site/src/chart/components/GroupChart.tsx b/site/src/chart/components/GroupChart.tsx
index 4bc42cc..7a37bfd 100644
--- a/site/src/chart/components/GroupChart.tsx
+++ b/site/src/chart/components/GroupChart.tsx
@@ -10,21 +10,43 @@ type GroupProps = {
};
+
+
function GroupChart({ data }: GroupProps) {
const [isBar, setIsBar] = useState(true);
+ const [doStack, setDoStack] = useState(false);
const [series, setSeries] = useState({
- 'max': true,
- 'mean': false,
'min': false,
+ 'mean': false,
+ 'max': true,
});
+
+ const deltas = data.map((val) => {
+ const out = { ...val };
+ const deltaMinMean = (val["mean"] - (Number(series["min"])?val["min"]:0));
+ const deltaMeanMax = (val["max"] - (Number(series["mean"])?val["mean"]:(series["min"]?val["min"]:0)));
+ out["mean"] = deltaMinMean;
+ out["max"] = deltaMeanMax;
+ return out;
+ })
+ const formatLabel = (key:string)=>(value:number,didx:{dataIndex:number}):number => {
+ const idx= didx["dataIndex"]
+ return String(data[idx][key]);
+ }
+
const selectedSeries = Object.entries(series).filter(item => item[1] === true);
+
let seriesY = selectedSeries.map(item => {
return {
dataKey: item[0],
label: item[0],
- barLabel: (selectedSeries.length === 1)&&(data.length<20) ? ('value' as const) : undefined,
+ barLabel: (selectedSeries.length === 1) && (data.length < 20) ? ('value' as const) : undefined,
+ stack: doStack && isBar ? 'prices' : undefined,
+ valueFormatter: (doStack && isBar)? formatLabel(item[0]):(v:number)=>String(v)
}
});
+ console.log(seriesY)
+ console.log(doStack)
const chartSetting = {
yAxis: [{ label: 'Price ($)' }],
height: 400,
@@ -33,7 +55,7 @@ function GroupChart({ data }: GroupProps) {
return (
{isBar && }
- {!isBar &&}
-
+
)
};
diff --git a/site/src/chart/components/SettingChart.tsx b/site/src/chart/components/SettingChart.tsx
index 633da14..0a401bf 100644
--- a/site/src/chart/components/SettingChart.tsx
+++ b/site/src/chart/components/SettingChart.tsx
@@ -7,6 +7,8 @@ import Stack from '@mui/material/Stack';
import Divider from '@mui/material/Divider';
import RadioGroup from '@mui/material/RadioGroup';
import Radio from '@mui/material/Radio';
+import Switch from '@mui/material/Switch';
+
type tSeries = {
@@ -19,9 +21,12 @@ type CheckboxProps = {
setSeries: React.Dispatch>;
isBar: boolean;
setIsBar: React.Dispatch>
+ doStack: boolean;
+ setDoStack: React.Dispatch>
+
};
-function SettingChart({ series, setSeries, isBar, setIsBar }: CheckboxProps) {
+function SettingChart({ series, setSeries, isBar, setIsBar, doStack, setDoStack }: CheckboxProps) {
const handleChange = (event: React.ChangeEvent) => {
setSeries({
...series,
@@ -29,6 +34,10 @@ function SettingChart({ series, setSeries, isBar, setIsBar }: CheckboxProps) {
});
};
+ const changeDoStack =(event:React.ChangeEvent)=>{
+ setDoStack(event.target.checked)
+ }
+
const handleRadioButtonChange = (event: React.ChangeEvent) => {
setIsBar(event.target.value === "bar");
};
@@ -89,6 +98,17 @@ function SettingChart({ series, setSeries, isBar, setIsBar }: CheckboxProps) {
}
label="Min price"
/>
+
+
+ }
+ label="Do Stack"
+ />
)
diff --git a/site/src/data.tsx b/site/src/data.tsx
index e22995e..0b33408 100644
--- a/site/src/data.tsx
+++ b/site/src/data.tsx
@@ -173,8 +173,8 @@ type GroupedRamPrice =Array<{
id: number;
group: string | number;
min:number;
- max:number;
mean:number;
+ max:number;
}>;
const gropuedPrices = groupBycolumns.map((col) => {
@@ -184,9 +184,10 @@ const gropuedPrices = groupBycolumns.map((col) => {
out.push({
id: out.length + 1,
group: key,
- min: d3.min(prices) ?? 0,
- max: d3.max(prices) ?? 0,
mean: Math.round((d3.mean(prices) ?? 0)*1000)/1000,
+ max: d3.max(prices) ?? 0,
+ min: d3.min(prices) ?? 0,
+
});
});