Skip to content
This repository was archived by the owner on Sep 21, 2024. It is now read-only.

Trend buttons #167

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 75 additions & 12 deletions client/src/Components/TrendsComparison.jsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,81 @@
import React from 'react';
import { Bar } from 'react-chartjs-2';

import PropTypes from 'prop-types';
// test data for display
const data = {
labels: ['Red', 'Green', 'Yellow'],
datasets: [
{
data: [300, 50, 100],
backgroundColor: ['#FF6384', '#36A2EB', '#FFCE56'],
hoverBackgroundColor: ['#FF6384', '#36A2EB', '#FFCE56']
}
]
};

const TrendsComparison = () => <Bar data={data} />;
const TrendsComparison = props => {
const [m1Data, setm1Data] = React.useState({});
const [m2Data, setm2Data] = React.useState({});
const [categories, setCategories] = React.useState({});
const [graphData, setGraphData] = React.useState({});

React.useEffect(() => {
const cat1 = {};
const cat2 = {};
const totalCats = {};
props.data.accountData.accounts.forEach(account => {
if (account.transactions[props.y1]) {
if (account.transactions[props.y1][props.m1]) {
account.transactions[props.y1][props.m1].forEach(transaction => {
if (cat1[transaction.category]) {
cat1[transaction.category] += Number(transaction.amount);
} else {
cat1[transaction.category] = Number(transaction.amount);
totalCats[transaction.category] = 1;
}
});
}
}
if (account.transactions[props.y2]) {
if (account.transactions[props.y2][props.m2]) {
account.transactions[props.y2][props.m2].forEach(transaction => {
if (cat2[transaction.category]) {
cat2[transaction.category] += Number(transaction.amount);
} else {
cat2[transaction.category] = Number(transaction.amount);
totalCats[transaction.category] = 1;
}
});
}
}
});
setm1Data(cat1);
setm2Data(cat2);
setCategories(totalCats);
}, [props.data.accountData.accounts, props.m1, props.m2, props.y1, props.y2]);

React.useEffect(() => {
setGraphData({
labels: Object.keys(categories).sort(),
datasets: [
{
label: 'Month 1',
data: Object.keys(categories)
.sort()
.map(cat => m1Data[cat] || 0),
backgroundColor: ['#FF6384', '#36A2EB', '#FFCE56'],
hoverBackgroundColor: ['#FF6384', '#36A2EB', '#FFCE56']
},
{
label: 'Month 2',
data: Object.keys(categories)
.sort()
.map(cat => m2Data[cat] || 0),
backgroundColor: ['#FF6384', '#36A2EB', '#FFCE56'],
hoverBackgroundColor: ['#FF6384', '#36A2EB', '#FFCE56']
}
]
});
}, [m1Data, m2Data, categories]);
return <Bar data={graphData} />;
};

export default TrendsComparison;

TrendsComparison.propTypes = {
data: PropTypes.object,
m1: PropTypes.string,
m2: PropTypes.string,
y1: PropTypes.string,
y2: PropTypes.string
};
168 changes: 168 additions & 0 deletions client/src/Components/TrendsComparisonSelector.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import InputLabel from '@material-ui/core/InputLabel';
import FormControl from '@material-ui/core/FormControl';
import Select from '@material-ui/core/Select';
import PropTypes from 'prop-types';

const useStyles = makeStyles(theme => ({
root: {
display: 'flex',
flexWrap: 'wrap'
},
formControl: {
margin: theme.spacing(1),
minWidth: 120
},
selectEmpty: {
marginTop: theme.spacing(2)
}
}));

const date = new Date();
const year = date.getFullYear();
const month = date.getMonth();
const month2 = month === 0 ? 11 : month - 1;

export default function ComparisonSelector(props) {
const classes = useStyles();
const [state, setState] = React.useState({
month1: month.toString(),
year1: year.toString(),
month2: month2.toString(),
year2: year.toString(),
years: []
});

const handleChange = name => event => {
setState({
...state,
[name]: event.target.value
});
};

const updateYear = () => {
let result = {};
for (let i = 0; i < props.data.accountData.accounts.length; i++) {
for (let obj in props.data.accountData.accounts[i].transactions) {
result[obj] = 1;
}
}
return Object.keys(result);
};

React.useEffect(() => {
setState({
...state,
years: updateYear()
});
}, []);

React.useEffect(() => props.setM1(state.month1), [state.month1]);
React.useEffect(() => props.setM2(state.month2), [state.month2]);
React.useEffect(() => props.setY1(state.year1), [state.year1]);
React.useEffect(() => props.setY2(state.year2), [state.year2]);

return (
<div className={classes.root}>
<div>
<FormControl className={classes.formControl}>
<InputLabel>Month 1</InputLabel>
<Select
native
value={state.month}
onChange={handleChange('month1')}
inputProps={{
name: 'month1'
}}
>
<option value="" />
<option value={0}>January</option>
<option value={1}>February</option>
<option value={2}>March</option>
<option value={3}>April</option>
<option value={4}>May</option>
<option value={5}>June</option>
<option value={6}>July</option>
<option value={7}>August</option>
<option value={8}>September</option>
<option value={9}>October</option>
<option value={10}>November</option>
<option value={11}>December</option>
</Select>
</FormControl>
<FormControl className={classes.formControl}>
<InputLabel>Year 1</InputLabel>
<Select
native
value={state.year}
onChange={handleChange('year1')}
inputProps={{
name: 'year1'
}}
>
<option value="" />
{state.years.map((year, i) => (
<option key={i} value={year}>
{year}
</option>
))}
</Select>
</FormControl>
</div>
<div>
<FormControl className={classes.formControl}>
<InputLabel>Month 2</InputLabel>
<Select
native
value={state.month}
onChange={handleChange('month2')}
inputProps={{
name: 'month2'
}}
>
<option value="" />
<option value={0}>January</option>
<option value={1}>February</option>
<option value={2}>March</option>
<option value={3}>April</option>
<option value={4}>May</option>
<option value={5}>June</option>
<option value={6}>July</option>
<option value={7}>August</option>
<option value={8}>September</option>
<option value={9}>October</option>
<option value={10}>November</option>
<option value={11}>December</option>
</Select>
</FormControl>
<FormControl className={classes.formControl}>
<InputLabel>Year 2</InputLabel>
<Select
native
value={state.year}
onChange={handleChange('year2')}
inputProps={{
name: 'year2'
}}
>
<option value="" />
{state.years.map((year, i) => (
<option key={i} value={year}>
{year}
</option>
))}
</Select>
</FormControl>
</div>
</div>
);
}

ComparisonSelector.propTypes = {
data: PropTypes.object,
setM1: PropTypes.func,
setM2: PropTypes.func,
setY1: PropTypes.func,
setY2: PropTypes.func
};
Loading