From 4534f4efb1969e64581ac717beac73d2160665b9 Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 11:04:17 +0530
Subject: [PATCH 01/11] Added a scroll-bar

---
 src/pages/Organization/components/OrganizationLayout.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx
index ff38dcbe4ba..bcabc1e3e93 100644
--- a/src/pages/Organization/components/OrganizationLayout.tsx
+++ b/src/pages/Organization/components/OrganizationLayout.tsx
@@ -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) => (

From bdcbbecac79dc8d726c0fc39e962676269e400be Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 11:24:05 +0530
Subject: [PATCH 02/11] Fixed the organization layout irrepososive in mobile
 view

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index 8a362cf21cb..a5eaed23e20 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -53,8 +53,8 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
       <div className="space-y-6">
         <div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4">
           <h2 className="text-lg font-semibold">Organizations</h2>
-          <div className="flex items-center gap-4 w-full sm:w-auto">
-            <div className="w-full sm:w-72">
+          <div className="lg:flex items-center gap-4 w-full sm:w-auto flex-row ">
+            <div className="w-full sm:w-72 mb-2 lg:mb-0">
               <Input
                 placeholder="Search by name..."
                 value={searchQuery}

From 200f8e44e5e4dfa049b309b3d9c6e9924f2c0ddc Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 11:39:39 +0530
Subject: [PATCH 03/11] Added translations

---
 public/locale/en.json                                    | 2 ++
 .../FacilityOrganization/FacilityOrganizationView.tsx    | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 53586b56e86..8fef12d81c2 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1205,6 +1205,7 @@
   "new_password_validation": "New password is not valid.",
   "next_sessions": "Next Sessions",
   "no": "No",
+  "noOrganizationsFound": "No organizations found matching {{searchQuery}}",
   "no_address_provided": "No address provided",
   "no_appointments": "No appointments found",
   "no_attachments_found": "This communication has no attachments.",
@@ -1256,6 +1257,7 @@
   "no_slots_found": "No slots found",
   "no_social_profile_details_available": "No Social Profile Details Available",
   "no_staff": "No staff found",
+  "no_suborganizations_found": "No sub-organizations found.",
   "no_tests_taken": "No tests taken",
   "no_treating_physicians_available": "This facility does not have any home facility doctors. Please contact your admin.",
   "no_user_assigned": "No User Assigned to this patient",
diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index a5eaed23e20..ff71db4c4a9 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
 import { Link } from "raviger";
 import { useState } from "react";
 
@@ -52,7 +53,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
     <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">
-          <h2 className="text-lg font-semibold">Organizations</h2>
+          <h2 className="text-lg font-semibold">{t("organizations")}</h2>
           <div className="lg:flex items-center gap-4 w-full sm:w-auto flex-row ">
             <div className="w-full sm:w-72 mb-2 lg:mb-0">
               <Input
@@ -110,7 +111,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"
@@ -131,8 +132,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("noOrganizationsFound", { searchQuery })
+                      : t("no_suborganizations_found")}
                   </CardContent>
                 </Card>
               )}

From 97c09c525680a76f7f941bea4042c240b2ffa1ac Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 11:42:32 +0530
Subject: [PATCH 04/11] Added translations

---
 public/locale/en.json                                       | 2 +-
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/locale/en.json b/public/locale/en.json
index 8fef12d81c2..d86acf7f83c 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1205,7 +1205,6 @@
   "new_password_validation": "New password is not valid.",
   "next_sessions": "Next Sessions",
   "no": "No",
-  "noOrganizationsFound": "No organizations found matching {{searchQuery}}",
   "no_address_provided": "No address provided",
   "no_appointments": "No appointments found",
   "no_attachments_found": "This communication has no attachments.",
@@ -1235,6 +1234,7 @@
   "no_notices_for_you": "No notices for you.",
   "no_observations": "No Observations",
   "no_ongoing_medications": "No Ongoing Medications",
+  "no_organizations_found_for_query": "No organizations found matching {{searchQuery}}",
   "no_patients": "No patients found",
   "no_patients_found": "No Patients Found",
   "no_patients_found_phone_number": "No patients found with this phone number. Please create a new patient to proceed with booking appointment.",
diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index ff71db4c4a9..0ddb42762ae 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -132,7 +132,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
                 <Card className="col-span-full">
                   <CardContent className="p-6 text-center text-gray-500">
                     {searchQuery
-                      ? t("noOrganizationsFound", { searchQuery })
+                      ? t("no_organizations_found_for_query", { searchQuery })
                       : t("no_suborganizations_found")}
                   </CardContent>
                 </Card>

From c3305f06e754fee3b2fab971464b32d416fde824 Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 12:13:24 +0530
Subject: [PATCH 05/11] Changed from flex-row to col in mobile view

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index 0ddb42762ae..3d8c6ba191a 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -54,8 +54,8 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
       <div className="space-y-6">
         <div className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4">
           <h2 className="text-lg font-semibold">{t("organizations")}</h2>
-          <div className="lg:flex items-center gap-4 w-full sm:w-auto flex-row ">
-            <div className="w-full sm:w-72 mb-2 lg:mb-0">
+          <div className="flex items-center gap-4 w-full sm:w-auto ">
+            <div className="w-1/2 md:w-fit sm:w-72">
               <Input
                 placeholder="Search by name..."
                 value={searchQuery}

