From f6a009eb910bdac1bc8d12d7646aa687876cb714 Mon Sep 17 00:00:00 2001 From: meskio <meskio@sindominio.net> Date: Fri, 7 Jun 2024 13:44:34 +0200 Subject: [PATCH] Accept unexisting members in dues list * Closes: #32 --- src/dues/DuesReport.js | 4 ++-- src/util.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/dues/DuesReport.js b/src/dues/DuesReport.js index 3cec27d..72b5ca6 100644 --- a/src/dues/DuesReport.js +++ b/src/dues/DuesReport.js @@ -1,7 +1,7 @@ import React, { useState } from "react"; import { Table } from "react-bootstrap"; import Fetcher from "../Fetcher"; -import { printDate, printMoney } from "../util"; +import { printDate, printMoney, printMember } from "../util"; function DuesReport() { const [dues, setDues] = useState([]); @@ -18,7 +18,7 @@ function DuesReport() { const entries = dues.map((d) => ( <tr key={d.ID}> <td>{printDate(d.date)}</td> - <td>{d.member.name + " (" + d.member.num + ")"}</td> + <td>{printMember(d.member)}</td> <td>{printMoney(-d.total)}</td> </tr> )); diff --git a/src/util.js b/src/util.js index f238ac3..cd15260 100644 --- a/src/util.js +++ b/src/util.js @@ -38,6 +38,14 @@ function printID(pre, item) { return pre + "-" + item.ID.toString().padStart(5, "0"); } +function printMember(member) { + if (member) { + return member.name + " (" + member.num + ")"; + } else { + return "-"; + } +} + function url(path) { let api = process.env.REACT_APP_API; if (!api) { @@ -75,6 +83,7 @@ export { printMoney, printDate, printRole, + printMember, url, date2string, time2string, -- GitLab