Encounter Locations view

public/locale/en.json

@@ -455,6 +455,7 @@
   "availabilities": "Availabilities",
   "availability_status": "Availability Status",
   "available": "Available",
+  "available_beds": "Available beds",
   "available_features": "Available Features",
   "available_in": "Available in",
   "available_time_slots": "Available Time Slots",
@@ -953,6 +954,7 @@
   "encounter_discharge_disposition__snf": "Skilled nursing facility",
   "encounter_duration_confirmation": "The duration of this encounter would be",
   "encounter_id": "Encounter ID",
+  "encounter_locations": "Encounter Locations",
   "encounter_manage_organization_description": "Add or remove organizations from this encouter",
   "encounter_marked_as_complete": "Encounter Completed",
   "encounter_notes__all_discussions": "All Discussions",
@@ -1533,13 +1535,15 @@
   "no_beds_available": "No beds available",
   "no_changes": "No changes",
   "no_changes_made": "No changes made",
+  "no_child_locations": "No Child Locations",
   "no_child_locations_found": "No child locations found",
   "no_comments_available": "No comments available",
   "no_consultation_filed": "No consultation filed",
   "no_consultation_updates": "No consultation updates",
   "no_country_found": "No country found",
   "no_data_found": "No data found",
   "no_departments_teams_found": "No Departments or Teams found",
+  "no_description": "No Description",
   "no_devices_available": "No devices available",
   "no_devices_found": "No devices found",
   "no_diagnoses_recorded": "No diagnoses recorded",
@@ -1646,6 +1650,7 @@
   "occupancy": "Occupancy",
   "occupation": "Occupation",
   "occupied": "Occupied",
+  "occupied_beds": "Occupied beds",
   "occurrence": "Occurrence",
   "old_password": "Current Password",
   "on": "on",
@@ -1706,6 +1711,7 @@
   "password_uppercase_validation": "Include at least <strong>one uppercase letter</strong> (A-Z).",
   "passwords_match": "Passwords match.",
   "patient": "Patient",
+  "patient encounters": "Patient Encounters",
   "patient-notes": "Notes",
   "patient__general-info": "General Info",
   "patient__insurance-details": "Insurance Details",
@@ -1899,6 +1905,7 @@
   "ration_card_category": "Ration Card Category",
   "re_admission": "Re-Admission",
   "readmission": "Re-admission",
+  "ready_for_admission": "Ready For Admission",
   "reason": "Reason",
   "reason_for_discontinuation": "Reason for discontinuation",
   "reason_for_edit": "Reason for edit",
@@ -2094,6 +2101,7 @@
   "search_for_symptoms_to_add": "Search for symptoms to add",
   "search_icd11_placeholder": "Search for ICD-11 Diagnoses",
   "search_investigation_placeholder": "Search Investigation & Groups",
+  "search_locations": "Search Locations",
   "search_medication": "Search Medication",
   "search_medications": "Search Medications",
   "search_medicine": "Search Medicine",
@@ -2332,6 +2340,7 @@
   "tomorrow": "Tomorrow",
   "total_amount": "Total Amount",
   "total_beds": "Total Beds",
+  "total_locations": "Total locations",
   "total_patients": "Total Patients",
   "total_slots": "Total Slots",
   "total_staff": "Total Staff",

src/Routers/AppRouter.tsx

@@ -24,6 +24,7 @@ import { PlugConfigEdit } from "@/pages/Apps/PlugConfigEdit";
 import { PlugConfigList } from "@/pages/Apps/PlugConfigList";
 import UserDashboard from "@/pages/UserDashboard";
 
+import LocationRoutes from "./routes/LocationRoutes";
 import OrganizationRoutes from "./routes/OrganizationRoutes";
 import AdminRoutes from "./routes/adminRoutes";
 
