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 the Facilties tab overflow in Organization Layout #9778

Merged
merged 18 commits into from
Jan 16, 2025
Merged

Fix the Facilties tab overflow in Organization Layout #9778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4534f4e
Added a scroll-bar
AnveshNalimela Jan 6, 2025
bdcbbec
Fixed the organization layout irrepososive in mobile view
AnveshNalimela Jan 6, 2025
200f8e4
Added translations
AnveshNalimela Jan 6, 2025
97c09c5
Added translations
AnveshNalimela Jan 6, 2025
c3305f0
Changed from flex-row to col in mobile view
AnveshNalimela Jan 6, 2025
9e0a182
Merge branch 'develop' into issue/ohcnetwork#9775/facilties-tab
AnveshNalimela Jan 6, 2025
3158974
Made the requested changes
AnveshNalimela Jan 6, 2025
eb0c561
Merge branch 'develop' into issue/ohcnetwork#9775/facilties-tab
AnveshNalimela Jan 7, 2025
644b086
Merge branch 'develop' into issue/ohcnetwork#9775/facilties-tab
AnveshNalimela Jan 9, 2025
213fbd5
Updated the Layout
AnveshNalimela Jan 9, 2025
27b8026
Made the changes
AnveshNalimela Jan 10, 2025
1944f6b
Made the Layout complteley checked on all screens
AnveshNalimela Jan 10, 2025
b601ee4
Merge branch 'ohcnetwork:develop' into issue/ohcnetwork#9775/faciltie…
AnveshNalimela Jan 10, 2025
e4e3b54
i18n translations added
AnveshNalimela Jan 10, 2025
e92876e
Merge branch 'issue/ohcnetwork#9775/facilties-tab' of github.com:Anve…
AnveshNalimela Jan 10, 2025
4dd9abf
Merge branch 'ohcnetwork:develop' into issue/ohcnetwork#9775/faciltie…
AnveshNalimela Jan 14, 2025
5f7ce3c
Replaced unwanted reposives classes with flex-wrap
AnveshNalimela Jan 14, 2025
3165de4
smallchnage in spacing
AnveshNalimela Jan 14, 2025
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: 14 additions & 12 deletions src/pages/FacilityOrganization/FacilityOrganizationView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
return (
<FacilityOrganizationLayout id={id} facilityId={facilityId}>
<div className="space-y-6">
<div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4">
<div className="flex flex-col lg:flex-row justify-between item-start lg:items-center gap-4">
<h2 className="text-lg font-semibold">{t("organizations")}</h2>
<div className="flex items-center gap-4 w-full sm:w-auto">
<div className="w-full sm:w-72">
<div className="flex flex-col items-center md:flex-row sm:items-center gap-4 w-full lg:justify-end">
<div className="w-full lg:w-1/3">
<Input
placeholder="Search by name..."
value={searchQuery}
Expand All @@ -68,10 +68,12 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
className="w-full"
/>
</div>
<CreateFacilityOrganizationSheet
facilityId={facilityId}
parentId={id}
/>
<div className="w-auto">
<CreateFacilityOrganizationSheet
facilityId={facilityId}
parentId={id}
/>
</div>
</div>
</div>

Expand Down Expand Up @@ -99,8 +101,8 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
<Card key={org.id}>
<CardContent className="p-6">
<div className="space-y-4">
<div className="flex items-center justify-between">
<div className="space-y-1">
<div className="flex items-center justify-between flex-wrap">
<div className="space-y-1 mb-2">
<h3 className="text-lg font-semibold">
{org.name}
</h3>
Expand All @@ -113,7 +115,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
<Link
href={`/facility/${facilityId}/organization/${org.id}`}
>
View Details
{t("view_details")}
<CareIcon
icon="l-arrow-right"
className="h-4 w-4"
Expand All @@ -134,8 +136,8 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
<Card className="col-span-full">
<CardContent className="p-6 text-center text-gray-500">
{searchQuery
? `No organizations found matching "${searchQuery}"`
: "No sub-organizations found."}
? t("no_organizations_found_matching", { searchQuery })
: t("no_sub_organizations_found")}
</CardContent>
</Card>
)}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Organization/OrganizationView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ export default function OrganizationView({ id, navOrganizationId }: Props) {
<Card key={orgChild.id}>
<CardContent className="p-6">
<div className="space-y-4">
<div className="flex items-center justify-between">
<div className="space-y-1">
<div className="flex items-center justify-between flex-wrap">
<div className="space-y-1 mb-2">
<h3 className="text-lg font-semibold">
{orgChild.name}
</h3>
Expand All @@ -110,7 +110,7 @@ export default function OrganizationView({ id, navOrganizationId }: Props) {
</div>
<Button variant="link" asChild>
<Link href={`${baseUrl}/children/${orgChild.id}`}>
View Details
{t("view_details")}
<CareIcon
icon="l-arrow-right"
className="h-4 w-4"
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Organization/components/OrganizationLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default function OrganizationLayout({
</Breadcrumb>
{/* Navigation */}
<div className="mt-4">
<Menubar>
<Menubar className="w-full h-full overflow-x-auto">
{navItems
.filter((item) => item.visibility)
.map((item) => (
Expand Down
Loading