Medication Request redesign

public/locale/en.json

@@ -339,6 +339,7 @@
   "add_skill": "Add Skill",
   "add_spoke": "Add Spoke Facility",
   "additional_information": "Additional Information",
+  "additional_instructions": "Additional Instructions",
   "address": "Address",
   "administer": "Administer",
   "administer_medicine": "Administer Medicine",
@@ -395,6 +396,7 @@
   "are_you_sure_want_to_remove": "Are you sure you want to remove {{name}} from the patient? This action cannot be undone",
   "ari": "ARI - Acute Respiratory illness",
   "arrived": "Arrived",
+  "as_needed_prn": "As Needed / PRN",
   "asset_class": "Asset Class",
   "asset_location": "Asset Location",
   "asset_name": "Asset Name",
@@ -1046,12 +1048,14 @@
   "information_source_user": "Hospital Staff",
   "inidcator_event": "Indicator Event",
   "instruction_on_titration": "Instruction on titration",
+  "instructions": "Instructions",
   "insurance__insurer_id": "Insurer ID",
   "insurance__insurer_name": "Insurer Name",
   "insurance__member_id": "Member ID",
   "insurance__policy_name": "Policy ID / Policy Name",
   "insurance_details_detail": "Include details of all the Insurance Policies held by the Patient for smooth insurance processing",
   "insurer_name_required": "Insurer Name is required",
+  "intent": "Intent",
   "international_mobile": "International Mobile",
   "invalid_asset_id_msg": "Oops! The asset ID you entered does not appear to be valid.",
   "invalid_date_format": "Invalid date format, expected {{format}}",
@@ -1192,6 +1196,7 @@
   "medicines_administered": "Medicine(s) administered",
   "medicines_administered_error": "Error administering medicine(s)",
   "member_id_required": "Member Id is required",
+  "method": "Method",
   "middleware_hostname": "Middleware Hostname",
   "middleware_hostname_example": "e.g. example.ohc.network",
   "middleware_hostname_sourced_from": "Middleware hostname sourced from {{ source }}",
@@ -1624,31 +1629,39 @@
   "search_icd11_placeholder": "Search for ICD-11 Diagnoses",
   "search_investigation_placeholder": "Search Investigation & Groups",
   "search_medication": "Search Medication",
+  "search_medications": "Search for medications to add",
   "search_patients": "Search Patients",
   "search_resource": "Search Resource",
   "search_user": "Search User",
   "search_user_description": "Search for a user and assign a role to add them to the patient.",
   "searching": "Searching...",
   "see_attachments": "See Attachments",
   "select": "Select",
+  "select_additional_instructions": "Select additional instructions",
   "select_all": "Select All",
   "select_date": "Select date",
   "select_department": "Select Department",
   "select_eligible_policy": "Select an Eligible Insurance Policy",
   "select_facility_for_discharged_patients_warning": "Facility needs to be selected to view discharged patients.",
   "select_for_administration": "Select for Administration",
+  "select_frequency": "Select frequency",
   "select_groups": "Select Groups",
+  "select_intent": "Select intent",
   "select_investigation": "Select Investigations (all investigations will be selected by default)",
   "select_investigation_groups": "Select Investigation Groups",
   "select_investigations": "Select Investigations",
   "select_local_body": "Select Local Body",
+  "select_method": "Select method",
   "select_patient": "Select Patient",
   "select_policy": "Select an Insurance Policy",
   "select_policy_to_add_items": "Select a Policy to Add Items",
   "select_practitioner": "Select Practicioner",
+  "select_prn_reason": "Select reason for PRN",
   "select_register_patient": "Select/Register Patient",
   "select_role": "Select Role",
+  "select_route": "Select route",
   "select_seven_day_period": "Select a seven day period",
+  "select_site": "Select site",
   "select_skills": "Select and add some skills",
   "select_time": "Select time",
   "select_time_slot": "Select time slot",
@@ -1693,6 +1706,7 @@
   "show_unread_notifications": "Show Unread",
   "sign_in": "Sign in",
   "sign_out": "Sign out",
