diff --git a/app/routes/inactivities.tsx b/app/routes/inactivities.tsx index 400a87c..ac69b87 100644 --- a/app/routes/inactivities.tsx +++ b/app/routes/inactivities.tsx @@ -13,12 +13,13 @@ import { TableCaption, TableContainer, Tbody, - Td, Th, + Td, + Th, Thead, Tr, UnorderedList, useDisclosure, - useToast + useToast, } from "@chakra-ui/react"; import { useLoaderData } from "@remix-run/react"; import { useState } from "react"; @@ -57,7 +58,7 @@ 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, departments, end, hiatus, 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 end >= date($1, '-1 month') ORDER BY end;", ) .bind(today) .all();