Gitead/DentalManagementE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(patient-status schema updated)- applied changes

Browse Source
This commit is contained in:
Potenz
2025-10-30 21:13:33 +05:30
parent 103142b2d3
commit 54f83ab398
9 changed files with 146 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
apps/Frontend/src/components/patients/patient-form.tsx
View File

@@ -24,11 +24,14 @@ import {
InsertPatient,
insertPatientSchema,
Patient,
PatientStatus,
patientStatusOptions,
UpdatePatient,
updatePatientSchema,
} from "@repo/db/types";
import { z } from "zod";
import { DateInputField } from "@/components/ui/dateInputField";
import { PatientStatusSchema } from "@repo/db/usedSchemas";
interface PatientFormProps {
patient?: Patient;
@@ -84,7 +87,7 @@ export const PatientForm = forwardRef<PatientFormRef, PatientFormProps>(
policyHolder: "",
allergies: "",
medicalConditions: "",
status: "active",
status: "UNKNOWN",
userId: user?.id,
};
}, [isEditing, patient, extractedInfo, user?.id]);
@@ -297,27 +300,39 @@ export const PatientForm = forwardRef<PatientFormRef, PatientFormProps>(
<FormField
control={form.control}
name="status"
render={({ field }) => (
<FormItem>
<FormLabel>Status *</FormLabel>
<Select
onValueChange={field.onChange}
value={field.value}
defaultValue="active"
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="Select status" />
</SelectTrigger>
</FormControl>
<SelectContent>
<SelectItem value="active">Active</SelectItem>
<SelectItem value="inactive">Inactive</SelectItem>
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
render={({ field }) => {
const options = Object.values(
patientStatusOptions
) as PatientStatus[]; // ['ACTIVE','INACTIVE','UNKNOWN']
const toLabel = (v: PatientStatus) =>
v[0] + v.slice(1).toLowerCase(); // ACTIVE -> Active
return (
<FormItem>
<FormLabel>Status *</FormLabel>
<Select
value={(field.value as PatientStatus) ?? "UNKNOWN"}
onValueChange={(v) =>
field.onChange(v as PatientStatus)
}
>
<FormControl>
<SelectTrigger>
<SelectValue placeholder="Select status" />
</SelectTrigger>
</FormControl>
<SelectContent>
{options.map((v) => (
<SelectItem key={v} value={v}>
{toLabel(v)}
</SelectItem>
))}
</SelectContent>
</Select>
<FormMessage />
</FormItem>
);
}}
/>
<FormField

61
apps/Frontend/src/components/patients/patient-table.tsx
View File

@@ -39,6 +39,7 @@ import { Checkbox } from "@/components/ui/checkbox";
import { formatDateToHumanReadable } from "@/utils/dateUtils";
import { Patient, UpdatePatient } from "@repo/db/types";
import { PatientFinancialsModal } from "./patient-financial-modal";
import { getPageNumbers } from "@/utils/pageNumberGenerator";
interface PatientApiResponse {
patients: Patient[];
@@ -309,25 +310,6 @@ export function PatientTable({
return colorClasses[id % colorClasses.length];
};
function getPageNumbers(current: number, total: number): (number | "...")[] {
const delta = 2;
const range: (number | "...")[] = [];
const left = Math.max(2, current - delta);
const right = Math.min(total - 1, current + delta);
range.push(1);
if (left > 2) range.push("...");
for (let i = left; i <= right; i++) {
range.push(i);
}
if (right < total - 1) range.push("...");
if (total > 1) range.push(total);
return range;
}
return (
<div className="bg-white shadow rounded-lg overflow-hidden">
<div className="overflow-x-auto">
@@ -440,18 +422,26 @@ export function PatientTable({
</TableCell>
<TableCell>
<div className="col-span-1">
<span
className={cn(
"inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium",
patient.status === "active"
? "bg-green-100 text-green-800"
: "bg-red-100 text-red-800"
)}
>
{patient.status === "active" ? "Active" : "Inactive"}
</span>
{patient.status === "ACTIVE" && (
<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-green-100 text-green-800">
Active
</span>
)}
{patient.status === "INACTIVE" && (
<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-red-100 text-red-800">
Inactive
</span>
)}
{patient.status === "UNKNOWN" && (
<span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-700">
Unknown
</span>
)}
</div>
</TableCell>
<TableCell className="text-right">
<div className="flex justify-end space-x-2">
{allowDelete && (
@@ -573,15 +563,18 @@ export function PatientTable({
<p>
<span className="text-gray-500">Status:</span>{" "}
<span
className={`${
currentPatient.status === "active"
className={cn(
currentPatient.status === "ACTIVE"
? "text-green-600"
: "text-red-600"
} font-medium`}
: currentPatient.status === "INACTIVE"
? "text-red-600"
: "text-gray-600", // UNKNOWN or fallback
"font-medium"
)}
>
{currentPatient.status
? currentPatient.status.charAt(0).toUpperCase() +
currentPatient.status.slice(1)
currentPatient.status.slice(1).toLowerCase()
: "Unknown"}
</span>
</p>

1
apps/Frontend/src/pages/insurance-status-page.tsx
View File

@@ -251,7 +251,6 @@ export default function InsuranceStatusPage() {
gender: "",
phone: "",
userId: user?.id ?? 1,
status: "active",
insuranceId: memberId,
};
await addPatientMutation.mutateAsync(newPatient);

1
apps/Frontend/src/pages/patients-page.tsx
View File

@@ -254,7 +254,6 @@ export default function PatientsPage() {
gender: "",
phone: "",
userId: user?.id ?? 1,
status: "active",
insuranceId: data.memberId || "",
};