From 775a8e5e6009bb8c314314ec6a9e1e501716da47 Mon Sep 17 00:00:00 2001 From: Kunal Dubey <21157775+xakep8@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:22:57 +0530 Subject: [PATCH 1/3] RadioFormField: changed optionDisplay to optionLabel in RadioFormField (#8533) --- package-lock.json | 2 +- src/Components/ExternalResult/ResultUpdate.tsx | 2 +- src/Components/Facility/FacilityCreate.tsx | 2 +- src/Components/Form/FormFields/RadioFormField.tsx | 4 ++-- src/Components/LogUpdate/Sections/BloodSugar.tsx | 2 +- .../LogUpdate/Sections/NeurologicalMonitoring.tsx | 12 ++++++------ .../Sections/RespiratorySupport/OxygenSupport.tsx | 2 +- .../LogUpdate/Sections/RespiratorySupport/index.tsx | 4 ++-- src/Components/LogUpdate/Sections/Vitals.tsx | 2 +- src/Components/Patient/DailyRounds.tsx | 2 +- src/Components/Patient/PatientRegister.tsx | 10 +++++----- src/Components/Resource/ResourceCreate.tsx | 2 +- src/Components/Resource/ResourceDetailsUpdate.tsx | 2 +- src/Components/Shifting/ShiftDetailsUpdate.tsx | 6 +++--- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index dec462f006f..14fd0262607 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19258,4 +19258,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/Components/ExternalResult/ResultUpdate.tsx b/src/Components/ExternalResult/ResultUpdate.tsx index 482c320457e..3e892940ac8 100644 --- a/src/Components/ExternalResult/ResultUpdate.tsx +++ b/src/Components/ExternalResult/ResultUpdate.tsx @@ -289,7 +289,7 @@ export default function UpdateResult(props: any) { ]} value={state.form.patient_created} onChange={handleChange} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} error={state.errors.patient_created} /> diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx index 2f14bcc26bf..9c76e6e0ea0 100644 --- a/src/Components/Facility/FacilityCreate.tsx +++ b/src/Components/Facility/FacilityCreate.tsx @@ -928,7 +928,7 @@ export const FacilityCreate = (props: FacilityProps) => { {...field("kasp_empanelled")} label={`Is this facility ${careConfig.kasp.string} empanelled?`} options={[true, false]} - optionDisplay={(o) => (o ? "Yes" : "No")} + optionLabel={(o) => (o ? "Yes" : "No")} optionValue={(o) => String(o)} /> )} diff --git a/src/Components/Form/FormFields/RadioFormField.tsx b/src/Components/Form/FormFields/RadioFormField.tsx index c881bc66f94..ddb9178c6e9 100644 --- a/src/Components/Form/FormFields/RadioFormField.tsx +++ b/src/Components/Form/FormFields/RadioFormField.tsx @@ -5,7 +5,7 @@ import { FormFieldBaseProps, useFormFieldPropsResolver } from "./Utils"; type Props = FormFieldBaseProps & { options: readonly T[]; - optionDisplay: (option: T) => React.ReactNode; + optionLabel: (option: T) => React.ReactNode; optionValue: (option: T) => V; containerClassName?: string; unselectLabel?: string; @@ -47,7 +47,7 @@ const RadioFormField = (props: Props) => { { label="Frequency" name="insulin_intake_frequency" options={INSULIN_INTAKE_FREQUENCY_OPTIONS} - optionDisplay={(c) => t(`INSULIN_INTAKE_FREQUENCY__${c}`)} + optionLabel={(c) => t(`INSULIN_INTAKE_FREQUENCY__${c}`)} optionValue={(c) => c} value={log.insulin_intake_frequency} onChange={(c) => diff --git a/src/Components/LogUpdate/Sections/NeurologicalMonitoring.tsx b/src/Components/LogUpdate/Sections/NeurologicalMonitoring.tsx index 0d237aafd49..7ef98c4010b 100644 --- a/src/Components/LogUpdate/Sections/NeurologicalMonitoring.tsx +++ b/src/Components/LogUpdate/Sections/NeurologicalMonitoring.tsx @@ -31,7 +31,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { t(`CONSCIOUSNESS_LEVEL__${c.value}`)} + optionLabel={(c) => t(`CONSCIOUSNESS_LEVEL__${c.value}`)} optionValue={(c) => c.value} value={log.consciousness_level} onChange={(c) => @@ -60,7 +60,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { (o) => o.value !== "UNKNOWN", )} id={`${d}_reaction`} - optionDisplay={(c) => t(`PUPIL_REACTION__${c.value}`)} + optionLabel={(c) => t(`PUPIL_REACTION__${c.value}`)} optionValue={(c) => c.value} name={`${d}_pupil_light_reaction`} value={log[`${d}_pupil_light_reaction`]} @@ -98,7 +98,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { Eye Opening Response} options={EYE_OPEN_SCALE} - optionDisplay={(c) => c.value + " - " + c.text} + optionLabel={(c) => c.value + " - " + c.text} optionValue={(c) => `${c.value}`} name="eye_opening_response" value={`${log.glasgow_eye_open}`} @@ -110,7 +110,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { Verbal Response} options={VERBAL_RESPONSE_SCALE} - optionDisplay={(c) => c.value + " - " + c.text} + optionLabel={(c) => c.value + " - " + c.text} optionValue={(c) => `${c.value}`} name="verbal_response" value={`${log.glasgow_verbal_response}`} @@ -124,7 +124,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { Motor Response} options={MOTOR_RESPONSE_SCALE} - optionDisplay={(c) => c.value + " - " + c.text} + optionLabel={(c) => c.value + " - " + c.text} optionValue={(c) => `${c.value}`} name="motor_response" value={`${log.glasgow_motor_response}`} @@ -164,7 +164,7 @@ const NeurologicalMonitoring = ({ log, onChange }: LogUpdateSectionProps) => { } options={LIMB_RESPONSE_OPTIONS.filter((o) => o.value !== "UNKNOWN")} - optionDisplay={(c) => t(`LIMB_RESPONSE__${c.value}`)} + optionLabel={(c) => t(`LIMB_RESPONSE__${c.value}`)} optionValue={(c) => c.value} name={key} value={log[key]} diff --git a/src/Components/LogUpdate/Sections/RespiratorySupport/OxygenSupport.tsx b/src/Components/LogUpdate/Sections/RespiratorySupport/OxygenSupport.tsx index cefcf2ddb0e..758b49613ce 100644 --- a/src/Components/LogUpdate/Sections/RespiratorySupport/OxygenSupport.tsx +++ b/src/Components/LogUpdate/Sections/RespiratorySupport/OxygenSupport.tsx @@ -13,7 +13,7 @@ const OxygenRespiratorySupport = ({ log, onChange }: LogUpdateSectionProps) => { Oxygen Modality} options={OXYGEN_MODALITY_OPTIONS} - optionDisplay={(c) => t(`OXYGEN_MODALITY__${c.value}`)} + optionLabel={(c) => t(`OXYGEN_MODALITY__${c.value}`)} optionValue={(c) => c.value} name="ventilator_oxygen_modality" value={log.ventilator_oxygen_modality} diff --git a/src/Components/LogUpdate/Sections/RespiratorySupport/index.tsx b/src/Components/LogUpdate/Sections/RespiratorySupport/index.tsx index 8d558820843..6c58d0bfa72 100644 --- a/src/Components/LogUpdate/Sections/RespiratorySupport/index.tsx +++ b/src/Components/LogUpdate/Sections/RespiratorySupport/index.tsx @@ -57,7 +57,7 @@ const RespiratorySupport = ({ log, onChange }: LogUpdateSectionProps) => { label="Bilateral Air Entry" labelClassName="text-lg sm:font-bold" options={[true, false]} - optionDisplay={(c) => (c ? "Yes" : "No")} + optionLabel={(c) => (c ? "Yes" : "No")} optionValue={(c) => JSON.stringify(c)} name="bilateral_air_entry" value={ @@ -90,7 +90,7 @@ const RespiratorySupport = ({ log, onChange }: LogUpdateSectionProps) => { Respiratory Support} options={RESPIRATORY_SUPPORT} - optionDisplay={(c) => t(`RESPIRATORY_SUPPORT__${c.value}`)} + optionLabel={(c) => t(`RESPIRATORY_SUPPORT__${c.value}`)} optionValue={(c) => c.value} name="respiratory_support" value={log.ventilator_interface} diff --git a/src/Components/LogUpdate/Sections/Vitals.tsx b/src/Components/LogUpdate/Sections/Vitals.tsx index 1fa4b3f3aac..8592f004370 100644 --- a/src/Components/LogUpdate/Sections/Vitals.tsx +++ b/src/Components/LogUpdate/Sections/Vitals.tsx @@ -140,7 +140,7 @@ const Vitals = ({ log, onChange }: LogUpdateSectionProps) => { label={t("heartbeat_rhythm")} name="heartbeat-rythm" options={HEARTBEAT_RHYTHM_CHOICES} - optionDisplay={(c) => t(`HEARTBEAT_RHYTHM__${c}`)} + optionLabel={(c) => t(`HEARTBEAT_RHYTHM__${c}`)} optionValue={(c) => c} value={log.rhythm} onChange={(c) => onChange({ rhythm: c.value ?? undefined })} diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx index 0f0c7396f5e..7335e5c6983 100644 --- a/src/Components/Patient/DailyRounds.tsx +++ b/src/Components/Patient/DailyRounds.tsx @@ -770,7 +770,7 @@ export const DailyRounds = (props: any) => { label: t(`CONSCIOUSNESS_LEVEL__${level.value}`), value: level.value, }))} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} unselectLabel="Unknown" layout="vertical" diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx index ab20ff91e59..17eb745496b 100644 --- a/src/Components/Patient/PatientRegister.tsx +++ b/src/Components/Patient/PatientRegister.tsx @@ -1495,7 +1495,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { { label: "Yes", value: "true" }, { label: "No", value: "false" }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> @@ -1528,7 +1528,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { { label: "Yes", value: "true" }, { label: "No", value: "false" }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> @@ -1808,7 +1808,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { { label: "Yes", value: "true" }, { label: "No", value: "false" }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> @@ -1842,7 +1842,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { value: "3", }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> @@ -1877,7 +1877,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { { label: "Yes", value: "true" }, { label: "No", value: "false" }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> (o ? t("yes") : t("no"))} + optionLabel={(o) => (o ? t("yes") : t("no"))} optionValue={(o) => String(o)} value={state.form.emergency} onChange={handleChange} diff --git a/src/Components/Resource/ResourceDetailsUpdate.tsx b/src/Components/Resource/ResourceDetailsUpdate.tsx index 178ab596148..6d293f05df5 100644 --- a/src/Components/Resource/ResourceDetailsUpdate.tsx +++ b/src/Components/Resource/ResourceDetailsUpdate.tsx @@ -298,7 +298,7 @@ export const ResourceDetailsUpdate = (props: resourceProps) => { onChange={handleChange} label={"Is this an emergency?"} options={[true, false]} - optionDisplay={(o) => (o ? "Yes" : "No")} + optionLabel={(o) => (o ? "Yes" : "No")} optionValue={(o) => String(o)} value={String(state.form.emergency)} error={state.errors.emergency} diff --git a/src/Components/Shifting/ShiftDetailsUpdate.tsx b/src/Components/Shifting/ShiftDetailsUpdate.tsx index 8e6fb582906..ccf808ecda9 100644 --- a/src/Components/Shifting/ShiftDetailsUpdate.tsx +++ b/src/Components/Shifting/ShiftDetailsUpdate.tsx @@ -420,7 +420,7 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => { { label: t("yes"), value: "true" }, { label: t("no"), value: "false" }, ]} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} optionValue={(option) => option.value} /> @@ -434,7 +434,7 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => { { label: t("no"), value: "false" }, ]} optionValue={(option) => option.value} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} onChange={handleFormFieldChange} /> )} @@ -448,7 +448,7 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => { { label: t("no"), value: "false" }, ]} optionValue={(option) => option.value} - optionDisplay={(option) => option.label} + optionLabel={(option) => option.label} onChange={handleFormFieldChange} /> From c479e4602d10af48bb7c5ffdc988c41d44a4561b Mon Sep 17 00:00:00 2001 From: Hitish Rao P <140695309+HitishRaoP@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:23:44 +0530 Subject: [PATCH 2/3] Fixes Facility cover image edit button malfunctioning (#8531) --- src/Components/Facility/FacilityHome.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx index f1322e4d20e..22dd2bc830f 100644 --- a/src/Components/Facility/FacilityHome.tsx +++ b/src/Components/Facility/FacilityHome.tsx @@ -113,7 +113,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
setEditCoverImage(true)} > From f7bda46d59a61acc7f7adf898024796febde5dc7 Mon Sep 17 00:00:00 2001 From: Zeeshan <95434634+Zeshanxviii@users.noreply.github.com> Date: Wed, 18 Sep 2024 07:26:54 +0530 Subject: [PATCH 3/3] Updated TreatmentSummary component by integrating it with PrintPreview Component #8430 (#8441) --- cypress/pageobject/Asset/AssetFilters.ts | 2 +- cypress/pageobject/Asset/AssetSearch.ts | 4 +- .../pageobject/Patient/PatientInsurance.ts | 2 +- .../Patient/PatientMedicalHistory.ts | 4 +- scripts/generate-build-version.js | 2 +- .../Investigations/InvestigationTable.tsx | 36 +++++----- .../Investigations/ShowInvestigation.tsx | 38 +++++----- src/Components/Facility/TreatmentSummary.tsx | 69 ++++++++----------- src/Locale/en/Consultation.json | 3 + src/style/index.css | 3 +- 10 files changed, 76 insertions(+), 87 deletions(-) diff --git a/cypress/pageobject/Asset/AssetFilters.ts b/cypress/pageobject/Asset/AssetFilters.ts index 33363f2d161..ac83ca97c0b 100644 --- a/cypress/pageobject/Asset/AssetFilters.ts +++ b/cypress/pageobject/Asset/AssetFilters.ts @@ -3,7 +3,7 @@ export class AssetFilters { facilityName: string, assetStatus: string, assetClass: string, - assetLocation: string + assetLocation: string, ) { cy.contains("Advanced Filters").click(); cy.get("input[name='Facilities']") diff --git a/cypress/pageobject/Asset/AssetSearch.ts b/cypress/pageobject/Asset/AssetSearch.ts index b1ccb2f71c9..653c7bdd89c 100644 --- a/cypress/pageobject/Asset/AssetSearch.ts +++ b/cypress/pageobject/Asset/AssetSearch.ts @@ -17,7 +17,7 @@ export class AssetSearchPage { verifyBadgeContent(expectedText: string) { cy.get("[data-testid='Name/Serial No./QR ID']").should( "contain", - expectedText + expectedText, ); } @@ -54,7 +54,7 @@ export class AssetSearchPage { verifyAssetListContains(dummyCameraText: string) { cy.get("[data-testid='created-asset-list']").should( "contain", - dummyCameraText + dummyCameraText, ); } } diff --git a/cypress/pageobject/Patient/PatientInsurance.ts b/cypress/pageobject/Patient/PatientInsurance.ts index be4c25c5535..60eaefffa44 100644 --- a/cypress/pageobject/Patient/PatientInsurance.ts +++ b/cypress/pageobject/Patient/PatientInsurance.ts @@ -2,7 +2,7 @@ class PatientInsurance { typePatientInsuranceDetail( containerId: string, fieldId: string, - value: string + value: string, ) { cy.get(`#${containerId}`).within(() => { cy.get(`#${fieldId}`).click().type(value); diff --git a/cypress/pageobject/Patient/PatientMedicalHistory.ts b/cypress/pageobject/Patient/PatientMedicalHistory.ts index 1c9b733f3ba..a0dbdd0131a 100644 --- a/cypress/pageobject/Patient/PatientMedicalHistory.ts +++ b/cypress/pageobject/Patient/PatientMedicalHistory.ts @@ -31,7 +31,7 @@ class PatientMedicalHistory { patientSymptoms4, patientSymptoms5, patientSymptoms6, - patientSymptoms7 + patientSymptoms7, ) { cy.get("[data-testid=patient-details]").then(($dashboard) => { cy.url().should("include", "/facility/"); @@ -51,7 +51,7 @@ class PatientMedicalHistory { verifyNoSymptosPresent(patientSymptoms1: string) { cy.get("[data-testid=patient-details]").should( "not.contain", - patientSymptoms1 + patientSymptoms1, ); } } diff --git a/scripts/generate-build-version.js b/scripts/generate-build-version.js index 36e7ea1162a..84b8e0e5928 100644 --- a/scripts/generate-build-version.js +++ b/scripts/generate-build-version.js @@ -20,5 +20,5 @@ fs.writeFile( return console.log(err); } return null; - } + }, ); diff --git a/src/Components/Facility/Investigations/InvestigationTable.tsx b/src/Components/Facility/Investigations/InvestigationTable.tsx index 6984b0baedb..18c64108b6f 100644 --- a/src/Components/Facility/Investigations/InvestigationTable.tsx +++ b/src/Components/Facility/Investigations/InvestigationTable.tsx @@ -4,6 +4,7 @@ import { SelectFormField } from "../../Form/FormFields/SelectFormField"; import TextFormField from "../../Form/FormFields/TextFormField"; import { classNames } from "../../../Utils/utils"; import { useState } from "react"; +import { useTranslation } from "react-i18next"; const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => { return ( @@ -70,6 +71,7 @@ export const InvestigationTable = ({ handleUpdateCancel, handleSave, }: any) => { + const { t } = useTranslation(); const [searchFilter, setSearchFilter] = useState(""); const [showForm, setShowForm] = useState(false); const filterTests = Object.values(data).filter((i: any) => { @@ -84,16 +86,10 @@ export const InvestigationTable = ({ return (
- {title &&
{title}
} -
- window.print()} - className="my-2 mr-2" - disabled={showForm} - > - Print Report - + {title && ( +
{title}
+ )} +
setSearchFilter(e.value)} />
-
-
- - +
+
+
+ {["Name", "Value", "Unit", "Min", "Max", "Ideal"].map( (heading) => ( @@ -143,7 +140,7 @@ export const InvestigationTable = ({ )} - + {filterTests.length > 0 ? ( filterTests.map((t: any, i) => { const value = @@ -173,12 +170,13 @@ export const InvestigationTable = ({ }; handleValueChange(value, target); }} + className="print:text-black" /> ); }) ) : ( - - No tests taken + + )} diff --git a/src/Components/Facility/Investigations/ShowInvestigation.tsx b/src/Components/Facility/Investigations/ShowInvestigation.tsx index a7f74b98fde..7477c64f899 100644 --- a/src/Components/Facility/Investigations/ShowInvestigation.tsx +++ b/src/Components/Facility/Investigations/ShowInvestigation.tsx @@ -1,14 +1,13 @@ import _, { set } from "lodash-es"; import { navigate } from "raviger"; import { lazy, useCallback, useReducer } from "react"; -import { useTranslation } from "react-i18next"; import routes from "../../../Redux/api"; import * as Notification from "../../../Utils/Notifications.js"; import request from "../../../Utils/request/request"; import useQuery from "../../../Utils/request/useQuery"; -import PageTitle from "../../Common/PageTitle"; import InvestigationTable from "./InvestigationTable"; - +import PrintPreview from "../../../CAREUI/misc/PrintPreview"; +import { useTranslation } from "react-i18next"; const Loading = lazy(() => import("../../Common/Loading")); const initialState = { @@ -35,10 +34,15 @@ const updateFormReducer = (state = initialState, action: any) => { } }; -export default function ShowInvestigation(props: any) { +interface ShowInvestigationProps { + consultationId: string; + patientId: string; + sessionId: string; + facilityId: string; +} +export default function ShowInvestigation(props: ShowInvestigationProps) { + const { consultationId, patientId, sessionId } = props; const { t } = useTranslation(); - const { consultationId, patientId, facilityId, sessionId } = props; - const [state, dispatch] = useReducer(updateFormReducer, initialState); const { loading: investigationLoading } = useQuery(routes.getInvestigation, { pathParams: { @@ -141,20 +145,16 @@ export default function ShowInvestigation(props: any) { if (patientLoading || investigationLoading) { return ; } - return ( -
- + -
+ ); } diff --git a/src/Components/Facility/TreatmentSummary.tsx b/src/Components/Facility/TreatmentSummary.tsx index e719e859a4b..610e7dc189d 100644 --- a/src/Components/Facility/TreatmentSummary.tsx +++ b/src/Components/Facility/TreatmentSummary.tsx @@ -4,10 +4,8 @@ import { formatDateTime, formatPatientAge, } from "../../Utils/utils"; -import useAppHistory from "../../Common/hooks/useAppHistory"; import routes from "../../Redux/api"; import useQuery from "../../Utils/request/useQuery"; -import CareIcon from "../../CAREUI/icons/CareIcon"; import { ConsultationModel } from "./models"; import { useMemo } from "react"; import { @@ -18,6 +16,8 @@ import PageHeadTitle from "../Common/PageHeadTitle"; import { useTranslation } from "react-i18next"; import { PatientModel } from "../Patient/models"; import MedicineRoutes from "../Medicine/routes"; +import PrintPreview from "../../CAREUI/misc/PrintPreview"; +import careConfig from "@careConfig"; export interface ITreatmentSummaryProps { consultationId: string; @@ -28,12 +28,9 @@ export interface ITreatmentSummaryProps { export default function TreatmentSummary({ consultationId, patientId, - facilityId, }: ITreatmentSummaryProps) { const { t } = useTranslation(); const date = new Date(); - const { goBack } = useAppHistory(); - const url = `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`; const { data: patientData } = useQuery(routes.getPatient, { pathParams: { id: patientId }, @@ -49,50 +46,42 @@ export default function TreatmentSummary({
-
- - -
- -
-

- {consultationData?.facility_name ?? ""} -

+ +
+
+

{consultationData?.facility_name}

+ care logo +
+

+ {t("treatment_summary__heading")} +

-

- {t("treatment_summary__heading")} -

+
{formatDate(date)}
-
{formatDate(date)}
+
+ -
- + - + - + - + - + - - - + +
-
+
); diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json index 8282656b560..3d101bcb2bd 100644 --- a/src/Locale/en/Consultation.json +++ b/src/Locale/en/Consultation.json @@ -22,9 +22,12 @@ "investigations": "Investigations", "search_investigation_placeholder": "Search Investigation & Groups", "save_investigation": "Save Investigation", + "investigation_report_for_{{name}}": "Investigation Report for {{name}}", + "investigation_report_of_{{name}}":"Investigation Report of : {{name}}", "investigation_reports": "Investigation Reports", "no_investigation": "No investigation Reports found", "investigations_suggested": "Investigations Suggested", + "no_tests_taken":"No tests taken", "to_be_conducted": "To be conducted", "log_report": "Log Report", "no_investigation_suggestions": "No Investigation Suggestions", diff --git a/src/style/index.css b/src/style/index.css index 327cc03d047..254bf4e9b6e 100644 --- a/src/style/index.css +++ b/src/style/index.css @@ -435,7 +435,6 @@ button:disabled, background-size: 1000px 100%; } - @media print { body * { visibility: hidden; @@ -450,7 +449,7 @@ button:disabled, left: 0; top: 0; } -} +} .header-section .appBar { z-index: 1201;
{heading}
{t("no_tests_taken")}