@kenyaemr/esm-adr-app 5.4.2-pre.2448 → 5.4.2-pre.2453

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"adrAssessmentApp","route":"adr-assessment"}],"workspaces":[{"name":"patient-adr-workspace","title":"ADR Assessment Review","component":"patientAdrWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide"}],"extensions":[{"name":"adr-assessment-side-nav","slot":"adr-assessment-side-nav-slot","component":"adrAssessmentSideNav"},{"name":"adr-assessment-search-dashboard-db-link","slot":"adr-assessment-page-dashboard-slot","component":"overviewDashboardLink","meta":{"name":"adr-assessment-overview","title":"Overview","slot":"adr-assessment-overview-dashboard-slot"}},{"name":"adr-assessment-summary","component":"adrAssessmentSummary","slot":"adr-assessment-overview-dashboard-slot"}],"version":"5.4.2-pre.2448"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"adrAssessmentApp","route":"adr-assessment"}],"workspaces":[{"name":"patient-adr-workspace","title":"ADR Assessment Review","component":"patientAdrWorkspace","type":"workspace","canMaximize":true,"canHide":true,"width":"extra-wide"}],"extensions":[{"name":"adr-assessment-side-nav","slot":"adr-assessment-side-nav-slot","component":"adrAssessmentSideNav"},{"name":"adr-assessment-search-dashboard-db-link","slot":"adr-assessment-page-dashboard-slot","component":"overviewDashboardLink","meta":{"name":"adr-assessment-overview","title":"Overview","slot":"adr-assessment-overview-dashboard-slot"}},{"name":"adr-assessment-summary","component":"adrAssessmentSummary","slot":"adr-assessment-overview-dashboard-slot"}],"version":"5.4.2-pre.2453"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-adr-app",
-  "version": "5.4.2-pre.2448",
+  "version": "5.4.2-pre.2453",
   "description": "ADR App for KenyaEMR",
   "browser": "dist/kenyaemr-esm-adr-app.js",
   "main": "src/index.ts",

package/src/components/adr-patient-summary/patient-summary.component.tsx

@@ -0,0 +1,59 @@
+import React, { useMemo } from 'react';
+import styles from './patient-summary.scss';
+import {
+  ErrorState,
+  ExtensionSlot,
+  fetchCurrentPatient,
+  useLayoutType,
+  WorkspaceContainer,
+} from '@openmrs/esm-framework';
+import { useTranslation } from 'react-i18next';
+import { useParams } from 'react-router-dom';
+import { InlineLoading } from '@carbon/react';
+import { useInitialize } from '../patient-search/useInitialize';
+import PatientEncounter from '../encounters/patient-encounter.component';
+import useSWR from 'swr';
+
+const AdrPatientSummary: React.FC = () => {
+  const layout = useLayoutType();
+  const { t } = useTranslation();
+  const isTablet = layout === 'tablet';
+  const { patientUuid } = useParams<{ patientUuid: string }>();
+  const {
+    data: patient,
+    isLoading,
+    error,
+  } = useSWR(patientUuid ? ['patient', patientUuid] : null, () => fetchCurrentPatient(patientUuid!, {}));
+
+  const state = useMemo(() => ({ patient, patientUuid }), [patient, patientUuid]);
+
+  useInitialize(patientUuid, state);
+
+  if (isLoading) {
+    return (
+      <div className={styles.loadingContainer}>
+        <InlineLoading description={t('loading', 'Loading...')} />
+      </div>
+    );
+  }
+  if (error) {
+    return <ErrorState error={error} headerTitle={t('error', 'Error')} />;
+  }
+
+  return (
+    <div className={isTablet ? styles.tabletHeading : styles.desktopHeading}>
+      {patient && patientUuid && <ExtensionSlot name="patient-header-slot" state={{ patient, patientUuid }} />}
+      <div className={styles.patientEncounterContainer}>
+        <PatientEncounter patientUuid={patientUuid} />
+      </div>
+      <WorkspaceContainer
+        showSiderailAndBottomNav
+        key="adr-assessment"
+        contextKey={`adr-assessment/overview/${patientUuid}`}
+        additionalWorkspaceProps={state}
+      />
+    </div>
+  );
+};
+
+export default AdrPatientSummary;

package/src/components/adr-patient-summary/patient-summary.scss

