@openmrs/esm-patient-medications-app 11.3.1-patch.9064 → 11.3.1-patch.9508

package/src/api/api.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import useSWR, { useSWRConfig } from 'swr';
 import useSWRImmutable from 'swr/immutable';
-import { openmrsFetch, restBaseUrl, useConfig, type FetchResponse } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl, useConfig, useOpenmrsFetchAll, type FetchResponse } from '@openmrs/esm-framework';
 import type { DrugOrderPost, PatientOrderFetchResponse, Order } from '@openmrs/esm-patient-common-lib';
 import { type ConfigObject } from '../config-schema';
 import { type DrugOrderBasketItem } from '../types';
@@ -229,3 +229,20 @@ export function useRequireOutpatientQuantity(): {
 
   return results;
 }
+
+export interface Provider {
+  uuid: string;
+  person: {
+    display?: string;
+  };
+}
+
+export function useProviders(providerRoles: Array<string>) {
+  const rep = 'custom:(uuid,person:(display)';
+  const ret = useOpenmrsFetchAll<Provider>(
+    providerRoles != null ? `${restBaseUrl}/provider?providerRoles=${providerRoles.join(',')}&v=${rep})` : null,
+  );
+
+  ret.data?.sort((a, b) => (a.person?.display ?? '').localeCompare(b.person?.display ?? ''));
+  return ret;
+}

package/src/components/medications-details-table.component.tsx