From 3158974b6844fa1711794417bc717a039a525755 Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Mon, 6 Jan 2025 18:42:30 +0530
Subject: [PATCH 06/11] Made the requested changes

---
 .../FacilityOrganizationView.tsx                   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index 3d8c6ba191a..aff7432e635 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -54,8 +54,8 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
       <div className="space-y-6">
         <div className="flex flex-col sm:flex-row justify-between items-start sm: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-1/2 md:w-fit sm:w-72">
+          <div className="flex flex-col sm:flex-row items-center gap-4 justify-center w-full sm:justify-end ">
+            <div className="w-full mb-1 sm:mb-0 lg:w-1/3 md:w-fit">
               <Input
                 placeholder="Search by name..."
                 value={searchQuery}
@@ -66,10 +66,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>
 

From 213fbd5d3d29300cfec0137f5d38524730bc0409 Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Thu, 9 Jan 2025 18:53:35 +0530
Subject: [PATCH 07/11] Updated the Layout

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index aff7432e635..773b08c833d 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -97,10 +97,10 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
               {children?.results?.length ? (
                 children.results.map((org) => (
                   <Card key={org.id}>
-                    <CardContent className="p-6">
+                    <CardContent className="p-4">
                       <div className="space-y-4">
-                        <div className="flex items-center justify-between">
-                          <div className="space-y-1">
+                        <div className="flex items-center justify-between overflow-hidden">
+                          <div className="space-y-1 w-1/2">
                             <h3 className="text-lg font-semibold">
                               {org.name}
                             </h3>

From 1944f6be497567c271e1d0aafe750af055425f85 Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Fri, 10 Jan 2025 19:35:40 +0530
Subject: [PATCH 08/11] Made the Layout complteley checked on all screens

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index ec9ce56f52d..1f51a12b584 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -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 flex-col sm:flex-row items-center gap-4 justify-center w-full sm:justify-end ">
-            <div className="w-full mb-1 sm:mb-0 lg:w-1/3 md:w-fit">
+          <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}

From e4e3b54dbdf4f7f6124b79a575d13308c2bf8f1d Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Fri, 10 Jan 2025 19:48:49 +0530
Subject: [PATCH 09/11] i18n translations added

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index 1f51a12b584..521e094202b 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -136,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
-                      ? t("no_organizations_found_for_query", { searchQuery })
-                      : t("no_suborganizations_found")}
+                      ? t("no_organizations_found_matching", { searchQuery })
+                      : t("no_sub_organizations_found")}
                   </CardContent>
                 </Card>
               )}

From 5f7ce3cc575e721e96bccb1cbd16773c7a1345ab Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Tue, 14 Jan 2025 16:01:36 +0530
Subject: [PATCH 10/11] Replaced unwanted reposives classes with flex-wrap

---
 .../FacilityOrganization/FacilityOrganizationView.tsx     | 8 ++++----
 src/pages/Organization/OrganizationView.tsx               | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index d2ee2a7fa16..28220fde6a5 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -99,10 +99,10 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
               {children?.results?.length ? (
                 children.results.map((org) => (
                   <Card key={org.id}>
-                    <CardContent className="p-4">
-                      <div className="space-y-4">
-                        <div className="flex items-center justify-between overflow-hidden">
-                          <div className="space-y-1 w-1/2">
+                    <CardContent className="p-6">
+                      <div className="space-y-6">
+                        <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>
diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx
index ebed2ca5a14..a4d5e9bb85e 100644
--- a/src/pages/Organization/OrganizationView.tsx
+++ b/src/pages/Organization/OrganizationView.tsx
@@ -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-3">
                             <h3 className="text-lg font-semibold">
                               {orgChild.name}
                             </h3>
@@ -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"

From 3165de4e2fe40536eee586fd07be3a6c8698cc4f Mon Sep 17 00:00:00 2001
From: AnveshNalimela <nalimelaanvesh@gmail.com>
Date: Tue, 14 Jan 2025 16:04:10 +0530
Subject: [PATCH 11/11] smallchnage in spacing

---
 src/pages/FacilityOrganization/FacilityOrganizationView.tsx | 2 +-
 src/pages/Organization/OrganizationView.tsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
index 28220fde6a5..2859d6ec99e 100644
--- a/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
+++ b/src/pages/FacilityOrganization/FacilityOrganizationView.tsx
@@ -100,7 +100,7 @@ export default function FacilityOrganizationView({ id, facilityId }: Props) {
                 children.results.map((org) => (
                   <Card key={org.id}>
                     <CardContent className="p-6">
-                      <div className="space-y-6">
+                      <div className="space-y-4">
                         <div className="flex items-center justify-between flex-wrap">
                           <div className="space-y-1 mb-2">
                             <h3 className="text-lg font-semibold">
diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx
index a4d5e9bb85e..3a0f140f250 100644
--- a/src/pages/Organization/OrganizationView.tsx
+++ b/src/pages/Organization/OrganizationView.tsx
@@ -90,7 +90,7 @@ export default function OrganizationView({ id, navOrganizationId }: Props) {
                     <CardContent className="p-6">
                       <div className="space-y-4">
                         <div className="flex items-center justify-between flex-wrap">
-                          <div className="space-y-1 mb-3">
+                          <div className="space-y-1 mb-2">
                             <h3 className="text-lg font-semibold">
                               {orgChild.name}
                             </h3>