@@ -0,0 +1,22 @@
+@use '@carbon/layout';
+
+.desktopHeading {
+  padding-left: 16rem;
+  margin-right: 3rem;
+}
+
+.loadingContainer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  width: 100vw;
+
+  :global(.cds--inline-loading) {
+    width: unset;
+  }
+}
+
+.patientEncounterContainer {
+  margin: layout.$spacing-05;
+}

package/src/components/dashboard/dashboard-view.component.tsx

@@ -1,5 +1,11 @@
 import React from 'react';
-import { ExtensionSlot, PageHeader, AppointmentsPictogram, PageHeaderContent } from '@openmrs/esm-framework';
+import {
+  ExtensionSlot,
+  PageHeader,
+  AppointmentsPictogram,
+  PageHeaderContent,
+  PharmacyPictogram,
+} from '@openmrs/esm-framework';
 import { useTranslation } from 'react-i18next';
 import styles from './dashboard-view.scss';
 const DashboardView: React.FC<{ dashboardSlot: string; title: string }> = ({ dashboardSlot, title }) => {
@@ -7,7 +13,7 @@ const DashboardView: React.FC<{ dashboardSlot: string; title: string }> = ({ das
   return (
     <>
       <PageHeader className={styles.pageHeader}>
-        <PageHeaderContent title={t('adrAssessment', 'ADR Assessment')} illustration={<AppointmentsPictogram />} />
+        <PageHeaderContent title={t('adrAssessment', 'ADR Assessment')} illustration={<PharmacyPictogram />} />
       </PageHeader>
       <ExtensionSlot name={dashboardSlot} state={{ dashboardTitle: title }} />
     </>

package/src/components/dashboard/home-dashboard.component.tsx

@@ -1,6 +1,13 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
-import { ExtensionSlot, WorkspaceContainer, isDesktop, useExtensionStore, useLayoutType } from '@openmrs/esm-framework';
+import {
+  ExtensionSlot,
+  WorkspaceContainer,
+  isDesktop,
+  navigate,
+  useExtensionStore,
+  useLayoutType,
+} from '@openmrs/esm-framework';
 import DashboardView from './dashboard-view.component';
 import styles from './home-dashboard.scss';
 import { DashboardConfig } from '../../types';
@@ -16,6 +23,12 @@ export default function Dashboard() {
   const dashboards = ungroupedDashboards as Array<DashboardConfig>;
   const activeDashboard = dashboards.find((dashboard) => dashboard.name === params?.dashboard) || dashboards[0];
 
+  useEffect(() => {
+    if (params?.dashboard === undefined) {
+      navigate({ to: `${window.spaBase}/adr-assessment/overview` });
+    }
+  }, [params?.dashboard]);
+
   return (
     <>
       <div className={styles.homePageWrapper}>
@@ -23,7 +36,6 @@ export default function Dashboard() {
           {isDesktop(layout) && <ExtensionSlot name="adr-assessment-side-nav-slot" key={layout} />}
           <DashboardView title={activeDashboard?.name} dashboardSlot={activeDashboard?.slot} />
         </section>
-        <WorkspaceContainer overlay contextKey="adr-assessment" />
       </div>
     </>
   );

package/src/components/encounters/adr-encounter.component.tsx

@@ -1,7 +1,9 @@
 import React, { useState } from 'react';
 import {
-  Button,
   DataTable,
+  Layer,
+  OverflowMenu,
+  OverflowMenuItem,
   Pagination,
   Table,
   TableBody,
@@ -17,7 +19,6 @@ import {
 import styles from './encounter.scss';
 import { useTranslation } from 'react-i18next';
 import {
-  ActionMenuButton,
   formatDatetime,
   isDesktop,
   launchWorkspace,
@@ -44,7 +45,6 @@ const AdrEncounter: React.FC<adrEncounterProps> = ({ encounters }) => {
     { header: 'Visit type', key: 'visitTypeName' },
     { header: 'Form name', key: 'formName' },
     { header: 'Provider', key: 'provider' },
-    { header: 'Actions', key: 'action' },
   ];
   const sortedEncounters = encounters.sort((a, b) => {
     const dateA = new Date(a.encounterDatetime || 0).getTime();
@@ -67,11 +67,6 @@ const AdrEncounter: React.FC<adrEncounterProps> = ({ encounters }) => {
     formName: encounter?.formName,
     id: encounter?.encounterUuid,
     provider: encounter?.provider || '--',
-    action: (
-      <Button kind="tertiary" renderIcon={ReviewIcon} onClick={() => handler(encounter)}>
-        {t('review', 'Review')}
-      </Button>
-    ),
   }));
   if (encounters.length === 0) {
     return (
@@ -86,58 +81,68 @@ const AdrEncounter: React.FC<adrEncounterProps> = ({ encounters }) => {
 
   return (
     <div className={styles.encounterContainer}>
-      <DataTable size={responsiveSize} rows={tableRows} headers={headers}>
-        {({
-          rows,
-          headers,
-          getHeaderProps,
-          getRowProps,
-          getTableProps,
-          getToolbarProps,
-          onInputChange,
-          getTableContainerProps,
-        }) => (
-          <TableContainer
-            className={styles.encounterTable}
-            title={t('adrAssessmentEncounters', 'ADR Assessment Encounters')}
-            description={t('summaryOfAdrAssessmentEncounters', 'Summary of ADR assessment encounters')}
-            {...getTableContainerProps()}>
-            <TableToolbar {...getToolbarProps()} aria-label="data table toolbar">
-              <TableToolbarContent>
-                <TableToolbarSearch persistent onChange={onInputChange} />
-              </TableToolbarContent>
-            </TableToolbar>
-            <Table {...getTableProps()} aria-label={t('encounters', 'Encounters')}>
-              <TableHead>
-                <TableRow>
-                  {headers.map((header) => (
-                    <TableHeader
-                      key={header.key}
-                      {...getHeaderProps({
-                        header,
-                      })}>
-                      {header.header}
-                    </TableHeader>
-                  ))}
-                </TableRow>
-              </TableHead>
-              <TableBody>
-                {rows.map((row) => (
-                  <TableRow
-                    key={row.id}
-                    {...getRowProps({
-                      row,
-                    })}>
-                    {row.cells.map((cell) => (
-                      <TableCell key={cell.id}>{cell.value}</TableCell>
+      <Layer>
+        <DataTable size={responsiveSize} rows={tableRows} headers={headers} useZebraStyles={false}>
+          {({
+            rows,
+            headers,
+            getHeaderProps,
+            getRowProps,
+            getTableProps,
+            getToolbarProps,
+            onInputChange,
+            getTableContainerProps,
+          }) => (
+            <TableContainer
+              className={styles.encounterTable}
+              title={t('adrAssessmentEncounters', 'ADR Assessment Encounters')}
+              description={t('summaryOfAdrAssessmentEncounters', 'Summary of ADR assessment encounters')}
+              {...getTableContainerProps()}>
+              <TableToolbar {...getToolbarProps()} aria-label="data table toolbar">
+                <TableToolbarContent>
+                  <TableToolbarSearch persistent onChange={onInputChange} />
+                </TableToolbarContent>
+              </TableToolbar>
+              <Table {...getTableProps()} aria-label={t('encounters', 'Encounters')}>
+                <TableHead>
+                  <TableRow>
+                    {headers.map((header) => (
+                      <TableHeader
+                        key={header.key}
+                        {...getHeaderProps({
+                          header,
+                        })}>
+                        {header.header}
+                      </TableHeader>
                     ))}
+                    <TableHeader aria-label={t('actions', 'Actions')} />
                   </TableRow>
-                ))}
-              </TableBody>
-            </Table>
-          </TableContainer>
-        )}
-      </DataTable>
+                </TableHead>
+                <TableBody>
+                  {rows.map((row, index) => (
+                    <TableRow
+                      key={row.id}
+                      {...getRowProps({
+                        row,
+                      })}>
+                      {row.cells.map((cell) => (
+                        <TableCell key={cell.id}>{cell.value}</TableCell>
+                      ))}
+                      <TableCell className="cds--table-column-menu">
+                        <OverflowMenu size="sm" flipped>
+                          <OverflowMenuItem onClick={() => handler(encounters[index])}>
+                            {t('review', 'Review')}
+                          </OverflowMenuItem>
+                        </OverflowMenu>
+                      </TableCell>
+                    </TableRow>
+                  ))}
+                </TableBody>
+              </Table>
+            </TableContainer>
+          )}
+        </DataTable>
+      </Layer>
       {paginated && (
         <Pagination
           forwardText="Next page"

package/src/components/encounters/encounter.resource.tsx

@@ -1,6 +1,8 @@
-import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import useSWR from 'swr';
+import { openmrsFetch, restBaseUrl, useConfig, useOpenmrsPagination, type Encounter } from '@openmrs/esm-framework';
+
 import { MappedAdrEncounter } from '../../types';
+import { type ADRConfigObject } from '../../config-schema';
 
 export const useAdrAssessmentEncounter = (fromDate: string, toDate?: string) => {
   const url = `${restBaseUrl}/kenyaemr/adrencounter?fromdate=${fromDate}&todate=${toDate}`;
@@ -11,3 +13,38 @@ export const useAdrAssessmentEncounter = (fromDate: string, toDate?: string) =>
     error,
   };
 };
+
+export const usePatientAdrAssessmentEncounter = (patientUuid: string) => {
+  const { adrAssessmentEncounterTypeUuid } = useConfig<ADRConfigObject>();
+  const url = `${restBaseUrl}/encounter?patient=${patientUuid}&encounterType=${adrAssessmentEncounterTypeUuid}&v=full`;
+  const pageSize = 10;
+  const { data, error, isLoading, paginated, currentPage, goTo, totalCount, currentPageSize, mutate } =
+    useOpenmrsPagination<Encounter>(url, pageSize);
+
+  const mappedEncounters: Array<MappedAdrEncounter> = data?.map((encounter) => ({
+    encounterUuid: encounter.uuid,
+    encounterTypeUuid: encounter.encounterType?.uuid,
+    patientUuid: encounter.patient?.uuid,
+    patientName: encounter.patient?.display,
+    encounterType: encounter.encounterType?.name,
+    encounterDatetime: encounter.encounterDatetime,
+    visitTypeName: encounter.visit?.visitType?.display,
+    formName: encounter.form?.display,
+    location: encounter.location?.display,
+    provider: encounter.encounterProviders?.map((provider) => provider.provider?.display).join(', '),
+    formUuid: encounter.form?.uuid,
+    visitUuid: encounter.visit?.uuid,
+    visitTypeUuid: encounter.visit?.visitType?.uuid,
+  }));
+  return {
+    encounters: mappedEncounters ?? [],
+    isLoading,
+    error,
+    paginated,
+    currentPage,
+    goTo,
+    totalCount,
+    currentPageSize,
+    mutate,
+  };
+};

package/src/components/encounters/encounter.scss

@@ -24,3 +24,15 @@
     border-top: none;
   }
 }
+
+.loadingContainer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100vh;
+  width: 100vw;
+
+  :global(.cds--inline-loading) {
+    width: unset;
+  }
+}

package/src/components/encounters/patient-encounter.component.tsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import { mutate } from 'swr';
+import { InlineLoading } from '@carbon/react';
+import { EmptyState, useLaunchWorkspaceRequiringVisit } from '@openmrs/esm-patient-common-lib';
+import { useConfig } from '@openmrs/esm-framework';
+
+import { usePatientAdrAssessmentEncounter } from './encounter.resource';
+import AdrEncounter from './adr-encounter.component';
+import { type ADRConfigObject } from '../../config-schema';
+import styles from './encounter.scss';
+
+type PatientEncounterProps = {
+  patientUuid: string;
+};
+
+const PatientEncounter: React.FC<PatientEncounterProps> = ({ patientUuid }) => {
+  const { adrAssessmentFormUuid } = useConfig<ADRConfigObject>();
+  const { encounters, isLoading } = usePatientAdrAssessmentEncounter(patientUuid);
+  const launchWorkspaceRequiringVisit = useLaunchWorkspaceRequiringVisit('patient-form-entry-workspace');
+
+  const launchAdrAssessmentWorkspace = (encounterUuid: string = '') => {
+    launchWorkspaceRequiringVisit({
+      formInfo: {
+        formUuid: adrAssessmentFormUuid,
+        encounterUuid: encounterUuid,
+      },
+      mutateForm: () => {
+        mutate((key) => typeof key === 'string' && key.startsWith(`/ws/rest/v1/encounter`), undefined, {
+          revalidate: true,
+        });
+      },
+    });
+  };
+
+  if (isLoading) {
+    return (
+      <div className={styles.loadingContainer}>
+        <InlineLoading description="Loading..." />
+      </div>
+    );
+  }
+
+  if (encounters.length === 0) {
+    return (
+      <div className={styles.emptyContainer}>
+        <EmptyState displayText="ADR Encounter" headerTitle="ADR Encounter" launchForm={launchAdrAssessmentWorkspace} />
+      </div>
+    );
+  }
+
+  return <AdrEncounter encounters={encounters} />;
+};
+
+export default PatientEncounter;

package/src/components/patient-search/patient-search.component.tsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import styles from './patient-search.scss';
+import { ExtensionSlot, navigate } from '@openmrs/esm-framework';
+import { launchPatientChartWithWorkspaceOpen } from '@openmrs/esm-patient-common-lib';
+import { Layer } from '@carbon/react';
+
+const PatientSearch: React.FC = () => {
+  const selectPatient = (patientUuid: string) => {
+    navigate({ to: `${window.spaBase}/adr-assessment/overview/${patientUuid}` });
+  };
+
+  return (
+    <div className={styles.patientSearchContainer}>
+      <Layer>
+        <ExtensionSlot
+          className={styles.patientSearchBar}
+          name="patient-search-bar-slot"
+          state={{
+            selectPatientAction: selectPatient,
+            buttonProps: {
+              kind: 'secondary',
+            },
+          }}
+        />
+      </Layer>
+    </div>
+  );
+};
+
+export default PatientSearch;

package/src/components/patient-search/patient-search.scss

@@ -0,0 +1,5 @@
+.patientSearchBar {
+  & form {
+    border: none;
+  }
+}

package/src/components/patient-search/useInitialize.ts

@@ -0,0 +1,24 @@
+import { useEffect } from 'react';
+import { setCurrentVisit } from '@openmrs/esm-framework';
+import { getPatientChartStore } from '@openmrs/esm-patient-common-lib';
+
+type PatientState = {
+  patient: any;
+  patientUuid?: string;
+};
+
+export const useInitialize = (patientUuid: string | undefined, state: PatientState) => {
+  useEffect(() => {
+    setCurrentVisit(patientUuid, null);
+    return () => {
+      setCurrentVisit(null, null);
+    };
+  }, [patientUuid]);
+
+  useEffect(() => {
+    getPatientChartStore().setState({ ...state });
+    return () => {
+      getPatientChartStore().setState({});
+    };
+  }, [state]);
+};

package/src/components/summary/summary.component.tsx

@@ -5,7 +5,20 @@ import styles from './summary.scss';
 import AdrEncounter from '../encounters/adr-encounter.component';
 import { useTranslation } from 'react-i18next';
 import { useAdrAssessmentEncounter } from '../encounters/encounter.resource';
-import { DataTableSkeleton, DatePicker, DatePickerInput } from '@carbon/react';
+import {
+  Button,
+  Checkbox,
+  DataTableSkeleton,
+  Layer,
+  Tab,
+  TabList,
+  TabPanel,
+  TabPanels,
+  Tabs,
+  TextInput,
+} from '@carbon/react';
+import { CloudMonitoring, Activity, IbmWatsonDiscovery, Settings, Search } from '@carbon/react/icons';
+import PatientSearch from '../patient-search/patient-search.component';
 
 type SummaryProps = {};
 
@@ -45,39 +58,22 @@ const Summary: React.FC<SummaryProps> = () => {
   }
 
   return (
-    <>
-      <div className={styles.filterContainer}>
-        <DatePicker
-          maxDate={new Date()}
-          datePickerType="range"
-          className={styles.dateRangePicker}
-          value={[...dateRange]}
-          onChange={handleDateRangeChange}>
-          <DatePickerInput
-            id="date-picker-input-id-start"
-            placeholder="mm/dd/yyyy"
-            labelText={t('startDate', 'Start date')}
-            size="md"
-          />
-          <DatePickerInput
-            id="date-picker-input-id-finish"
-            placeholder="mm/dd/yyyy"
-            labelText={t('endDate', 'End date')}
-            size="md"
-          />
-        </DatePicker>
-      </div>
-      <div className={styles.summaryContainer}>
-        <div className={styles.summaryCard}>
-          <h4>{t('adrAssessment', 'ADR Assessment')}</h4>
-          <div>
-            <h6>{t('totalAdrAssessment', 'Total ADR assessment')}</h6>
-            <p>{counts.assessment}</p>
-          </div>
-        </div>
-      </div>
-      <AdrEncounter encounters={encounters} />
-    </>
+    <div className={styles.summaryContainer}>
+      <Tabs>
+        <TabList contained>
+          <Tab renderIcon={Search}>{t('search', 'Search')}</Tab>
+          <Tab renderIcon={CloudMonitoring}>{t('adrEncounters', 'ADR Encounters')}</Tab>
+        </TabList>
+        <TabPanels>
+          <TabPanel>
+            <PatientSearch />
+          </TabPanel>
+          <TabPanel>
+            <AdrEncounter encounters={encounters} />
+          </TabPanel>
+        </TabPanels>
+      </Tabs>
+    </div>
   );
 };
 

package/src/components/summary/summary.scss

@@ -2,11 +2,8 @@
 @use '@carbon/colors';
 
 .summaryContainer {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  gap: layout.$spacing-05;
   padding: layout.$spacing-05;
+  background-color: colors.$white;
 }
 
 .summaryCard {

package/src/config-schema.ts

@@ -1 +1,19 @@
-export const configSchema = {};
+import { Type } from '@openmrs/esm-framework';
+
+export interface ADRConfigObject {
+  adrAssessmentEncounterTypeUuid: string;
+  adrAssessmentFormUuid: string;
+}
+
+export const configSchema = {
+  adrAssessmentEncounterTypeUuid: {
+    _type: Type.String,
+    _description: 'UUID for ADR Assessment encounter type',
+    _default: '7a185fe4-c56f-4195-b682-d3f5afa9d9c2 ',
+  },
+  adrAssessmentFormUuid: {
+    _type: Type.String,
+    _description: 'UUID for ADR Assessment form',
+    _default: '461e1b45-b3f2-4899-b3e9-d3b110b6ed9c',
+  },
+};

package/src/root.component.tsx

@@ -1,7 +1,8 @@
 import React, { useEffect } from 'react';
 import { Routes, BrowserRouter, Route } from 'react-router-dom';
-import { setLeftNav, unsetLeftNav, WorkspaceContainer } from '@openmrs/esm-framework';
+import { setLeftNav, unsetLeftNav } from '@openmrs/esm-framework';
 import Dashboard from './components/dashboard/home-dashboard.component';
+import AdrPatientSummary from './components/adr-patient-summary/patient-summary.component';
 
 const AdrAssessmentApp = () => {
   const spaBasePath = `${window.spaBase}/adr-assessment`;
@@ -17,8 +18,8 @@ const AdrAssessmentApp = () => {
         <Routes>
           <Route path="/adr-assessment" element={<Dashboard />} />
           <Route path="/adr-assessment/:dashboard/*" element={<Dashboard />} />
+          <Route path="/adr-assessment/:dashboard/:patientUuid" element={<AdrPatientSummary />} />
         </Routes>
-        <WorkspaceContainer key="adr-assessment" contextKey="adr-assessment"></WorkspaceContainer>
       </BrowserRouter>
     </main>
   );

package/translations/am.json

@@ -1,12 +1,14 @@
 {
+  "actions": "Actions",
   "adrAssessment": "የኤዲአር ግምገማ",
   "adrAssessmentEncounters": "የኤዲአር ግምገማ ግኝቶች",
+  "adrEncounters": "ADR Encounters",
   "encounters": "ግኝቶች",
-  "endDate": "የማብቂያ ቀን",
+  "error": "Error",
+  "loading": "Loading...",
   "noAdrEncountersFound": "ምንም የኤዲአር ግኝቶች አልተገኙም",
   "noEncountersFoundTitle": "ምንም ግኝቶች አልተገኙም",
   "review": "ይገምግሙ",
-  "startDate": "የመጀመሪያ ቀን",
-  "summaryOfAdrAssessmentEncounters": "የኤዲአር ግምገማ ግኝቶች ማጠቃለያ",
-  "totalAdrAssessment": "ጠቅላላ የኤዲአር ግምገማ"
+  "search": "Search",
+  "summaryOfAdrAssessmentEncounters": "የኤዲአር ግምገማ ግኝቶች ማጠቃለያ"
 }