+  "site": "Site",
   "skill_add_error": "Error while adding skill",
   "skill_added_successfully": "Skill added successfully",
   "skills": "Skills",

src/components/Common/QuantityInput.tsx

@@ -18,6 +18,8 @@ interface Props<TUnit extends string> {
   units: readonly TUnit[];
   disabled?: boolean;
   placeholder?: string;
+  autoFocus?: boolean;
+  unitLabels?: Record<TUnit, string>;
 }
 
 const QuantityInput = <TUnit extends string>({
@@ -26,6 +28,8 @@ const QuantityInput = <TUnit extends string>({
   onChange,
   disabled,
   placeholder,
+  autoFocus,
+  unitLabels,
 }: Props<TUnit>) => {
   const handleChange = (update: Partial<QuantityValue<TUnit>>) => {
     onChange({ ...quantity, ...update });
@@ -44,6 +48,7 @@ const QuantityInput = <TUnit extends string>({
             value: e.target.value ? Number(e.target.value) : undefined,
           })
         }
+        autoFocus={autoFocus}
       />
       <Select
         disabled={disabled}
@@ -57,7 +62,7 @@ const QuantityInput = <TUnit extends string>({
         <SelectContent>
           {units.map((unit) => (
             <SelectItem key={unit} value={unit}>
-              {unit}
+              {unitLabels?.[unit] ?? unit}
             </SelectItem>
           ))}
         </SelectContent>

src/components/Medicine/MedicineAdministrationSheet/index.tsx

@@ -17,7 +17,10 @@ import useSlug from "@/hooks/useSlug";
 import routes from "@/Utils/request/api";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
 import { classNames } from "@/Utils/utils";
-import { MedicationRequest } from "@/types/emr/medicationRequest";
+import {
+  BOUNDS_DURATION_UNITS,
+  MedicationRequest,
+} from "@/types/emr/medicationRequest";
 
 interface Props {
   readonly?: boolean;
@@ -324,6 +327,16 @@ const PrescriptionEntry = ({
           </span>
         )}
       </div>
+      {instruction.timing?.repeat?.bounds_duration && (
+        <div className="mt-1 text-xs text-muted-foreground">
+          <span className="text-muted-foreground">Duration:</span>{" "}
+          {instruction.timing.repeat.bounds_duration.value}{" "}
+          {instruction.timing.repeat.bounds_duration.unit &&
+            BOUNDS_DURATION_UNITS[
+              instruction.timing.repeat.bounds_duration.unit
+            ]?.label}
+        </div>
+      )}
 
       {/* Additional Instructions */}
       {additionalInstructions && additionalInstructions.length > 0 && (

src/components/Questionnaire/QuestionRenderer.tsx

@@ -1,11 +1,21 @@
 import { useEffect, useRef } from "react";
 
+import { cn } from "@/lib/utils";
+
 import { QuestionValidationError } from "@/types/questionnaire/batch";
 import { QuestionnaireResponse } from "@/types/questionnaire/form";
-import { Question } from "@/types/questionnaire/question";
+import {
+  Question,
+  StructuredQuestionType,
+} from "@/types/questionnaire/question";
 
 import { QuestionGroup } from "./QuestionTypes/QuestionGroup";
 
+// Questions that should be rendered full width
+const FULL_WIDTH_QUESTION_TYPES: StructuredQuestionType[] = [
+  "medication_request",
+];
+
 interface QuestionRendererProps {
   questions: Question[];
   responses: QuestionnaireResponse[];
@@ -55,12 +65,22 @@ export function QuestionRenderer({
     onResponseChange(newResponses);
   };
 
+  const shouldBeFullWidth = (question: Question): boolean => {
+    if (question.type !== "structured" || !question.structured_type) {
+      return false;
+    }
+    return FULL_WIDTH_QUESTION_TYPES.includes(question.structured_type);
+  };
+
   return (
     <div className="space-y-4">
       {questions.map((question) => (
         <div
           key={question.id}
           ref={(el) => (questionRefs.current[question.id] = el)}
+          className={cn(
+            shouldBeFullWidth(question) ? "md:w-auto" : "max-w-4xl",
+          )}
         >
           <QuestionGroup
             facilityId={facilityId}