- {getLocationFormLabel(location.form)}
+ {t(`location_form__${location.form}`)}
diff --git a/src/pages/Facility/settings/organizations/components/CreateFacilityOrganizationSheet.tsx b/src/pages/Facility/settings/organizations/components/CreateFacilityOrganizationSheet.tsx
index 741ec7aa046..533e69941a7 100644
--- a/src/pages/Facility/settings/organizations/components/CreateFacilityOrganizationSheet.tsx
+++ b/src/pages/Facility/settings/organizations/components/CreateFacilityOrganizationSheet.tsx
@@ -40,7 +40,7 @@ const ORG_TYPES = [
type OrgType = (typeof ORG_TYPES)[number]["value"];
-export default function CreateFacilityOrganizationSheet({
+export default function FacilityOrganizationSheet({
facilityId,
parentId,
}: Props) {
diff --git a/src/types/common/contactPoint.ts b/src/types/common/contactPoint.ts
new file mode 100644
index 00000000000..d66f42bf100
--- /dev/null
+++ b/src/types/common/contactPoint.ts
@@ -0,0 +1,73 @@
+import { z } from "zod";
+
+import validators from "@/Utils/validators";
+
+export const ContactPointSystems = [
+ "phone",
+ "fax",
+ "email",
+ "pager",
+ "url",
+ "sms",
+ "other",
+] as const;
+
+export type ContactPointSystem = (typeof ContactPointSystems)[number];
+
+export const ContactPointUses = ["home", "work", "temp", "mobile"] as const;
+
+export type ContactPointUse = (typeof ContactPointUses)[number];
+
+export interface ContactPoint {
+ system: ContactPointSystem;
+ value: string;
+ use: ContactPointUse;
+}
+
+export const contactPointSchema = z.discriminatedUnion("system", [
+ // Phone numbers
+ z.object({
+ system: z.literal("phone"),
+ value: validators().phoneNumber.required,
+ use: z.enum(ContactPointUses),
+ }),
+ // Fax numbers (also using phone validation since they follow same format)
+ z.object({
+ system: z.literal("fax"),
+ value: validators().phoneNumber.required,
+ use: z.enum(ContactPointUses),
+ }),
+ // Email addresses
+ z.object({
+ system: z.literal("email"),
+ value: z.string().email(),
+ use: z.enum(ContactPointUses),
+ }),
+ // URLs
+ z.object({
+ system: z.literal("url"),
+ value: z.string().url(),
+ use: z.enum(ContactPointUses),
+ }),
+ // SMS (also using phone validation)
+ z.object({
+ system: z.literal("sms"),
+ value: validators().phoneNumber.required,
+ use: z.enum(ContactPointUses),
+ }),
+ // Pager (typically numeric, but can vary)
+ z.object({
+ system: z.literal("pager"),
+ value: z
+ .string()
+ .min(1, { message: "Required" })
+ .max(20, { message: "Pager number too long" }),
+ use: z.enum(ContactPointUses),
+ }),
+ // Other (catch-all with basic validation)
+ z.object({
+ system: z.literal("other"),
+ value: z.string().min(1, { message: "Required" }),
+ use: z.enum(ContactPointUses),
+ }),
+]);
diff --git a/src/types/device/device.ts b/src/types/device/device.ts
new file mode 100644
index 00000000000..60ec9aa9ff8
--- /dev/null
+++ b/src/types/device/device.ts
@@ -0,0 +1,53 @@
+import { ContactPoint } from "@/types/common/contactPoint";
+import { Encounter } from "@/types/emr/encounter";
+import { LocationList } from "@/types/location/location";
+import { UserBase } from "@/types/user/user";
+
+export const DeviceStatuses = [
+ "active",
+ "inactive",
+ "entered_in_error",
+] as const;
+
+export type DeviceStatus = (typeof DeviceStatuses)[number];
+
+export const DeviceAvailabilityStatuses = [
+ "lost",
+ "damaged",
+ "destroyed",
+ "available",
+] as const;
+
+export type DeviceAvailabilityStatus =
+ (typeof DeviceAvailabilityStatuses)[number];
+
+export interface DeviceBase {
+ identifier?: string;
+ status: DeviceStatus;
+ availability_status: DeviceAvailabilityStatus;
+ manufacturer?: string;
+ manufacture_date?: string; // datetime
+ expiration_date?: string; // datetime
+ lot_number?: string;
+ serial_number?: string;
+ registered_name: string;
+ user_friendly_name?: string;
+ model_number?: string;
+ part_number?: string;
+ contact: ContactPoint[];
+ // care_type: string | undefined;
+}
+
+export interface DeviceDetail extends DeviceBase {
+ id: string;
+ current_encounter: Encounter | undefined;
+ current_location: LocationList | undefined;
+ created_by: UserBase;
+ updated_by: UserBase;
+}
+
+export interface DeviceList extends DeviceBase {
+ id: string;
+}
+
+export type DeviceWrite = DeviceBase;
diff --git a/src/types/device/deviceApi.ts b/src/types/device/deviceApi.ts
new file mode 100644
index 00000000000..929c13a25a6
--- /dev/null
+++ b/src/types/device/deviceApi.ts
@@ -0,0 +1,47 @@
+import { HttpMethod, Type } from "@/Utils/request/api";
+import { PaginatedResponse } from "@/Utils/request/types";
+
+import { DeviceDetail, DeviceList, DeviceWrite } from "./device";
+
+export default {
+ list: {
+ path: "/api/v1/facility/{facility_id}/device/",
+ method: HttpMethod.GET,
+ TRes: Type
>(),
+ },
+ create: {
+ path: "/api/v1/facility/{facility_id}/device/",
+ method: HttpMethod.POST,
+ TRes: Type(),
+ TBody: Type(),
+ },
+ retrieve: {
+ path: "/api/v1/facility/{facility_id}/device/{id}/",
+ method: HttpMethod.GET,
+ TRes: Type(),
+ },
+ update: {
+ path: "/api/v1/facility/{facility_id}/device/{id}/",
+ method: HttpMethod.PUT,
+ TRes: Type(),
+ TBody: Type(),
+ },
+ delete: {
+ path: "/api/v1/facility/{facility_id}/device/{id}/",
+ method: HttpMethod.DELETE,
+ TRes: Type(),
+ TBody: Type(),
+ },
+ upsert: {
+ path: "/api/v1/facility/{facility_id}/device/upsert/",
+ method: HttpMethod.POST,
+ TRes: Type(),
+ TBody: Type(),
+ },
+ associateLocation: {
+ path: "/api/v1/facility/{facility_id}/device/{id}/associate_location/",
+ method: HttpMethod.POST,
+ TRes: Type(),
+ TBody: Type<{ location: string }>(),
+ },
+};
diff --git a/src/types/location/location.ts b/src/types/location/location.ts
index 3738dce63f7..3c67a72e6cf 100644
--- a/src/types/location/location.ts
+++ b/src/types/location/location.ts
@@ -9,22 +9,7 @@ export type OperationalStatus = "C" | "H" | "O" | "U" | "K" | "I";
export type LocationMode = "instance" | "kind";
-export type LocationForm =
- | "si"
- | "bu"
- | "wi"
- | "wa"
- | "lvl"
- | "co"
- | "ro"
- | "bd"
- | "ve"
- | "ho"
- | "ca"
- | "rd"
- | "area"
- | "jdn"
- | "vi";
+export type LocationForm = (typeof LocationFormOptions)[number];
export interface LocationBase {
status: Status;
@@ -55,24 +40,20 @@ export interface LocationWrite extends LocationBase {
mode: LocationMode;
}
-export const locationFormOptions = [
- { value: "si", label: "Site" },
- { value: "bu", label: "Building" },
- { value: "wi", label: "Wing" },
- { value: "wa", label: "Ward" },
- { value: "lvl", label: "Level" },
- { value: "co", label: "Corridor" },
- { value: "ro", label: "Room" },
- { value: "bd", label: "Bed" },
- { value: "ve", label: "Vehicle" },
- { value: "ho", label: "House" },
- { value: "ca", label: "Cabinet" },
- { value: "rd", label: "Road" },
- { value: "area", label: "Area" },
- { value: "jdn", label: "Jurisdiction" },
- { value: "vi", label: "Virtual" },
-];
-
-export const getLocationFormLabel = (value: LocationForm) => {
- return locationFormOptions.find((option) => option.value === value)?.label;
-};
+export const LocationFormOptions = [
+ "si",
+ "bu",
+ "wi",
+ "wa",
+ "lvl",
+ "co",
+ "ro",
+ "bd",
+ "ve",
+ "ho",
+ "ca",
+ "rd",
+ "area",
+ "jdn",
+ "vi",
+] as const;