fixing claimsPage
This commit is contained in:
@@ -1,30 +1,67 @@
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { BarChart, Bar, XAxis, YAxis, CartesianGrid, ResponsiveContainer, Tooltip } from "recharts";
|
||||
import {
|
||||
BarChart,
|
||||
Bar,
|
||||
XAxis,
|
||||
YAxis,
|
||||
CartesianGrid,
|
||||
ResponsiveContainer,
|
||||
Tooltip,
|
||||
} from "recharts";
|
||||
|
||||
interface AppointmentsByDayProps {
|
||||
appointments: any[];
|
||||
}
|
||||
|
||||
export function AppointmentsByDay({ appointments }: AppointmentsByDayProps) {
|
||||
// Data processing for appointments by day
|
||||
const daysOfWeek = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
|
||||
const countsByDay = daysOfWeek.map((day) => ({ day, count: 0 }));
|
||||
|
||||
// Initialize counts for each day
|
||||
const countsByDay = daysOfWeek.map(day => ({ day, count: 0 }));
|
||||
// Get current date and set time to start of day (midnight)
|
||||
const now = new Date();
|
||||
now.setHours(0, 0, 0, 0);
|
||||
|
||||
// Count appointments by day of week
|
||||
appointments.forEach(appointment => {
|
||||
// Calculate Monday of the current week
|
||||
const day = now.getDay(); // 0 = Sunday, 1 = Monday, ...
|
||||
const diffToMonday = day === 0 ? -6 : 1 - day; // adjust if Sunday
|
||||
const monday = new Date(now);
|
||||
monday.setDate(now.getDate() + diffToMonday);
|
||||
|
||||
// Sunday of the current week
|
||||
const sunday = new Date(monday);
|
||||
sunday.setDate(monday.getDate() + 6);
|
||||
|
||||
// Filter appointments only from this week (Monday to Sunday)
|
||||
const appointmentsThisWeek = appointments.filter((appointment) => {
|
||||
if (!appointment.date) return false;
|
||||
|
||||
const date = new Date(appointment.date);
|
||||
// Reset time to compare just the date
|
||||
date.setHours(0, 0, 0, 0);
|
||||
|
||||
return date >= monday && date <= sunday;
|
||||
});
|
||||
|
||||
// Count appointments by day for current week
|
||||
appointmentsThisWeek.forEach((appointment) => {
|
||||
const date = new Date(appointment.date);
|
||||
const dayOfWeek = date.getDay(); // 0 = Sunday, 1 = Monday, ...
|
||||
const dayIndex = dayOfWeek === 0 ? 6 : dayOfWeek - 1; // Adjust to make Monday first
|
||||
const dayIndex = dayOfWeek === 0 ? 6 : dayOfWeek - 1; // Monday=0, Sunday=6
|
||||
if (countsByDay[dayIndex]) {
|
||||
countsByDay[dayIndex].count += 1;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
return (
|
||||
<Card className="shadow-sm">
|
||||
<CardHeader className="pb-2">
|
||||
<CardTitle className="text-base font-medium">Appointments by Day</CardTitle>
|
||||
<p className="text-xs text-muted-foreground">Distribution of appointments throughout the week</p>
|
||||
<CardTitle className="text-base font-medium">
|
||||
Appointments by Day
|
||||
</CardTitle>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Distribution of appointments throughout the week
|
||||
</p>
|
||||
</CardHeader>
|
||||
<CardContent>
|
||||
<div className="h-[200px]">
|
||||
@@ -34,7 +71,12 @@ export function AppointmentsByDay({ appointments }: AppointmentsByDayProps) {
|
||||
margin={{ top: 5, right: 5, left: 0, bottom: 5 }}
|
||||
>
|
||||
<CartesianGrid strokeDasharray="3 3" vertical={false} />
|
||||
<XAxis dataKey="day" fontSize={12} tickLine={false} axisLine={false} />
|
||||
<XAxis
|
||||
dataKey="day"
|
||||
fontSize={12}
|
||||
tickLine={false}
|
||||
axisLine={false}
|
||||
/>
|
||||
<YAxis fontSize={12} tickLine={false} axisLine={false} />
|
||||
<Tooltip
|
||||
formatter={(value) => [`${value} appointments`, "Count"]}
|
||||
|
||||
@@ -16,7 +16,9 @@ export function NewPatients({ patients }: NewPatientsProps) {
|
||||
patients.forEach(patient => {
|
||||
const createdDate = new Date(patient.createdAt);
|
||||
const monthIndex = createdDate.getMonth();
|
||||
if (patientsByMonth[monthIndex]) {
|
||||
patientsByMonth[monthIndex].count += 1;
|
||||
}
|
||||
});
|
||||
|
||||
// Add some sample data for visual effect if no patients
|
||||
@@ -25,8 +27,9 @@ export function NewPatients({ patients }: NewPatientsProps) {
|
||||
const sampleData = [17, 12, 22, 16, 15, 17, 22, 28, 20, 16];
|
||||
sampleData.forEach((value, index) => {
|
||||
if (index < patientsByMonth.length ) {
|
||||
if (patientsByMonth[index]) {
|
||||
patientsByMonth[index].count = value;
|
||||
}
|
||||
}}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -6,10 +6,60 @@ import { Card, CardHeader, CardTitle, CardContent } from "@/components/ui/card";
|
||||
import { ClaimForm } from "@/components/claims/claim-form";
|
||||
import { useToast } from "@/hooks/use-toast";
|
||||
import { useAuth } from "@/hooks/use-auth";
|
||||
// import { Patient, Appointment } from "@shared/schema";
|
||||
import { PatientUncheckedCreateInputObjectSchema, AppointmentUncheckedCreateInputObjectSchema } from "@repo/db/shared/schemas";
|
||||
import { PatientUncheckedCreateInputObjectSchema, AppointmentUncheckedCreateInputObjectSchema } from "@repo/db/usedSchemas";
|
||||
import { Plus, FileCheck, CheckCircle, Clock, AlertCircle } from "lucide-react";
|
||||
import { format } from "date-fns";
|
||||
import {z} from "zod";
|
||||
import { apiRequest } from "@/lib/queryClient";
|
||||
|
||||
//creating types out of schema auto generated.
|
||||
type Appointment = z.infer<typeof AppointmentUncheckedCreateInputObjectSchema>;
|
||||
|
||||
const insertAppointmentSchema = (
|
||||
AppointmentUncheckedCreateInputObjectSchema as unknown as z.ZodObject<any>
|
||||
).omit({
|
||||
id: true,
|
||||
createdAt: true,
|
||||
});
|
||||
type InsertAppointment = z.infer<typeof insertAppointmentSchema>;
|
||||
|
||||
const updateAppointmentSchema = (
|
||||
AppointmentUncheckedCreateInputObjectSchema as unknown as z.ZodObject<any>
|
||||
)
|
||||
.omit({
|
||||
id: true,
|
||||
createdAt: true,
|
||||
})
|
||||
.partial();
|
||||
type UpdateAppointment = z.infer<typeof updateAppointmentSchema>;
|
||||
|
||||
const PatientSchema = (
|
||||
PatientUncheckedCreateInputObjectSchema as unknown as z.ZodObject<any>
|
||||
).omit({
|
||||
appointments: true,
|
||||
});
|
||||
type Patient = z.infer<typeof PatientSchema>;
|
||||
|
||||
const insertPatientSchema = (
|
||||
PatientUncheckedCreateInputObjectSchema as unknown as z.ZodObject<any>
|
||||
).omit({
|
||||
id: true,
|
||||
createdAt: true,
|
||||
});
|
||||
type InsertPatient = z.infer<typeof insertPatientSchema>;
|
||||
|
||||
const updatePatientSchema = (
|
||||
PatientUncheckedCreateInputObjectSchema as unknown as z.ZodObject<any>
|
||||
)
|
||||
.omit({
|
||||
id: true,
|
||||
createdAt: true,
|
||||
userId: true,
|
||||
})
|
||||
.partial();
|
||||
|
||||
type UpdatePatient = z.infer<typeof updatePatientSchema>;
|
||||
|
||||
|
||||
export default function ClaimsPage() {
|
||||
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
|
||||
@@ -21,17 +71,27 @@ export default function ClaimsPage() {
|
||||
const { user } = useAuth();
|
||||
|
||||
// Fetch patients
|
||||
const { data: patients = [], isLoading: isLoadingPatients } = useQuery<Patient[]>({
|
||||
queryKey: ["/api/patients"],
|
||||
const { data: patients = [], isLoading: isLoadingPatients } = useQuery<
|
||||
Patient[]
|
||||
>({
|
||||
queryKey: ["/api/patients/"],
|
||||
queryFn: async () => {
|
||||
const res = await apiRequest("GET", "/api/patients/");
|
||||
return res.json();
|
||||
},
|
||||
enabled: !!user,
|
||||
});
|
||||
|
||||
// Fetch appointments
|
||||
const {
|
||||
data: appointments = [] as Appointment[],
|
||||
isLoading: isLoadingAppointments
|
||||
isLoading: isLoadingAppointments,
|
||||
} = useQuery<Appointment[]>({
|
||||
queryKey: ["/api/appointments"],
|
||||
queryKey: ["/api/appointments/all"],
|
||||
queryFn: async () => {
|
||||
const res = await apiRequest("GET", "/api/appointments/all");
|
||||
return res.json();
|
||||
},
|
||||
enabled: !!user,
|
||||
});
|
||||
|
||||
@@ -59,10 +119,10 @@ export default function ClaimsPage() {
|
||||
acc.push({
|
||||
patientId: patient.id,
|
||||
patientName: `${patient.firstName} ${patient.lastName}`,
|
||||
appointmentId: appointment.id,
|
||||
appointmentId: Number(appointment.id),
|
||||
insuranceProvider: patient.insuranceProvider || 'N/A',
|
||||
insuranceId: patient.insuranceId || 'N/A',
|
||||
lastAppointment: appointment.date
|
||||
lastAppointment: String(appointment.date)
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -98,7 +158,7 @@ export default function ClaimsPage() {
|
||||
onClick={() => {
|
||||
if (patientsWithAppointments.length > 0) {
|
||||
const firstPatient = patientsWithAppointments[0];
|
||||
handleNewClaim(firstPatient.patientId, firstPatient.appointmentId);
|
||||
handleNewClaim(Number(firstPatient?.patientId), Number(firstPatient?.appointmentId));
|
||||
} else {
|
||||
toast({
|
||||
title: "No patients available",
|
||||
|
||||
Reference in New Issue
Block a user