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 styling issues in the patient details page #6639

Merged
merged 3 commits into from
Nov 21, 2023
Merged

Fix styling issues in the patient details page #6639

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
0d71611
fix styling issues
AshrafMd-1 Nov 15, 2023
131e24a
Merge branch 'develop' into Fix-#6632
AshrafMd-1 Nov 15, 2023
d9a1cb9
Merge branch 'coronasafe:develop' into Fix-#6632
AshrafMd-1 Nov 16, 2023
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 @@ -8,7 +8,7 @@ function RelativeDateUserMention(props: {
tooltipPosition?: "top" | "bottom" | "left" | "right";
}) {
return (
<div className="flex flex-row items-center">
<div className="flex flex-row flex-wrap items-center justify-center ">
<div className="tooltip">
<span
className={`tooltip-text tooltip-${props.tooltipPosition || "top"}`}
Expand Down
26 changes: 15 additions & 11 deletions src/Components/Facility/ConsultationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,25 @@ 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:{" "}
Created :{" "}
<div className=" ml-1 text-black">
<RelativeDateUserMention
tooltipPosition="right"
actionDate={itemData.created_date}
user={itemData.created_by}
/>
</div>
</div>
}
<div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
Last Modified :{" "}
<div className=" ml-1 text-black">
<RelativeDateUserMention
tooltipPosition="right"
actionDate={itemData.created_date}
user={itemData.created_by}
actionDate={itemData.modified_date}
user={itemData.last_edited_by}
/>
</div>
}
<div className="flex flex-col items-center text-sm text-gray-700 md:flex-row">
Last Modified:{" "}
<RelativeDateUserMention
tooltipPosition="right"
actionDate={itemData.modified_date}
user={itemData.last_edited_by}
/>
</div>
</div>
<div className="mt-4 flex w-full flex-col justify-between gap-1 md:flex-row">
Expand Down
6 changes: 3 additions & 3 deletions src/Components/Patient/PatientHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ export const PatientHome = (props: any) => {
</div>
<div className="mt-4 flex items-center">
<ButtonV2
className="w-full"
className="mb-2 w-full"
disabled={!patientData.is_active}
onClick={() =>
navigate(
Expand Down Expand Up @@ -717,7 +717,7 @@ export const PatientHome = (props: any) => {
</div>
</div>
<div className="mt-2 flex justify-between rounded-sm bg-white p-2 px-4 text-center shadow">
<div className="w-1/2 border-r-2 pb-1">
<div className="w-1/2 border-r-2 pb-1 pr-2">
<div className="text-sm font-normal leading-5 text-gray-500">
Created
</div>
Expand All @@ -730,7 +730,7 @@ export const PatientHome = (props: any) => {
</div>
</div>
</div>
<div className="w-1/2 pb-1">
<div className="w-1/2 pb-1 pl-2">
<div className="text-sm font-normal leading-5 text-gray-500">
Last Edited
</div>
Expand Down