Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Noufalrahim/feat/added units to pressure sore #8715

Closed
wants to merge 5 commits into from
Closed

Noufalrahim/feat/added units to pressure sore #8715

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e28b6ee
feat:Added units to Length and Width in Pressure Sore
noufalrahim Sep 30, 2024
ba60f9b
Merge branch 'develop' into noufalrahim/feat/added-units-to-pressure-…
noufalrahim Oct 5, 2024
04d980c
feat: added units and label to i18n locale files
noufalrahim Oct 5, 2024
304820b
Added units to pressure sore
noufalrahim Oct 5, 2024
0d4bb04
Merge branch 'noufalrahim/feat/added-units-to-pressure-sore' of https…
noufalrahim Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Components/LogUpdate/Sections/PressureSore/PressureSore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { IPressureSore } from "../../../Patient/models";
import { Error } from "../../../../Utils/Notifications";
import { classNames, getValueDescription } from "../../../../Utils/utils";
import { calculatePushScore } from "./utils";
import { useTranslation } from "react-i18next";

const PressureSore = ({ log, onChange, readonly }: LogUpdateSectionProps) => {
const value = log.pressure_sore ?? [];
Expand Down Expand Up @@ -104,6 +105,8 @@ const RegionEditor = (props: RegionEditorProps) => {

const isReadOnly = !props.onSave;

const { t } = useTranslation();

return (
<PopupModal
show={props.show}
Expand All @@ -129,7 +132,7 @@ const RegionEditor = (props: RegionEditorProps) => {
<br />
<div className="grid grid-cols-2 gap-2">
<TextFormField
label="Width"
label={t("width_label__cm")}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
label={t("width_label__cm")}
label={t("width", { unit: "cm" })}

name="width"
disabled={isReadOnly}
labelClassName="text-xs"
Expand All @@ -141,7 +144,7 @@ const RegionEditor = (props: RegionEditorProps) => {
onChange={(e) => update({ width: parseFloat(e.value) })}
/>
<TextFormField
label="Length"
label={t("length_label__cm")}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
label={t("length_label__cm")}
label={t("length", { unit: "cm" })}

name="length"
disabled={isReadOnly}
labelClassName="text-xs"
Expand Down
4 changes: 3 additions & 1 deletion src/Locale/en/Consultation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,7 @@
"diagnosis_at_discharge": "Diagnosis at Discharge",
"procedure_suggestions": "Procedure Suggestions",
"patient_notes_thread__Doctors": "Doctor's Discussions",
"patient_notes_thread__Nurses": "Nurse's Discussions"
"patient_notes_thread__Nurses": "Nurse's Discussions",
"width_label__cm": "Width (cm)",
"length_label__cm": "Length (cm)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"width_label__cm": "Width (cm)",
"length_label__cm": "Length (cm)"
"width": "Width ({{ unit }})",
"length": "Length ({{ unit }})"

}
Loading