Skip to content

wip: requests from 4/20/26 #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexespejo merged 2 commits into from
May 19, 2026
Merged

wip: requests from 4/20/26 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e68f9c3
wip: requests from 4/20/26
alexespejo May 14, 2026
38a2f9c
stuff stuff stuff
alexespejo May 19, 2026
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
86 changes: 81 additions & 5 deletions client/src/components/caseManagerMonthlyStats/CaseManagerMonthlyStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ButtonGroup,
Heading,
HStack,
Input,
Select,
Tab,
TabList,
Expand All @@ -20,24 +21,49 @@ import type { TabData, TableRow } from "../../types/monthlyStat.ts";
import { StatsTable } from "./StatsTable.tsx";
import { LoadingWheel } from ".././loading/loading.tsx"

type DateFilterOperator = "" | "after" | "before" | "between";

export const CaseManagerMonthlyStats = () => {

const { backend } = useBackendContext();
const startYear = 2025;
const currentYear = new Date().getFullYear();
const [allTabData, setAllTabData] = useState<TabData[]>([]);
const [selectedYear, setSelectedYear] = useState<number>(currentYear);
const [dateOperator, setDateOperator] = useState<DateFilterOperator>("");
const [startDate, setStartDate] = useState("");
const [endDate, setEndDate] = useState("");
const [lastUpdated, setLastUpdated] = useState<string>("");
const [loading, setLoading] = useState(true);
const [hiddenFields, setHiddenFields] = useState<string[]>([]);
const [pinnedFields, setPinnedFields] = useState<string[]>([]);
const [tabIndex, setTabIndex] = useState(0);
const yearStart = `${selectedYear}-01-01`;
const yearEnd = `${selectedYear}-12-31`;

useEffect(() => {
setStartDate("");
setEndDate("");
setDateOperator("");
}, [selectedYear]);

useEffect(() => {
const fetchData = async () => {
setLoading(true);
const params: Record<string, string | number> = { year: selectedYear };

if ((dateOperator === "after" || dateOperator === "before") && startDate) {
params.operator = dateOperator;
params.date = startDate;
} else if (dateOperator === "between" && startDate && endDate) {
params.operator = "between";
params.date = startDate;
params.endDate = endDate;
}

try {
const [monthlyStatsResponse, frontDeskResponse, cmResponse] = await Promise.all([
backend.get(`/calculateMonthlyStats/${selectedYear}`),
backend.get(`/calculateMonthlyStats`, { params }),
backend.get(`/lastUpdated/front_desk_monthly`),
backend.get(`/lastUpdated/cm_monthly_stats`)
]);
Expand Down Expand Up @@ -68,7 +94,7 @@ export const CaseManagerMonthlyStats = () => {
};

fetchData();
}, [backend, selectedYear]);
}, [backend, selectedYear, dateOperator, startDate, endDate]);


const buttonStyle = {
Expand Down Expand Up @@ -174,13 +200,30 @@ export const CaseManagerMonthlyStats = () => {
document.body.removeChild(link);
};

const getExportSuffix = () => {
if (dateOperator === "after" && startDate) {
return `${selectedYear}_after_${startDate}`;
}

if (dateOperator === "before" && startDate) {
return `${selectedYear}_before_${startDate}`;
}

if (dateOperator === "between" && startDate && endDate) {
const [rangeStart, rangeEnd] = [startDate, endDate].sort();
return `${selectedYear}_${rangeStart}_to_${rangeEnd}`;
}

return `${selectedYear}`;
};

const handleExportAll = () => {
const allTables = allTabData.flatMap((tab) => tab.tables);
const filteredAndSortedTables = filterAndSortTables(allTables);
const timestamp = new Date().toISOString().split('T')[0];
createMultiTableCSV(
filteredAndSortedTables,
`MonthlyStats_All_${selectedYear}_${timestamp}.csv`
`MonthlyStats_All_${getExportSuffix()}_${timestamp}.csv`
);
};

Expand All @@ -189,7 +232,7 @@ export const CaseManagerMonthlyStats = () => {
const timestamp = new Date().toISOString().split('T')[0];
createMultiTableCSV(
filteredAndSortedTables,
`MonthlyStats_${selectedYear}_${timestamp}.csv`
`MonthlyStats_${getExportSuffix()}_${timestamp}.csv`
);
};

Expand All @@ -206,7 +249,7 @@ export const CaseManagerMonthlyStats = () => {
<Text fontSize="14px">Last Updated: {lastUpdated}</Text>
</VStack>

<HStack alignSelf="end">
<HStack alignSelf="end" spacing={3} wrap="wrap">
<ButtonGroup size="sm">
{/* <Button
{...buttonStyle}
Expand Down Expand Up @@ -257,6 +300,39 @@ export const CaseManagerMonthlyStats = () => {
</option>
))}
</Select>
<Select
value={dateOperator}
onChange={(e) => {
const nextOperator = e.target.value as DateFilterOperator;
setDateOperator(nextOperator);
if (nextOperator !== "between") {
setEndDate("");
}
}}
>
<option value="">All dates in year</option>
<option value="after">Is after</option>
<option value="before">Is before</option>
<option value="between">Is between</option>
</Select>
{dateOperator !== "" && (
<Input
type="date"
value={startDate}
min={yearStart}
max={yearEnd}
onChange={(e) => setStartDate(e.target.value)}
/>
)}
{dateOperator === "between" && (
<Input
type="date"
value={endDate}
min={yearStart}
max={yearEnd}
onChange={(e) => setEndDate(e.target.value)}
/>
)}
</HStack>

<Tabs
Expand Down
13 changes: 11 additions & 2 deletions client/src/components/clientPage/ViewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ export const ViewPage = () => {
displayValue: any,
options?: { isBoolean?: boolean; isNumeric?: boolean }
) => {
const currentValue =
edits[fieldName] !== undefined ? edits[fieldName] : displayValue;

if (isEditing) {
return (
<Box
Expand All @@ -124,7 +127,7 @@ export const ViewPage = () => {
m={0}
border="1px solid"
borderColor="#3182CE"
value={edits[fieldName] !== undefined ? edits[fieldName] : displayValue}
value={currentValue ?? ""}
onChange={(e) => {
let newValue = e.target.value;

Expand Down Expand Up @@ -156,7 +159,13 @@ export const ViewPage = () => {
alignItems="center"
p={0}
>
{options?.isBoolean ? (displayValue ? "Yes" : "No") : displayValue}
{options?.isBoolean
? displayValue === null || displayValue === undefined
? ""
: displayValue
? "Yes"
: "No"
: displayValue ?? ""}
</Box>
);
};
Expand Down
72 changes: 37 additions & 35 deletions client/src/components/clientPage/subComponents/comments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,47 +5,49 @@ import { Box, Textarea, useToast } from "@chakra-ui/react";
import { useBackendContext } from "../../../contexts/hooks/useBackendContext";
import toSnakeCase from "../../../utils/snakeCase";

type Nullable<T> = T | null;

interface Client {
age: number;
attendingSchoolUponEntry: boolean;
attendingSchoolUponExit: boolean;
bedNights: number;
bedNightsChildren: number;
chronicallyHomeless: boolean;
cityOfLastPermanentResidence: string;
age: Nullable<number>;
attendingSchoolUponEntry: Nullable<boolean>;
attendingSchoolUponExit: Nullable<boolean>;
bedNights: Nullable<number>;
bedNightsChildren: Nullable<number>;
chronicallyHomeless: Nullable<boolean>;
cityOfLastPermanentResidence: Nullable<string>;
createdBy: number;
dateOfBirth: string;
destinationcity: string;
disabledChildren: boolean;
email: string;
emergencyContactName: string;
emergencyContactPhoneNumber: string;
employmentGained: boolean;
entranceDate: string;
estimatedExitDate: string;
ethnicity: string;
exitDate: string;
dateOfBirth: Nullable<string>;
destinationcity: Nullable<string>;
disabledChildren: Nullable<boolean>;
email: Nullable<string>;
emergencyContactName: Nullable<string>;
emergencyContactPhoneNumber: Nullable<string>;
employmentGained: Nullable<boolean>;
entranceDate: Nullable<string>;
estimatedExitDate: Nullable<string>;
ethnicity: Nullable<string>;
exitDate: Nullable<string>;
firstName: string;
grant: string;
homelessnessLength: number;
grant: Nullable<string>;
homelessnessLength: Nullable<number>;
id: number;
lastName: string;
medical: boolean;
phoneNumber: string;
pregnantUponEntry: boolean;
priorLiving: string;
priorLivingCity: string;
race: string;
reasonForLeaving: string;
reunified: boolean;
savingsAmount: string;
shelterInLastFiveYears: boolean;
specificDestination: string;
specificReasonForLeaving: string;
medical: Nullable<boolean>;
phoneNumber: Nullable<string>;
pregnantUponEntry: Nullable<boolean>;
priorLiving: Nullable<string>;
priorLivingCity: Nullable<string>;
race: Nullable<string>;
reasonForLeaving: Nullable<string>;
reunified: Nullable<boolean>;
savingsAmount: Nullable<string>;
shelterInLastFiveYears: Nullable<boolean>;
specificDestination: Nullable<string>;
specificReasonForLeaving: Nullable<string>;
status: string;
successfulCompletion: boolean;
successfulCompletion: Nullable<boolean>;
unitName: string;
comments: string;
comments: Nullable<string>;
}

const emptyClient: Client = {
Expand Down Expand Up @@ -206,7 +208,7 @@ function Comments({ clientId }: ClientProps) {
h="40vh"
resize="vertical"
fontSize="md"
value={client.comments}
value={client.comments ?? ""}
placeholder="Type Here"
onChange={handleChange}
onBlur={handleBlur}
Expand Down
70 changes: 36 additions & 34 deletions client/src/components/clientPage/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
type Nullable<T> = T | null;

interface InitialInterview {
id: number;
applicant_type: string;
Expand Down Expand Up @@ -119,46 +121,46 @@ interface FormsProps {
}

interface Client {
age: number;
attendingSchoolUponEntry: boolean;
attendingSchoolUponExit: boolean;
bedNights: number;
bedNightsChildren: number;
chronicallyHomeless: boolean;
cityOfLastPermanentResidence: string;
age: Nullable<number>;
attendingSchoolUponEntry: Nullable<boolean>;
attendingSchoolUponExit: Nullable<boolean>;
bedNights: Nullable<number>;
bedNightsChildren: Nullable<number>;
chronicallyHomeless: Nullable<boolean>;
cityOfLastPermanentResidence: Nullable<string>;
createdBy: number;
dateOfBirth: string;
destinationcity: string;
disabledChildren: boolean;
email: string;
emergencyContactName: string;
emergencyContactPhoneNumber: string;
employmentGained: boolean;
entranceDate: string;
estimatedExitDate: string;
ethnicity: string;
exitDate: string;
dateOfBirth: Nullable<string>;
destinationcity: Nullable<string>;
disabledChildren: Nullable<boolean>;
email: Nullable<string>;
emergencyContactName: Nullable<string>;
emergencyContactPhoneNumber: Nullable<string>;
employmentGained: Nullable<boolean>;
entranceDate: Nullable<string>;
estimatedExitDate: Nullable<string>;
ethnicity: Nullable<string>;
exitDate: Nullable<string>;
firstName: string;
grant: string;
homelessnessLength: number;
grant: Nullable<string>;
homelessnessLength: Nullable<number>;
id: number;
lastName: string;
medical: boolean;
phoneNumber: string;
pregnantUponEntry: boolean;
priorLiving: string;
priorLivingCity: string;
race: string;
reasonForLeaving: string;
reunified: boolean;
savingsAmount: string;
shelterInLastFiveYears: boolean;
specificDestination: string;
specificReasonForLeaving: string;
medical: Nullable<boolean>;
phoneNumber: Nullable<string>;
pregnantUponEntry: Nullable<boolean>;
priorLiving: Nullable<string>;
priorLivingCity: Nullable<string>;
race: Nullable<string>;
reasonForLeaving: Nullable<string>;
reunified: Nullable<boolean>;
savingsAmount: Nullable<string>;
shelterInLastFiveYears: Nullable<boolean>;
specificDestination: Nullable<string>;
specificReasonForLeaving: Nullable<string>;
status: string;
successfulCompletion: boolean;
successfulCompletion: Nullable<boolean>;
unitName: string;
comments: string;
comments: Nullable<string>;
}

export type {
Expand Down
Loading
Loading