diff --git a/app/routes/inactivities.tsx b/app/routes/inactivities.tsx index 813f947..20b0dc4 100644 --- a/app/routes/inactivities.tsx +++ b/app/routes/inactivities.tsx @@ -57,13 +57,16 @@ export async function loader({ context }: { context: RequestContext }) { const today = new Date().toISOString().split("T").at(0); const { results } = await context.env.D1.prepare( - "SELECT decisions, end, id, start, user FROM inactivity_notices WHERE start <= ?1 AND date(end, '+30 days') <= ?1; ", + "SELECT decisions, departments, end, hiatus, id, start, user FROM inactivity_notices WHERE start <= ?1 AND date(end, '+30 days') <= ?1; ", ) .bind(today) .all(); - for (let i = 0; i < results.length; i++) + for (let i = 0; i < results.length; i++) { + results[i].decisions = JSON.parse(results[i].decisions as string); + results[i].departments = JSON.parse(results[i].departments as string); results[i].user = JSON.parse(results[i].user as string); + } return results.filter((row) => { const decisionValues = Object.values( @@ -76,7 +79,7 @@ export async function loader({ context }: { context: RequestContext }) { end: string; id: string; start: string; - user: { email: string; id: string; username: string }; + user: { email?: string; id: string; username: string }; }[]; }