@@ -68,15 +68,15 @@ const MedicationsDetailsTable: React.FC<MedicationsDetailsTableProps> = ({
 }) => {
   const pageSize = 5;
   const { t } = useTranslation();
-  const launchOrderBasket = useLaunchWorkspaceRequiringVisit('order-basket');
-  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit('add-drug-order');
+  const launchOrderBasket = useLaunchWorkspaceRequiringVisit(patient.id, 'order-basket');
+  const launchAddDrugOrder = useLaunchWorkspaceRequiringVisit(patient.id, 'add-drug-order');
   const config = useConfig<ConfigObject>();
   const showPrintButton = config.showPrintButton;
   const contentToPrintRef = useRef(null);
   const { excludePatientIdentifierCodeTypes } = useConfig();
   const [isPrinting, setIsPrinting] = useState(false);
 
-  const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications');
+  const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>(patient, 'medications');
   const { results, goTo, currentPage } = usePagination(medications, pageSize);
 
   const tableHeaders = [

package/src/config-schema.ts

@@ -2,11 +2,10 @@ import { Type, validator } from '@openmrs/esm-framework';
 
 export const configSchema = {
   daysDurationUnit: {
-    _description:
-      'The default medication duration unit is days. The concept for that medication duration unit is specified here.',
     uuid: {
       _type: Type.ConceptUuid,
       _default: '1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+      _description: 'The uuid of the concept of medication duration unit in days',
     },
     display: {
       _type: Type.String,
@@ -37,6 +36,18 @@ export const configSchema = {
     _description: 'Whether to require an indication when placing a medication order',
     _default: true,
   },
+  prescriberProviderRoles: {
+    _type: Type.Array,
+    _description:
+      'Array of provider roles uuids. If specified, the drug order form shows the "Prescribing Clinician" dropdown listing all providers with one of the specified roles. (The dropdown is hidden if no providers match the role criteria.) This feature requires the providermanagement backend module. Note that, in any case, any user who can submit the drug order form may still do so with themselves as the prescriber.',
+    _default: [],
+  },
+  drugOrderEncounterType: {
+    _type: Type.UUID,
+    _description:
+      'The encounter type of the encounter for the Fill Prescription form. Defaults to the "Order" encounter type.',
+    _default: '39da3525-afe4-45ff-8977-c53b7b359158',
+  },
 };
 
 export interface ConfigObject {
@@ -48,4 +59,6 @@ export interface ConfigObject {
   showPrintButton: boolean;
   debounceDelayInMs: number;
   requireIndication: boolean;
+  prescriberProviderRoles: Array<string>;
+  drugOrderEncounterType: string;
 }

package/src/drug-order-basket-panel/drug-order-basket-panel.extension.tsx

@@ -9,6 +9,7 @@ import {
   closeWorkspace,
   launchWorkspace,
   useLayoutType,
+  type Visit,
 } from '@openmrs/esm-framework';
 import { useOrderBasket } from '@openmrs/esm-patient-common-lib';
 import { prepMedicationOrderPostData } from '../api/api';
@@ -17,13 +18,26 @@ import OrderBasketItemTile from './order-basket-item-tile.component';
 import RxIcon from './rx-icon.component';
 import styles from './drug-order-basket-panel.scss';
 
+interface OrderBasketSlotProps {
+  patientUuid: string;
+  patient: fhir.Patient;
+  visitContext: Visit;
+  mutateVisitContext: () => void;
+}
+
 /**
  * Designs: https://app.zeplin.io/project/60d59321e8100b0324762e05/screen/62c6bb9500e7671a618efa56
+ * Slotted into order-basket-slot by default
  */
-export default function DrugOrderBasketPanelExtension() {
+const DrugOrderBasketPanelExtension: React.FC<OrderBasketSlotProps> = ({ patient }) => {
   const { t } = useTranslation();
   const isTablet = useLayoutType() === 'tablet';
-  const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>('medications', prepMedicationOrderPostData);
+  const responsiveSize = isTablet ? 'md' : 'sm';
+  const { orders, setOrders } = useOrderBasket<DrugOrderBasketItem>(
+    patient,
+    'medications',
+    prepMedicationOrderPostData,
+  );
   const [isExpanded, setIsExpanded] = useState(orders.length > 0);
   const {
     incompleteOrderBasketItems,
@@ -94,7 +108,7 @@ export default function DrugOrderBasketPanelExtension() {
     <Tile
       className={classNames(isTablet ? styles.tabletTile : styles.desktopTile, { [styles.collapsedTile]: !isExpanded })}
     >
-      <div className={styles.container}>
+      <div className={classNames(isTablet ? styles.tabletContainer : styles.desktopContainer)}>
         <div className={styles.iconAndLabel}>
           <RxIcon isTablet={isTablet} />
           <h4 className={styles.heading}>{`${t('drugOrders', 'Drug orders')} (${orders.length})`}</h4>
@@ -106,7 +120,7 @@ export default function DrugOrderBasketPanelExtension() {
             renderIcon={(props: ComponentProps<typeof AddIcon>) => <AddIcon size={16} {...props} />}
             iconDescription="Add medication"
             onClick={openDrugSearch}
-            size={isTablet ? 'md' : 'sm'}
+            size={responsiveSize}
           >
             {t('add', 'Add')}
           </Button>
@@ -120,6 +134,7 @@ export default function DrugOrderBasketPanelExtension() {
             iconDescription="View"
             disabled={orders.length === 0}
             onClick={() => setIsExpanded(!isExpanded)}
+            size={responsiveSize}
           >
             {t('add', 'Add')}
           </Button>
@@ -194,4 +209,6 @@ export default function DrugOrderBasketPanelExtension() {
       )}
     </Tile>
   );
-}
+};
+
+export default DrugOrderBasketPanelExtension;

package/src/drug-order-basket-panel/drug-order-basket-panel.scss

@@ -3,17 +3,40 @@
 @use '@carbon/type';
 @use '@openmrs/esm-styleguide/src/vars' as *;
 
+.desktopContainer {
+  background-color: colors.$gray-10;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  text-align: left;
+}
+
+.tabletContainer {
+  @extend .desktopContainer;
+  background-color: colors.$white-0;
+}
+
 .desktopTile {
-  border-left: layout.$spacing-02 solid colors.$purple-70;
-  background-color: $ui-02;
-  border-top: 1px solid colors.$purple-20;
+  position: relative;
+  border-left: layout.$spacing-02 solid colors.$cyan-70;
+  background-color: colors.$white-0;
   border-right: none;
   padding: 0;
+
+  &::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 1px;
+    background-color: colors.$cyan-20;
+  }
 }
 
 .tabletTile {
   @extend .desktopTile;
-  border-top: 1px solid #3778c1;
+  border-top: 1px solid colors.$cyan-20;
 }
 
 .collapsedTile {
@@ -29,14 +52,6 @@
   border-bottom: 1px solid $grey-2;
 }
 
-.container {
-  background-color: $ui-02;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  text-align: left;
-}
-
 .desktopTile .container {
   h4 {
     @include type.type-style('heading-compact-02');

package/src/drug-order-basket-panel/drug-order-basket-panel.test.tsx

@@ -3,7 +3,7 @@ import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getByTextWithMarkup } from 'tools';
 import { type DrugOrderBasketItem } from '../types';
-import { mockDrugSearchResultApiData, mockPatientDrugOrdersApiData } from '__mocks__';
+import { mockDrugSearchResultApiData, mockFhirPatient, mockPatientDrugOrdersApiData } from '__mocks__';
 import { getTemplateOrderBasketItem } from '../add-drug-order/drug-search/drug-search.resource';
 import DrugOrderBasketPanel from './drug-order-basket-panel.extension';
 
@@ -14,10 +14,17 @@ jest.mock('@openmrs/esm-patient-common-lib', () => ({
   useOrderBasket: () => mockUseOrderBasket(),
 }));
 
+const testProps = {
+  patient: mockFhirPatient,
+  patientUuid: mockFhirPatient.id,
+  visitContext: null,
+  mutateVisitContext: null,
+};
+
 describe('OrderBasketPanel', () => {
   test('renders an empty state when no items are selected in the order basket', () => {
     mockUseOrderBasket.mockReturnValue({ orders: [] });
-    render(<DrugOrderBasketPanel />);
+    render(<DrugOrderBasketPanel {...testProps} />);
     expect(screen.getByRole('heading', { name: /Drug orders \(0\)/i })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: /Add/i })).toBeInTheDocument();
   });
@@ -39,7 +46,7 @@ describe('OrderBasketPanel', () => {
       orders: orders,
       setOrders: mockSetOrders,
     }));
-    const { rerender } = render(<DrugOrderBasketPanel />);
+    const { rerender } = render(<DrugOrderBasketPanel {...testProps} />);
     expect(screen.getByText(/Drug orders \(4\)/i)).toBeInTheDocument();
     expect(getByTextWithMarkup(/New\s*Aspirin 81mg — 81mg — Tablet/i)).toBeVisible();
     expect(getByTextWithMarkup(/DOSE\s*Tablet/i)).toBeVisible();
@@ -49,7 +56,7 @@ describe('OrderBasketPanel', () => {
     const removeAspirin81Button = screen.getAllByRole('button', { name: /remove from basket/i })[0];
     expect(removeAspirin81Button).toBeVisible();
     await user.click(removeAspirin81Button);
-    rerender(<DrugOrderBasketPanel />); // re-render because the mocked hook does not trigger a render
+    rerender(<DrugOrderBasketPanel {...testProps} />); // re-render because the mocked hook does not trigger a render
     await expect(screen.getByText(/Drug Orders \(3\)/i)).toBeInTheDocument();
   });
 });

package/src/index.ts

@@ -1,9 +1,10 @@
-import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle, translateFrom } from '@openmrs/esm-framework';
+import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
 import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
 import { configSchema } from './config-schema';
 import { dashboardMeta, moduleName } from './dashboard.meta';
 import medicationsSummaryComponent from './medications-summary/medications-summary.component';
 import activeMedicationsComponent from './active-medications/active-medications.component';
+import pastMedicationsComponent from './past-medications/past-medications.component';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -20,6 +21,8 @@ export const medicationsSummary = getSyncLifecycle(medicationsSummaryComponent,
 
 export const activeMedications = getSyncLifecycle(activeMedicationsComponent, options);
 
+export const pastMedications = getSyncLifecycle(pastMedicationsComponent, options);
+
 export const drugOrderPanel = getAsyncLifecycle(
   () => import('./drug-order-basket-panel/drug-order-basket-panel.extension'),
   options,
@@ -39,3 +42,8 @@ export const addDrugOrderWorkspace = getAsyncLifecycle(
   () => import('./add-drug-order/add-drug-order.workspace'),
   options,
 );
+
+export const fillPrescriptionFormWorkspace = getAsyncLifecycle(
+  () => import('./add-drug-order/fill-prescription-form.workspace'),
+  options,
+);

package/src/medications-summary/medications-summary.component.tsx

@@ -12,8 +12,10 @@ export interface MedicationsSummaryProps {
 
 export default function MedicationsSummary({ patient }: MedicationsSummaryProps) {
   const { t } = useTranslation();
-  const launchAddDrugWorkspace =
-    useLaunchWorkspaceRequiringVisit<AddDrugOrderWorkspaceAdditionalProps>('add-drug-order');
+  const launchAddDrugWorkspace = useLaunchWorkspaceRequiringVisit<AddDrugOrderWorkspaceAdditionalProps>(
+    patient.id,
+    'add-drug-order',
+  );
 
   const {
     data: activeOrders,

package/src/past-medications/past-medications.component.tsx

@@ -0,0 +1,44 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { DataTableSkeleton } from '@carbon/react';
+import { EmptyState, ErrorState } from '@openmrs/esm-patient-common-lib';
+import MedicationsDetailsTable from '../components/medications-details-table.component';
+import { usePastPatientOrders } from '../api/api';
+
+interface PastMedicationsProps {
+  patient: fhir.Patient;
+}
+
+const PastMedications: React.FC<PastMedicationsProps> = ({ patient }) => {
+  const { t } = useTranslation();
+  const headerTitle = t('pastMedicationsHeaderTitle', 'Past medications');
+  const displayText = t('pastMedicationsDisplayText', 'past medications');
+
+  const { data: pastPatientOrders, error, isLoading, isValidating } = usePastPatientOrders(patient?.id);
+
+  if (isLoading) {
+    return <DataTableSkeleton role="progressbar" />;
+  }
+
+  if (error) {
+    return <ErrorState error={error} headerTitle={headerTitle} />;
+  }
+
+  if (pastPatientOrders?.length) {
+    return (
+      <MedicationsDetailsTable
+        isValidating={isValidating}
+        title={t('pastMedicationsTableTitle', 'Past Medications')}
+        medications={pastPatientOrders}
+        showDiscontinueButton={false}
+        showModifyButton={false}
+        showReorderButton={true}
+        patient={patient}
+      />
+    );
+  }
+
+  return <EmptyState displayText={displayText} headerTitle={headerTitle} />;
+};
+
+export default PastMedications;

package/src/past-medications/past-medications.scss

@@ -0,0 +1,7 @@
+@use '@carbon/layout';
+@use '@carbon/type';
+
+.productiveHeading03 {
+  @include type.type-style('heading-03');
+  margin-bottom: layout.$spacing-05;
+}

package/src/past-medications/past-medications.test.tsx

@@ -0,0 +1,85 @@
+import React from 'react';
+import { openmrsFetch, useSession } from '@openmrs/esm-framework';
+import { screen, within } from '@testing-library/react';
+import { mockPatientDrugOrdersApiData, mockSessionDataResponse } from '__mocks__';
+import { mockPatient, renderWithSwr, waitForLoadingToFinish } from 'tools';
+import PastMedications from './past-medications.component';
+
+const mockUseSession = jest.mocked(useSession);
+const mockOpenmrsFetch = openmrsFetch as jest.Mock;
+
+mockUseSession.mockReturnValue(mockSessionDataResponse.data);
+
+describe('PastMedications', () => {
+  test('renders an empty state view when there are no past medications to display', async () => {
+    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
+    mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
+
+    renderWithSwr(<PastMedications patient={mockPatient} />);
+
+    await waitForLoadingToFinish();
+
+    expect(screen.getByRole('heading', { name: /past medications/i })).toBeInTheDocument();
+    expect(screen.getByTitle(/empty data illustration/i)).toBeInTheDocument();
+    expect(screen.getByText(/There are no past medications to display for this patient/i)).toBeInTheDocument();
+  });
+
+  test('renders an error state view if there is a problem fetching medications data', async () => {
+    const error = {
+      message: 'You are not logged in',
+      response: {
+        status: 401,
+        statusText: 'Unauthorized',
+      },
+    };
+
+    mockOpenmrsFetch.mockRejectedValueOnce(error);
+
+    renderWithSwr(<PastMedications patient={mockPatient} />);
+
+    await waitForLoadingToFinish();
+
+    expect(screen.queryByRole('table')).not.toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /past medications/i })).toBeInTheDocument();
+    expect(screen.getByText(/Error 401: Unauthorized/i)).toBeInTheDocument();
+    expect(screen.getByText(/Sorry, there was a problem displaying this information/i)).toBeInTheDocument();
+  });
+
+  test('renders a tabular overview of the past medications recorded for a patient', async () => {
+    mockOpenmrsFetch
+      .mockReturnValueOnce({
+        data: { results: mockPatientDrugOrdersApiData },
+      })
+      .mockReturnValueOnce({
+        data: { results: [] }, // simulate no active orders so all become "past"
+      });
+
+    renderWithSwr(<PastMedications patient={mockPatient} />);
+
+    await waitForLoadingToFinish();
+
+    const headingElements = screen.getAllByText(/Past Medications/i);
+    headingElements.forEach((headingElement) => {
+      expect(headingElement).toBeInTheDocument();
+    });
+
+    const table = screen.getByRole('table');
+    expect(table).toBeInTheDocument();
+
+    const expectedColumnHeaders = [/start date/i, /details/i];
+    expectedColumnHeaders.forEach((header) => {
+      expect(screen.getByRole('columnheader', { name: header })).toBeInTheDocument();
+    });
+
+    const expectedTableRows = [
+      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet DOSE 2 tablet — oral — twice daily — indefinite duration — take it sometimes INDICATION Bad boo-boo/i,
+      /14-Aug-2023 Admin User Acetaminophen 325 mg — 325mg — tablet 14-Aug-2023 DOSE 2 tablet — oral — twice daily — indefinite duration INDICATION No good 0/i,
+      /14-Aug-2023 Admin User Sulfacetamide 0.1 — 10% DOSE 1 application — for 1 weeks — REFILLS 1 — apply it INDICATION Pain — QUANTITY 8 Application/i,
+      /14-Aug-2023 Admin User Aspirin 162.5mg — 162.5mg — tablet DOSE 1 tablet — oral — once daily — for 30 days INDICATION Heart — QUANTITY 30 Tablet/i,
+    ];
+
+    expectedTableRows.forEach((row) => {
+      expect(within(table).getByRole('row', { name: row })).toBeInTheDocument();
+    });
+  });
+});

package/src/routes.json

@@ -1,7 +1,25 @@
 {
   "$schema": "https://json.openmrs.org/routes.schema.json",
   "backendDependencies": {
-    "webservices.rest": "^2.2.0"
+    "webservices.rest": ">=2.2.0"
+  },
+  "optionalBackendDependencies": {
+    "providermanagement": {
+      "version": "^2.16.0",
+      "feature": {
+        "flagName": "providermanagement-module",
+        "label": "Prescribing Clinician Roles",
+        "description": "Enable support for configuring prescribing clinicians roles when ordering drugs. Requires the backend providermanagement module."
+      }
+    },
+    "ordertemplates": {
+      "version": "^1.0.2",
+      "feature": {
+        "flagName": "ordertemplates-module",
+        "label": "Order Templates",
+        "description": "Enable support for order templates when ordering drugs. Requires the backend ordertemplates module."
+      }
+    }
   },
   "extensions": [
     {
@@ -21,6 +39,15 @@
       },
       "order": 4
     },
+    {
+      "name": "past-medications-widget",
+      "component": "pastMedications",
+      "slot": "patient-chart-summary-dashboard-slot",
+      "meta": {
+        "fullWidth": false
+      },
+      "order": 5
+    },
     {
       "name": "medications-summary-dashboard",
       "component": "medicationsDashboardLink",
@@ -36,6 +63,14 @@
       "component": "drugOrderPanel",
       "slot": "order-basket-slot",
       "order": 1
+    },
+    {
+      "name": "drug-order-form",
+      "component": "drugOrderForm"
+    },
+    {
+      "name": "drug-search-combobox",
+      "component": "drugSearchComboBox"
     }
   ],
   "workspaces": [
@@ -44,6 +79,13 @@
       "title": "addDrugOrderWorkspaceTitle",
       "component": "addDrugOrderWorkspace",
       "type": "order"
+    },
+    {
+      "name": "fill-prescription-form",
+      "title": "fillPrescription",
+      "component": "fillPrescriptionFormWorkspace",
+      "type": "order"
     }
+    
   ]
 }

package/translations/am.json

@@ -3,6 +3,7 @@
   "activeMedicationsDisplayText": "active medications",
   "activeMedicationsHeaderTitle": "Active medications",
   "activeMedicationsTableTitle": "Active Medications",
+  "activePrescriptionExists": "Active prescription exists for this drug",
   "add": "Add",
   "addDrugOrderWorkspaceTitle": "Add drug order",
   "backToOrderBasket": "Back to order basket",
@@ -13,12 +14,16 @@
   "discard": "Discard",
   "discontinue": "Discontinue",
   "discontinued": "Discontinued",
-  "dispensingInformation": "3. Dispensing instructions",
-  "dosageInstructions": "1. Dosage instructions",
+  "dispensingInformation": "Dispensing instructions",
+  "dosageInstructions": "Dosage instructions",
   "dosageRequiredErrorMessage": "Dosage is required",
   "dose": "Dose",
   "drugAlreadyPrescribed": "Already prescribed",
+  "drugName": "Drug name",
   "drugOrders": "Drug orders",
+  "drugOrderValidationFailed": "Validation failed",
+  "drugOrderValidationFailedDescription": "Please check the form for errors and try again.",
+  "drugRequiredErrorMessage": "Drug is required",
   "duration": "Duration",
   "durationUnit": "Duration unit",
   "durationUnitPlaceholder": "Duration Unit",
@@ -27,13 +32,17 @@
   "editDosageUnitsTitle": "Dose unit",
   "editDoseComboBoxPlaceholder": "Dose",
   "editDoseComboBoxTitle": "Dose",
+  "editDrugOrderWorkspaceTitle": "Edit drug order",
   "editFrequencyComboBoxTitle": "Frequency",
   "editRouteComboBoxTitle": "Route",
   "error": "Error",
   "errorFetchingDrugOrderTemplates": "Error fetching drug order templates",
   "errorFetchingDrugResults": "Error fetching results for \"{{searchTerm}}\"",
   "errorFetchingOrderConfig": "Error occured when fetching Order config",
+  "errorLoadingClinicians": "Error loading clinicians",
+  "errorSavingDrugOrder": "Error saving drug order",
   "female": "Female",
+  "fillPrescription": "Fill prescription",
   "freeDosageErrorMessage": "Add free dosage note",
   "freeTextDosage": "Free text dosage",
   "goToDrugOrderForm": "Order form",
@@ -46,8 +55,12 @@
   "medicationIndefiniteDuration": "Indefinite duration",
   "Medications": "Medications",
   "modify": "Modify",
+  "noCliniciansFound": "No clinicians found",
+  "noCliniciansFoundDescription": "Cannot select prescribing clinician because no clinicians with appropriate roles are found. Check configuration.",
   "noResultsForDrugSearch": "No results to display for \"{{searchTerm}}\"",
   "numRefillsErrorMessage": "Number of refills is required",
+  "off": "Off",
+  "on": "On",
   "onDate": "on",
   "or": "or",
   "orderActionDiscontinue": "Discontinue",
@@ -55,6 +68,8 @@
   "orderActionNew": "New",
   "orderActionRenew": "Renew",
   "orderActionRevise": "Modify",
+  "orderCompleted": "Placed orders",
+  "ordered": "Placed order for {{order}}",
   "orderForm": "Order Form",
   "other": "Other",
   "pastMedicationsDisplayText": "past medications",
@@ -63,7 +78,10 @@
   "patientInstructions": "Patient instructions",
   "patientInstructionsPlaceholder": "Additional dosing instructions (e.g. \"Take after eating\")",
   "pillDispensedErrorMessage": "Quantity to dispense is required",
-  "prescriptionDuration": "2. Prescription duration",
+  "prescribingClinician": "Prescribing Clinician",
+  "prescribingClinicianRequiredErrorMessage": "Prescribing clinician is required",
+  "prescriptionDuration": "Prescription duration",
+  "prescriptionInfo": "Prescription info",
   "prescriptionRefills": "Prescription refills",
   "print": "Print",
   "printedBy": "Printed by",
@@ -76,6 +94,7 @@
   "removeFromBasket": "Remove from basket",
   "reorder": "Reorder",
   "returnToOrderBasket": "Return to order basket",
+  "saveDrugOrderFailed": "Error ordering {{orderName}}",
   "saveOrder": "Save order",
   "searchAgain": "search again",
   "searchFieldPlaceholder": "Search for a drug or orderset (e.g. \"Aspirin\")",
@@ -91,5 +110,6 @@
   "trySearchingAgain": "Please try searching again",
   "tryTo": "Try to",
   "unknown": "Unknown",
-  "usingADifferentTerm": "using a different term"
+  "usingADifferentTerm": "using a different term",
+  "visitRequiredForFillingPrescription": "Patient is required to have an active visit to fill prescription"
 }