Add budgets to report.

This commit is contained in:
Steve Schafer 2026-01-19 11:02:49 -07:00
parent 8082db19ac
commit 2b7ea7ba50
4 changed files with 163 additions and 6 deletions

View file

@ -16,7 +16,7 @@ const Categorize = (props) => {
useEffect(() => { useEffect(() => {
console.log("Categorize: useEffect"); console.log("Categorize: useEffect");
console.log("params", params); console.log("params", params);
let redo = params.redo == 'true'; let redo = params.redo === 'true';
categorize(redo).then( categorize(redo).then(
data => { data => {

View file

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import {useState, useEffect} from "react"; import {useState, useEffect} from "react";
import {useSearchParams, useNavigate, useLocation} from 'react-router-dom'; import {useSearchParams, useNavigate, useLocation} from 'react-router-dom';
import {report} from "./apiService"; import {report, saveBudget} from "./apiService";
const Report = (props) => { const Report = (props) => {
const [error, setError] = useState(null); const [error, setError] = useState(null);
@ -129,7 +129,7 @@ const Report = (props) => {
const numberFormat = new Intl.NumberFormat("en-US", { style: 'currency', currency: 'USD' }); const numberFormat = new Intl.NumberFormat("en-US", { style: 'currency', currency: 'USD' });
let renderMonths = (category) => { let renderMonths = (year, category) => {
let cols = []; let cols = [];
for(let monthNum = 0; monthNum < category.monthCount; monthNum++) { for(let monthNum = 0; monthNum < category.monthCount; monthNum++) {
let amount = category.monthGrandTotals[monthNum]; let amount = category.monthGrandTotals[monthNum];
@ -140,11 +140,80 @@ const Report = (props) => {
if(category.largestMonth === monthNum) { if(category.largestMonth === monthNum) {
style["color"] = "RED"; style["color"] = "RED";
} }
cols.push(<td key={monthNum} style={style} className={"month" + monthNum}>{numberFormat.format(amount)}</td>); rememberBudget(year, category, monthNum);
cols.push(
<td key={monthNum} style={style} className={"month" + monthNum}>
<input type="text" size="8"
name={"budget/" + year + "/" + category.id + "/" + monthNum}
style={{display: "none"}}
className={"budget"}
value={category.budgetAmounts.monthBudgets[monthNum]}
onChange={enableSubmitButton}/>
{numberFormat.format(amount)}
</td>
);
} }
return cols; return cols;
}; };
const rememberBudget = (year, category, monthNum) => {
if(document.yearBudgets == null) {
document.yearBudgets = {};
}
let categoryBudgets = document.yearBudgets[year];
if(categoryBudgets == null) {
categoryBudgets = {};
document.yearBudgets[year] = categoryBudgets;
}
let monthBudgets = categoryBudgets[category.id];
if(monthBudgets == null) {
monthBudgets = {};
categoryBudgets[category.id] = monthBudgets;
}
monthBudgets[monthNum] = category.budgetAmounts.monthBudgets[monthNum];
};
const getRememberedBudget = (year, categoryId, monthNum) => {
let yearBudgets = document.yearBudgets;
if(yearBudgets == null) {
return null;
}
let categoryBudgets = yearBudgets[year];
if(categoryBudgets == null) {
return null;
}
let monthBudgets = categoryBudgets[categoryId];
if(monthBudgets == null) {
return null;
}
return monthBudgets[monthNum];
};
const enableSubmitButton = (e) => {
let re = /budget\/([0-9]+)\/([0-9-]+)\/([0-9-]+)/;
let inputs = document.body.querySelectorAll(".budget");
let enabled = false;
for(let input of inputs) {
let name = input.name;
let value = input.value;
let reResult = re.exec(name);
if(reResult == null) {
console.log("regexp did not match", name);
continue;
}
let year = +reResult[1];
let categoryId = +reResult[2];
let monthNum = +reResult[3];
let rememberedBudget = getRememberedBudget(year, categoryId, monthNum);
if(rememberedBudget != value) {
enabled = true;
break;
}
}
let button = document.body.querySelector("button.budget");
button.disabled = !enabled;
};
let renderDetail = (key, category) => { let renderDetail = (key, category) => {
let rows = []; let rows = [];
for(let detail of category.details) { for(let detail of category.details) {
@ -174,6 +243,7 @@ const Report = (props) => {
let indent = level * 10; let indent = level * 10;
let result = []; let result = [];
let key = "key-" + year + "-" + category.id; let key = "key-" + year + "-" + category.id;
rememberBudget(year, category, -1);
result.push( result.push(
<> <>
<tr key={key + "-1"}> <tr key={key + "-1"}>
@ -182,9 +252,15 @@ const Report = (props) => {
{ numberFormat.format(category.grandAverage) } { numberFormat.format(category.grandAverage) }
</td> </td>
<td style={{textAlign: "right", display: "none"}} className={"total"}> <td style={{textAlign: "right", display: "none"}} className={"total"}>
<input type="text" size="8"
name={"budget/" + year + "/" + category.id + "/-1"}
style={{display: "none"}}
className={"budget"}
value={category.budgetAmounts.yearBudget}
onChange={enableSubmitButton}/>
{ numberFormat.format(category.grandTotal) } { numberFormat.format(category.grandTotal) }
</td> </td>
{ renderMonths(category) } { renderMonths(year, category) }
</tr> </tr>
<tr key={key + "-2"} style={{display: "none"}}> <tr key={key + "-2"} style={{display: "none"}}>
<td colSpan={15}> <td colSpan={15}>
@ -226,6 +302,13 @@ const Report = (props) => {
}}); }});
}; };
const showInputs = (e) => {
let cols = document.body.querySelectorAll(".budget");
for(let col of cols) {
col.style.display = e.target.checked ? "" : "none";
}
};
const showColumn = (e, name, doNotCheckAll) => { const showColumn = (e, name, doNotCheckAll) => {
let cols = document.body.querySelectorAll("table.report td." + name + ",th." + name); let cols = document.body.querySelectorAll("table.report td." + name + ",th." + name);
for(let col of cols) { for(let col of cols) {
@ -266,6 +349,52 @@ const Report = (props) => {
showColumn(e, "month11", true); showColumn(e, "month11", true);
}; };
const handleSubmit = e => {
e.preventDefault();
let yearMap = {};
let re = /budget\/([0-9]+)\/([0-9-]+)\/([0-9-]+)/;
let inputs = document.body.querySelectorAll(".budget");
for(let input of inputs) {
let name = input.name;
let reResult = re.exec(name);
if(reResult == null) {
console.log("regexp did not match", name);
continue;
}
let year = +reResult[1];
let categoryId = +reResult[2];
let monthNum = +reResult[3];
// console.log(year, categoryId, monthNum);
let categoryMap = yearMap[year];
if(!categoryMap) {
categoryMap = {};
yearMap[year] = categoryMap;
}
let monthMap = categoryMap[categoryId];
if(!monthMap) {
monthMap = {};
categoryMap[categoryId] = monthMap;
}
monthMap[monthNum] = input.value;
}
console.log(yearMap);
saveBudget(yearMap).then(
data => {
// console.log('saveRegexes data', data);
if(data.status !== 200) {
alert(data.message);
return;
}
let button = document.body.querySelector("button.budget");
button.disabled = true;
},
error => {
alert(error.message);
console.error('error object', error);
}
);
};
console.log("report render", report); console.log("report render", report);
return ( return (
<> <>
@ -319,10 +448,11 @@ const Report = (props) => {
return ( return (
<> <>
<h2 key={"key-h2-" + yearReport.year}>{yearReport.year}</h2> <h2 key={"key-h2-" + yearReport.year}>{yearReport.year}</h2>
<form onSubmit={handleSubmit}>
<table key={"key-table-" + yearReport.year} className={"report"}> <table key={"key-table-" + yearReport.year} className={"report"}>
<thead> <thead>
<tr> <tr>
<th style={{textAlign: left}}>Category</th> <th style={{textAlign: "left"}}>Category</th>
<th style={style} className={"average"}>Average</th> <th style={style} className={"average"}>Average</th>
<th style={style} className={"total"}>Total</th> <th style={style} className={"total"}>Total</th>
<th style={style} className={"month0"}>Jan</th> <th style={style} className={"month0"}>Jan</th>
@ -343,6 +473,11 @@ const Report = (props) => {
{ renderCategory(0, yearReport.year, yearReport.rootCategory) } { renderCategory(0, yearReport.year, yearReport.rootCategory) }
</tbody> </tbody>
</table> </table>
<button className={"budget"}
style={{display: "none"}}
type="submit"
disabled>Submit Budgets</button>
</form>
</> </>
); );
}) })

View file

@ -171,6 +171,25 @@ export const deleteRegex = regexId => {
}); });
}; };
export const saveBudget = yearMap => {
if(yearMap == null) {
return new Promise((resolve, reject) => {
reject('yearMap is null');
});
}
let url = `${baseUrl}/budget`;
let method = 'PUT';
return fetch(url, fetchOptions(method, yearMap)).then(response => {
console.log(url, "response", response);
if(response.status !== 200) {
return new Promise((resolve, reject) => {
reject({status: response.status});
});
}
return response.json(); // promise
});
}
export const saveRegex = regex => { export const saveRegex = regex => {
if(regex == null) { if(regex == null) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

View file

@ -39,6 +39,9 @@ div.header-date {
table.detail tr th,td { table.detail tr th,td {
padding-right: 20px; padding-right: 20px;
} }
table.report tr th,td {
padding-right: 20px;
}
@media only screen and (max-width: 640px) { @media only screen and (max-width: 640px) {
body { body {
padding: 0px; padding: 0px;