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

Dosage heading is misaligned in the prescription module #8645 #8751

Merged
merged 14 commits into from
Nov 11, 2024
Merged

Dosage heading is misaligned in the prescription module #8645 #8751

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8efe2de
Dosage heading is misaligned in the prescription module #8645
Sulochan-khadka Oct 9, 2024
4379888
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Oct 9, 2024
6996006
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Oct 11, 2024
c6bbea2
added-rem-values
Sulochan-khadka Oct 15, 2024
f98d648
Fixed-alignment-Medicine-prescription
Sulochan-khadka Oct 23, 2024
fd45d72
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Nov 2, 2024
eb928ea
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Nov 2, 2024
aa48b0a
added-i18n-to-freq-indicator
Sulochan-khadka Nov 2, 2024
0a04577
Fixed-changes
Sulochan-khadka Nov 2, 2024
2ee58f4
Fixes:mobile-view
Sulochan-khadka Nov 9, 2024
5a43440
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Nov 9, 2024
87f5a91
Translation-for-"Dosage"
Sulochan-khadka Nov 10, 2024
f786863
Merge branch 'develop' into issues/8645/dosage-heading-misaligned
Sulochan-khadka Nov 10, 2024
6040bfd
Apply suggestions from code review
rithviknishad Nov 11, 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
22 changes: 11 additions & 11 deletions src/components/Medicine/MedicineAdministrationSheet/AdministrationTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ export default function MedicineAdministrationTable({
<thead className="sticky top-0 z-10 bg-secondary-50 text-xs font-medium text-black">
<tr>
<th className="sticky left-0 z-20 bg-secondary-50 py-3 pl-4 text-left">
<div className="flex justify-between gap-2">
<span className="text-sm">{t("medicine")}</span>
<span className="hidden px-2 text-center text-xs leading-none lg:block">
<p>Dosage &</p>
<p>
{prescriptions[0]?.dosage_type !== "PRN"
? "Frequency"
: "Indicator"}
</p>
</span>
</div>
<span className="text-sm">{t("medicine")}</span>
</th>
<th>
<span className="hidden px-2 text-center text-xs leading-none lg:block">
<p>Dosage &</p>
Copy link
Member

@rithviknishad rithviknishad Nov 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

use translations for the text "Dosage"

<p>
{prescriptions[0]?.dosage_type !== "PRN"
? t("Frequency")
: t("Indicator")}
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
</p>
</span>
</th>

<th>
Expand Down
7 changes: 5 additions & 2 deletions src/components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,10 @@ export default function MedicineAdministrationTableRow({
{prescription.medicine_object?.generic}
</span>
</div>

</div>
</td>
<td>
<div className="flex justify-center">
<div className="flex gap-1 text-xs font-semibold text-secondary-900 lg:flex-col lg:px-2 lg:text-center">
{prescription.dosage_type !== "TITRATED" ? (
<p>{prescription.base_dosage}</p>
Expand All @@ -225,7 +228,7 @@ export default function MedicineAdministrationTableRow({
</p>
)}

<p>
<p className="max-w-[6rem] truncate">
{prescription.dosage_type !== "PRN"
? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
: prescription.indicator}
Expand Down
Loading