Add support for Location Assignment Question

src/common/constants.tsx

@@ -9,6 +9,7 @@ export const LocalStorageKeys = {
   accessToken: "care_access_token",
   refreshToken: "care_refresh_token",
   patientTokenKey: "care_patient_token",
+  loginPreference: "care_login_preference",
 };
 
 export interface OptionsType {

src/components/Auth/Login.tsx

@@ -1,7 +1,7 @@
 import careConfig from "@careConfig";
 import { useMutation } from "@tanstack/react-query";
 import { Link, useQueryParams } from "raviger";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import ReCaptcha from "react-google-recaptcha";
 import { useTranslation } from "react-i18next";
 import { isValidPhoneNumber } from "react-phone-number-input";
@@ -31,6 +31,8 @@
 
 import { useAuthContext } from "@/hooks/useAuthUser";
 
+import { LocalStorageKeys } from "@/common/constants";
+
 import FiltersCache from "@/Utils/FiltersCache";
 import ViewCache from "@/Utils/ViewCache";
 import routes from "@/Utils/request/api";
@@ -75,14 +77,14 @@
   const { reCaptchaSiteKey, urls, stateLogo, customLogo, customLogoAlt } =
     careConfig;
   const customDescriptionHtml = __CUSTOM_DESCRIPTION_HTML__;
   const initForm: any = {
     username: "",
     password: "",
   };
   const { forgot } = props;
   const [params] = useQueryParams();
   const { mode } = params;
   const initErr: any = {};
   const [form, setForm] = useState(initForm);
   const [errors, setErrors] = useState(initErr);
   const [isCaptchaEnabled, setCaptcha] = useState(false);
@@ -97,6 +99,11 @@
   const [otpError, setOtpError] = useState<string>("");
   const [otpValidationError, setOtpValidationError] = useState<string>("");
 
+  // Remember the last login mode
+  useEffect(() => {
+    localStorage.setItem(LocalStorageKeys.loginPreference, loginMode);
+  }, [loginMode]);
+
   // Staff Login Mutation
   const staffLoginMutation = useMutation({
     mutationFn: async (data: LoginFormData) => {

src/components/Common/LoginHeader.tsx

@@ -74,7 +74,14 @@ export const LoginHeader = () => {
         <Button
           variant="ghost"
           className="text-sm font-medium hover:bg-gray-100 rounded-full px-6"
-          onClick={() => navigate("/login?mode=patient")}
+          onClick={() =>
+            navigate(
+              `/login?mode=${
+                localStorage.getItem(LocalStorageKeys.loginPreference) ??
+                "patient"
+              }`,
+            )
+          }
         >
           {t("sign_in")}
         </Button>

src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx

@@ -23,6 +23,7 @@ import { Encounter } from "@/types/emr/encounter";
 import { MedicationRequest } from "@/types/emr/medicationRequest";
 import { MedicationStatementRequest } from "@/types/emr/medicationStatement";
 import { SymptomRequest } from "@/types/emr/symptom/symptom";
+import { LocationAssociationQuestion } from "@/types/location/association";
 import { Question } from "@/types/questionnaire/question";
 import { QuestionnaireResponse } from "@/types/questionnaire/questionnaireResponse";
 import { CreateAppointmentQuestion } from "@/types/scheduling/schedule";
@@ -32,6 +33,7 @@ interface Props {
   patientId: string;
 }
 
+// TODO: Ensure that this type is not defined elsewhere.
 type ResponseValueType = {
   value?:
     | string
@@ -44,7 +46,8 @@ type ResponseValueType = {
     | MedicationStatementRequest[]
     | SymptomRequest[]
     | DiagnosisRequest[]
-    | CreateAppointmentQuestion;
+    | CreateAppointmentQuestion[]
+    | LocationAssociationQuestion[];
   value_quantity?: {
     value: number;
   };

src/components/Location/LocationSearch.tsx

@@ -0,0 +1,84 @@
+import { useQuery } from "@tanstack/react-query";
+import { useState } from "react";
+
+import {
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+} from "@/components/ui/command";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+
+import query from "@/Utils/request/query";
+import { LocationList } from "@/types/location/location";
+import locationApi from "@/types/location/locationApi";
+
+interface LocationSearchProps {
+  facilityId: string;
+  mode?: "kind" | "location";
+  onSelect: (location: LocationList) => void;
+  disabled?: boolean;
+  value?: LocationList | null;
+}
+
+export function LocationSearch({
+  facilityId,
+  mode,
+  onSelect,
+  disabled,
+  value,
+}: LocationSearchProps) {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+
+  const { data: locations } = useQuery({
+    queryKey: ["locations", facilityId, mode, search],
+    queryFn: query(locationApi.list, {
+      pathParams: { facility_id: facilityId },
+      queryParams: { mode, search },
+    }),
+  });
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild disabled={disabled}>
+        <div
+          className="w-full h-9 px-3 rounded-md border border-input bg-background text-sm ring-offset-background flex items-center justify-between cursor-pointer"
+          role="combobox"
+          aria-expanded={open}
+        >
+          {value?.name || "Select location..."}
+        </div>
+      </PopoverTrigger>
+      <PopoverContent className="w-[400px] p-0">
+        <Command>
+          <CommandInput
+            placeholder="Search locations..."
+            value={search}
+            onValueChange={setSearch}
+          />
+          <CommandEmpty>No locations found.</CommandEmpty>
+          <CommandGroup>
+            {locations?.results.map((location) => (
+              <CommandItem
+                key={location.id}
+                value={location.name}
+                onSelect={() => {
+                  onSelect(location);
+                  setOpen(false);
+                }}
+              >
+                {location.name}
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        </Command>
+      </PopoverContent>
+    </Popover>
+  );
+}

src/components/Questionnaire/QuestionTypes/LocationQuestion.tsx

@@ -0,0 +1,116 @@
+import { format } from "date-fns";
+import React, { useState } from "react";
+
+import { Input } from "@/components/ui/input";
+
+import { LocationSearch } from "@/components/Location/LocationSearch";
+
+import { LocationAssociationQuestion } from "@/types/location/association";
+import { LocationList } from "@/types/location/location";
+import {
+  QuestionnaireResponse,
+  ResponseValue,
+} from "@/types/questionnaire/form";
+import { Question } from "@/types/questionnaire/question";
+
+interface LocationQuestionProps {
+  question: Question;
+  questionnaireResponse: QuestionnaireResponse;
+  updateQuestionnaireResponseCB: (
+    values: ResponseValue[],
+    questionId: string,
+    note?: string,
+  ) => void;
+  disabled?: boolean;
+  facilityId: string;
+  locationId: string;
+  encounterId: string;
+}
+
+export function LocationQuestion({
+  questionnaireResponse,
+  updateQuestionnaireResponseCB,
+  disabled,
+  facilityId,
+  encounterId,
+}: LocationQuestionProps) {
+  const [selectedLocation, setSelectedLocation] = useState<LocationList | null>(
+    null,
+  );
+
+  const values =
+    (questionnaireResponse.values?.[0]
+      ?.value as unknown as LocationAssociationQuestion[]) || [];
+
+  const association = values[0] ?? {};
+
+  const handleUpdateAssociation = (
+    updates: Partial<LocationAssociationQuestion>,
+  ) => {
+    const newAssociation: LocationAssociationQuestion = {
+      id: association?.id || null,
+      encounter: encounterId,
+      start_datetime: association?.start_datetime || new Date().toISOString(),
+      end_datetime: null,
+      status: "active",
+      location: association?.location || "",
+      meta: {},
+      created_by: null,
+      updated_by: null,
+      ...updates,
+    };
+
+    updateQuestionnaireResponseCB(
+      [{ type: "location_association", value: [newAssociation] }],
+      questionnaireResponse.question_id,
+    );
+  };
+
+  const handleLocationSelect = (location: LocationList) => {
+    setSelectedLocation(location);
+    handleUpdateAssociation({ location: location.id });
+  };
+
+  return (
+    <div className="space-y-4">
+      <div className="rounded-lg border p-4 space-y-4">
+        <div>
+          <label className="text-sm font-medium mb-1 block">
+            Select Location
+          </label>
+          <LocationSearch
+            mode="kind"
+            facilityId={facilityId}
+            onSelect={handleLocationSelect}
+            disabled={disabled}
+            value={selectedLocation}
+          />
+        </div>
+
+        {selectedLocation && (
+          <div>
+            <label className="text-sm font-medium mb-1 block">Start Time</label>
+            <Input
+              type="datetime-local"
+              value={
+                association?.start_datetime
+                  ? format(
+                      new Date(association.start_datetime),
+                      "yyyy-MM-dd'T'HH:mm",
+                    )
+                  : format(new Date(), "yyyy-MM-dd'T'HH:mm")
+              }
+              onChange={(e) =>
+                handleUpdateAssociation({
+                  start_datetime: new Date(e.target.value).toISOString(),
+                })
+              }
+              disabled={disabled}
+              className="h-9"
+            />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

src/components/Questionnaire/QuestionTypes/QuestionInput.tsx

@@ -20,6 +20,7 @@ import { ChoiceQuestion } from "./ChoiceQuestion";
 import { DateTimeQuestion } from "./DateTimeQuestion";
 import { DiagnosisQuestion } from "./DiagnosisQuestion";
 import { EncounterQuestion } from "./EncounterQuestion";
+import { LocationQuestion } from "./LocationQuestion";
 import { MedicationRequestQuestion } from "./MedicationRequestQuestion";
 import { MedicationStatementQuestion } from "./MedicationStatementQuestion";
 import { NotesInput } from "./NotesInput";
@@ -167,6 +168,18 @@ export function QuestionInput({
               );
             }
             return null;
+          case "location_association":
+            if (encounterId) {
+              return (
+                <LocationQuestion
+                  {...commonProps}
+                  facilityId={facilityId}
+                  locationId={patientId}
+                  encounterId={encounterId}
+                />
+              );
+            }
+            return null;
         }
         return null;
 

src/components/Questionnaire/QuestionnaireEditor.tsx

@@ -63,6 +63,17 @@ interface QuestionnaireEditorProps {
   id?: string;
 }
 
+const STRUCTURED_QUESTION_TYPES = [
+  { value: "allergy_intolerance", label: "Allergy Intolerance" },
+  { value: "medication_request", label: "Medication Request" },
+  { value: "medication_statement", label: "Medication Statement" },
+  { value: "symptom", label: "Symptom" },
+  { value: "diagnosis", label: "Diagnosis" },
+  { value: "encounter", label: "Encounter" },
+  { value: "appointment", label: "Appointment" },
+  { value: "location_association", label: "Location Association" },
+] as const;
+
 export default function QuestionnaireEditor({ id }: QuestionnaireEditorProps) {
   const navigate = useNavigate();
   const [activeTab, setActiveTab] = useState<"edit" | "preview">("edit");
@@ -832,19 +843,11 @@ function QuestionEditor({
                     <SelectValue placeholder="Select structured type" />
                   </SelectTrigger>
                   <SelectContent>
-                    <SelectItem value="allergy_intolerance">
-                      Allergy Intolerance
-                    </SelectItem>
-                    <SelectItem value="medication_request">
-                      Medication Request
-                    </SelectItem>
-                    <SelectItem value="medication_statement">
-                      Medication Statement
-                    </SelectItem>
-                    <SelectItem value="symptom">Symptom</SelectItem>
-                    <SelectItem value="diagnosis">Diagnosis</SelectItem>
-                    <SelectItem value="encounter">Encounter</SelectItem>
-                    <SelectItem value="appointment">Appointment</SelectItem>
+                    {STRUCTURED_QUESTION_TYPES.map((type) => (
+                      <SelectItem key={type.value} value={type.value}>
+                        {type.label}
+                      </SelectItem>
+                    ))}
                   </SelectContent>
                 </Select>
               </div>

src/components/Questionnaire/QuestionnaireForm.tsx

@@ -262,13 +262,18 @@ export function QuestionnaireForm({
     // Continue with existing submission logic...
     const requests: BatchRequest[] = [];
     if (encounterId && patientId) {
-      const context = { patientId, encounterId };
+      const context = { facilityId, patientId, encounterId };
       // First, collect all structured data requests if encounterId is provided
       formsWithValidation.forEach((form) => {
         form.responses.forEach((response) => {
           if (response.structured_type) {
+            console.log(
+              "Processing structured response",
+              response.structured_type,
+            );
             const structuredData = response.values?.[0]?.value;
             if (Array.isArray(structuredData) && structuredData.length > 0) {
+              console.log("Structured data found", structuredData);
               const structuredRequests = getStructuredRequests(
                 response.structured_type,
                 structuredData,

src/components/Questionnaire/QuestionnaireSearch.tsx

@@ -47,6 +47,7 @@ export function QuestionnaireSearch({
           ...conditionalAttribute(!!subjectType, {
             subject_type: subjectType,
           }),
+          status: "active",
         },
       }),
     });