Skip to content

Commit

Permalink
PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ODORA0 committed Nov 21, 2023
1 parent baf367c commit 004c8e2
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 22 deletions.
7 changes: 1 addition & 6 deletions packages/esm-tb-app/src/dashboard.meta.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
export const tuberclosisMeta = {
title: 'Tuberclosis',
slotName: 'tuberclosis-slot',
};

export const TbDashboardDMeta = {
export const tbPatientChartMeta = {
title: 'TB Program',
slotName: 'ohri-tb-slot',
isExpanded: false,
Expand Down
4 changes: 2 additions & 2 deletions packages/esm-tb-app/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { defineConfigSchema, getAsyncLifecycle, getSyncLifecycle } from '@openmrs/esm-framework';
import { createDashboardGroup, createDashboardLink } from '@openmrs/esm-patient-common-lib';
import {
TbDashboardDMeta,
tbPatientChartMeta,
tbContactListingDashboardMeta,
tbPatientSummaryDashboardMeta,
tbProgramManagementDashboardMeta,
Expand All @@ -23,7 +23,7 @@ export function startupApp() {
defineConfigSchema(moduleName, {});
}

export const patientChartTbDashboard = getSyncLifecycle(createDashboardGroup(TbDashboardDMeta), options);
export const patientChartTbDashboard = getSyncLifecycle(createDashboardGroup(tbPatientChartMeta), options);

export const tbPatientSummaryDashboardLink = getSyncLifecycle(
createDashboardLink({ ...tbPatientSummaryDashboardMeta, moduleName }),
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-tb-app/src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"name": "ohri-tb",
"slot": "patient-chart-dashboard-slot",
"component": "patientChartTbDashboard",
"order": 21
"order": 24
},

{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ interface OverviewListProps {
const TBSummaryOverviewList: React.FC<OverviewListProps> = ({ patientUuid }) => {
const { t } = useTranslation();

const headerRecentTB = t('recentTuberculosis');
const headerPreviousCases = t('previousCases');
const headerVisit = t('visits');
const headerRecentTB = t('recentTuberculosis', 'Recent Tuberculosis');
const headerPreviousCases = t('previousCases', 'Previous Cases');
const headerVisit = t('visits', 'Visits');

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const ProgramManagementSummary: React.FC<OverviewListProps> = ({ patientUuid })
<div className={styles.tabContainer}>
<Tabs>
<TabList contained>
<Tab>{t('MdrTbEnrolment')}</Tab>
<Tab>{t('PatientTracing')}</Tab>
<Tab>{t('MdrTbEnrolment', 'TB/MDR TB Enrolment')}</Tab>
<Tab>{t('PatientTracing', 'Patient Tracing')}</Tab>
</TabList>
<TabPanels>
<TabPanel>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface MdrTbListProps {

const MdrTbList: React.FC<MdrTbListProps> = ({ patientUuid }) => {
const { t } = useTranslation();
const headerTitle = t('MdrTbEnrolment');
const headerTitle = t('MdrTbEnrolment', 'TB/MDR TB Enrolment');

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ interface TbContactTracingListProps {

const TbContactTracingList: React.FC<TbContactTracingListProps> = ({ patientUuid }) => {
const { t } = useTranslation();
const headerTitle = t('TbContactListing');
const headerTitle = t('TbContactListing', 'TB Contact Listing');

return (
<>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { EmptyStateComingSoon } from '@ohri/openmrs-esm-ohri-commons-lib';
import { EmptyStateComingSoon, PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';

interface TbTreatmentFollowUpListProps {
patientUuid: string;
}

const TbTreatmentFollowUpList: React.FC<TbTreatmentFollowUpListProps> = ({ patientUuid }) => {
const TbTreatmentFollowUpList: React.FC<PatientChartProps> = ({ patientUuid }) => {
const { t } = useTranslation();
const headerTitle = t('TbTreatmentFollowUp');

Expand Down

0 comments on commit 004c8e2

Please sign in to comment.