@@ -50,6 +51,7 @@ const Routes: AppRoutes = {
   // ...AssetRoutes,
   ...ConsultationRoutes,
   ...FacilityRoutes,
+  ...LocationRoutes,
   ...PatientRoutes,
   ...ResourceRoutes,
   ...ScheduleRoutes,

src/Routers/routes/LocationRoutes.tsx

@@ -0,0 +1,10 @@
+import { AppRoutes } from "@/Routers/AppRouter";
+import LocationList from "@/pages/Facility/locations/LocationList";
+
+const LocationRoutes: AppRoutes = {
+  "/facility/:facilityId/locations": ({ facilityId }) => (
+    <LocationList facilityId={facilityId} />
+  ),
+};
+
+export default LocationRoutes;

src/Routers/routes/PatientRoutes.tsx

@@ -1,3 +1,5 @@
+import { Redirect } from "raviger";
+
 import {
   facilityPatientTabs,
   patientTabs,
@@ -7,15 +9,18 @@ import PatientIndex from "@/components/Patient/PatientIndex";
 import PatientRegistration from "@/components/Patient/PatientRegistration";
 
 import { AppRoutes } from "@/Routers/AppRouter";
-import { EncounterList } from "@/pages/Encounters/EncounterList";
+import EncountersOverview from "@/pages/Encounters/EncountersOverview";
 import VerifyPatient from "@/pages/Patients/VerifyPatient";
 
 const PatientRoutes: AppRoutes = {
   "/facility/:facilityId/patients": ({ facilityId }) => (
     <PatientIndex facilityId={facilityId} />
   ),
   "/facility/:facilityId/encounters": ({ facilityId }) => (
-    <EncounterList facilityId={facilityId} />
+    <Redirect to={`/facility/${facilityId}/encounters/patients`} />
+  ),
+  "/facility/:facilityId/encounters/:tab": ({ facilityId, tab }) => (
+    <EncountersOverview facilityId={facilityId} tab={tab} />
   ),
   "/facility/:facilityId/patients/verify": ({ facilityId }) => (
     <VerifyPatient facilityId={facilityId} />

src/components/Encounter/EncounterInfoCard.tsx

@@ -0,0 +1,120 @@
+import { Separator } from "@radix-ui/react-separator";
+import { format } from "date-fns";
+import { Link } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import { cn } from "@/lib/utils";
+
+import CareIcon from "@/CAREUI/icons/CareIcon";
+
+import { Badge } from "@/components/ui/badge";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/components/ui/card";
+
+import { Encounter } from "@/types/emr/encounter";
+
+export interface EncounterInfoCardProps {
+  encounter: Encounter;
+  facilityId: string;
+  hideBorder?: boolean;
+}
+
+const getStatusColor = (status: string) => {
+  switch (status) {
+    case "planned":
+      return "bg-blue-100 text-blue-800";
+    case "in_progress":
+      return "bg-yellow-100 text-yellow-800";
+    case "completed":
+      return "bg-green-100 text-green-800";
+    case "cancelled":
+      return "bg-red-100 text-red-800";
+    default:
+      return "bg-gray-100 text-gray-800";
+  }
+};
+
+const getPriorityColor = (priority: string) => {
+  switch (priority) {
+    case "stat":
+      return "bg-red-100 text-red-800";
+    case "urgent":
+      return "bg-orange-100 text-orange-800";
+    case "asap":
+      return "bg-yellow-100 text-yellow-800";
+    default:
+      return "bg-gray-100 text-gray-800";
+  }
+};
+
+export default function EncounterInfoCard(props: EncounterInfoCardProps) {
+  const { t } = useTranslation();
+
+  const { encounter, facilityId, hideBorder = false } = props;
+  return (
+    <Card
+      key={props.encounter.id}
+      className={cn(
+        "hover:shadow-lg transition-shadow group",
+        hideBorder && "border-none shadow-none",
+      )}
+    >
+      <CardHeader className="space-y-1 pb-2">
+        <div className="flex items-center justify-between">
+          <Link
+            href={`/facility/${facilityId}/patient/${encounter.patient.id}`}
+            className="hover:text-primary"
+          >
+            <CardTitle className="group-hover:text-primary transition-colors">
+              {encounter.patient.name}
+              {encounter.patient.death_datetime && (
+                <Badge variant="destructive" className="ml-2 py-0">
+                  <h3 className="text-xs font-medium">{t("expired")}</h3>
+                </Badge>
+              )}
+            </CardTitle>
+          </Link>
+        </div>
+        <CardDescription className="flex items-center">
+          <CareIcon icon="l-clock" className="mr-2 h-4 w-4" />
+          {encounter.period.start &&
+            format(new Date(encounter.period.start), "PPp")}
+        </CardDescription>
+      </CardHeader>
+      <CardContent className="">
+        <div className="flex flex-col space-y-2">
+          <div className="flex flex-wrap items-center gap-2">
+            <Badge
+              className={getStatusColor(encounter.status)}
+              variant="outline"
+            >
+              {t(`encounter_status__${encounter.status}`)}
+            </Badge>
+            <Badge className="bg-gray-100 text-gray-800" variant="outline">
+              {t(`encounter_class__${encounter.encounter_class}`)}
+            </Badge>
+            <Badge
+              className={getPriorityColor(encounter.priority)}
+              variant="outline"
+            >
+              {t(`encounter_priority__${encounter.priority}`)}
+            </Badge>
+          </div>
+          <Separator className="my-2" />
+          <Link
+            href={`/facility/${facilityId}/patient/${encounter.patient.id}/encounter/${encounter.id}/updates`}
+            className="text-sm text-primary hover:underline text-right flex items-center justify-end group-hover:translate-x-1 transition-transform"
+          >
+            View Details
+            <CareIcon icon="l-arrow-right" className="ml-1 h-4 w-4" />
+          </Link>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}

src/components/ui/sidebar/facility-nav.tsx

@@ -34,7 +34,16 @@ function generateFacilityLinks(
       url: `${baseUrl}/patients`,
       icon: "d-patient",
     },
-    { name: t("encounters"), url: `${baseUrl}/encounters`, icon: "d-patient" },
+    {
+      name: t("locations"),
+      url: `${baseUrl}/locations`,
+      icon: "d-patient",
+    },
+    {
+      name: t("encounters"),
+      url: `${baseUrl}/encounters`,
+      icon: "d-patient",
+    },
     {
       name: t("resource"),
       url: `${baseUrl}/resource`,