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

fix: Irregular flow of responsive design in patient details #7266

Merged
merged 3 commits into from
Feb 28, 2024
Merged

fix: Irregular flow of responsive design in patient details #7266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc3d2ca
fixes responsive design in patient details
Ashutosh0602 Feb 23, 2024
04a5a30
fixes responsive design in patient details
Ashutosh0602 Feb 23, 2024
d774b22
Merge branch 'develop' into develop
nihal467 Feb 27, 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
2 changes: 1 addition & 1 deletion src/Components/Common/RelativeDateUserMention.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function RelativeDateUserMention(props: {
withoutSuffix?: boolean;
}) {
return (
<div className="flex flex-row flex-wrap items-center justify-center ">
<div className="flex flex-row flex-wrap items-center justify-start ">
<div className="tooltip">
<span
className={`tooltip-text tooltip-${props.tooltipPosition || "top"}`}
Expand Down
12 changes: 7 additions & 5 deletions src/Components/Facility/ConsultationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ export const ConsultationCard = (props: ConsultationProps) => {
<div className="mt-8 flex flex-col">
{
<div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
Created :{" "}
<div className=" ml-1 text-black">
<div className=" font-medium text-black">Created : </div>
<div className=" ml-1 text-gray-700">
<RelativeDateUserMention
tooltipPosition="right"
actionDate={itemData.created_date}
Expand All @@ -123,8 +123,8 @@ export const ConsultationCard = (props: ConsultationProps) => {
</div>
}
<div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
Last Modified :{" "}
<div className=" ml-1 text-black">
<div className=" font-medium text-black">Last Modified : </div>
<div className=" ml-1 text-gray-700">
<RelativeDateUserMention
tooltipPosition="right"
actionDate={itemData.modified_date}
Expand Down Expand Up @@ -163,7 +163,9 @@ export const ConsultationCard = (props: ConsultationProps) => {
`/facility/${itemData.facility}/patient/${itemData.patient}/consultation/${itemData.id}/daily-rounds`
)
}
disabled={itemData.discharge_date}
disabled={
(itemData.discharge_date as string | undefined) != undefined
}
authorizeFor={NonReadOnlyUsers}
>
Add Consultation Updates
Expand Down
11 changes: 6 additions & 5 deletions src/Components/Patient/SampleTestCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
</div>
</div>
</div>
<div className="m-2 mt-4 flex flex-col justify-between gap-4 md:flex-row">
<div className="m-2 mt-4 flex flex-col justify-between md:flex-row lg:gap-4">
<div className="flex flex-col justify-between gap-4 md:flex-row">
<div>
<div className="mb-2 text-sm text-gray-700">
Expand All @@ -156,16 +156,17 @@ export const SampleTestCard = (props: SampleDetailsProps) => {
</div>
</div>
<div className="flex flex-col gap-2">
<div className="flex flex-col items-center justify-end text-sm text-gray-700 md:flex-row">
Created:{" "}
<div className="flex flex-col flex-nowrap items-center justify-end text-sm text-gray-700 md:flex-col md:items-start md:justify-start lg:flex-row lg:items-center">
<div className=" font-medium text-black">Created: </div>

<RelativeDateUserMention
actionDate={itemData.created_date}
user={itemData.created_by}
tooltipPosition="left"
/>
</div>
<div className="flex flex-col items-center justify-end text-sm text-gray-700 md:flex-row">
Last Modified:{" "}
<div className="flex flex-col items-center justify-end text-sm text-gray-700 md:flex-col md:items-start lg:flex-row lg:items-center">
<div className=" font-medium text-black">Last Modified: </div>
<RelativeDateUserMention
actionDate={itemData.modified_date}
user={itemData.last_edited_by}
Expand Down
Loading