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

Fixed bed number coming up two time in patients page. #6526

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Fixed bed number coming up two time in patients page. #6526

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5289ad2
stop displaying bed name two times
AshrafMd-1 Oct 30, 2023
382c351
resolve tooltip
AshrafMd-1 Oct 30, 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
26 changes: 11 additions & 15 deletions src/Components/Patient/ManagePatients.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,27 +519,23 @@ export const PatientManager = () => {
<div className="h-20 w-full min-w-[5rem] rounded-lg border border-gray-300 bg-gray-50 md:w-20">
{patient?.last_consultation?.current_bed &&
patient?.last_consultation?.discharge_date === null ? (
<div className="flex h-full flex-col items-center justify-center">
<span className="tooltip w-full truncate px-1 text-center text-sm text-gray-900">
<div className="tooltip flex h-full flex-col items-center justify-center">
<span className="w-full truncate px-1 text-center text-sm text-gray-900">
{
patient?.last_consultation?.current_bed?.bed_object
?.location_object?.name
}
<span className="tooltip-text tooltip-bottom">
{
patient?.last_consultation?.current_bed?.bed_object
?.location_object?.name
}
</span>
</span>
<span className="w-full truncate px-1 text-center text-base font-bold">
{patient?.last_consultation?.current_bed?.bed_object.name}
<span className="tooltip-text tooltip-bottom">
{
patient?.last_consultation?.current_bed?.bed_object
?.name
}
</span>
{patient?.last_consultation?.current_bed?.bed_object?.name}
</span>
<span className="tooltip-text tooltip-bottom text-sm font-medium lg:-translate-y-1/2">
{
patient?.last_consultation?.current_bed?.bed_object
?.location_object?.name
}
<br />
{patient?.last_consultation?.current_bed?.bed_object?.name}
</span>
</div>
) : patient.last_consultation?.suggestion === "DC" ? (
Expand Down