From ea4a69b0adbedea0c6d8f17dda6ce18639d51e03 Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Tue, 4 Feb 2025 00:21:05 +0530 Subject: [PATCH 1/9] improved tablet view responsiveness --- src/pages/Encounters/EncounterList.tsx | 280 +++++++++++++------------ 1 file changed, 142 insertions(+), 138 deletions(-) diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx index effc46721a5..8db184105de 100644 --- a/src/pages/Encounters/EncounterList.tsx +++ b/src/pages/Encounters/EncounterList.tsx @@ -214,8 +214,8 @@ export function EncounterList({ return ( -
-
+
+
@@ -467,191 +467,195 @@ export function EncounterList({
+
+ + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: undefined, + }) + } + > + All + + + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: "planned", + }) + } + > + + Planned + + + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: "in_progress", + }) + } + > + + In Progress + + + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: "discharged", + }) + } + > + + Discharged + + + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: "completed", + }) + } + > + + Completed + + + updateQuery({ + ...{ encounter_class: encounterClass, priority }, + status: "cancelled", + }) + } + > + + Cancelled + +
+ + +
+
+ + + + {/* Class Filter - Desktop */} +
+ + +
updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: undefined, + status, + priority, + encounter_class: undefined, }) } > - All + All Types updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: "planned", + status, + priority, + encounter_class: "imp", }) } > - - Planned + + Inpatient updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: "in_progress", + status, + priority, + encounter_class: "amb", }) } > - - In Progress + + Ambulatory updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: "discharged", + status, + priority, + encounter_class: "obsenc", }) } > - - Discharged + + Observation updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: "completed", + status, + priority, + encounter_class: "emer", }) } > - - Completed + + Emergency updateQuery({ - ...{ encounter_class: encounterClass, priority }, - status: "cancelled", + status, + priority, + encounter_class: "vr", }) } > - - Cancelled + + Virtual - - -
-
- - - - {/* Class Filter - Desktop */} -
- - - - updateQuery({ - status, - priority, - encounter_class: undefined, - }) - } - > - All Types - - - updateQuery({ - status, - priority, - encounter_class: "imp", - }) - } - > - - Inpatient - - - updateQuery({ - status, - priority, - encounter_class: "amb", - }) - } - > - - Ambulatory - - - updateQuery({ - status, - priority, - encounter_class: "obsenc", - }) - } - > - - Observation - - - updateQuery({ - status, - priority, - encounter_class: "emer", - }) - } - > - - Emergency - - - updateQuery({ - status, - priority, - encounter_class: "vr", - }) - } - > - - Virtual - - - updateQuery({ - status, - priority, - encounter_class: "hh", - }) - } - > - - Home Health - + + updateQuery({ + status, + priority, + encounter_class: "hh", + }) + } + > + + Home Health + +
From 85bfad8282fbdeb7be1686c2a1af2d04c5dbe22a Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Tue, 4 Feb 2025 17:21:19 +0530 Subject: [PATCH 2/9] solved i18n issue --- src/pages/Encounters/EncounterList.tsx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/Encounters/EncounterList.tsx b/src/pages/Encounters/EncounterList.tsx index 8db184105de..f6eaf605c80 100644 --- a/src/pages/Encounters/EncounterList.tsx +++ b/src/pages/Encounters/EncounterList.tsx @@ -478,7 +478,7 @@ export function EncounterList({ }) } > - All + {t("all")} - Planned + {t("encounter_status__planned")} - In Progress + {t("encounter_class__in_progress")} - Discharged + {t("discharge")} - Completed + {t("completed")} - Cancelled + {t("cancelled")}
@@ -569,7 +569,7 @@ export function EncounterList({ }) } > - All Types + {t("all")} - Inpatient + {t("encounter_class__imp")} - Ambulatory + {t("encounter_class__amb")} - Observation + {t("encounter_class__obsenc")} - Emergency + {t("emergency")} - Virtual + {t("encounter_class__vr")} - Home Health + {t("encounter_class__hh")}
From 158d70996cb7354bac9e8e269fa4510363901630 Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Wed, 5 Feb 2025 00:05:41 +0530 Subject: [PATCH 3/9] update mobile view responsiveness --- .../Facility/settings/locations/LocationView.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Facility/settings/locations/LocationView.tsx b/src/pages/Facility/settings/locations/LocationView.tsx index d5527d5fe4f..9b1e89c39f8 100644 --- a/src/pages/Facility/settings/locations/LocationView.tsx +++ b/src/pages/Facility/settings/locations/LocationView.tsx @@ -95,10 +95,10 @@ export default function LocationView({ id, facilityId }: Props) { return ( -
-
-
-
+
+
+
+

{t("locations")}

{getLocationFormLabel(location?.form)} @@ -117,7 +117,7 @@ export default function LocationView({ id, facilityId }: Props) { )}
-
+
@@ -136,7 +136,7 @@ export default function LocationView({ id, facilityId }: Props) { currentOrganizations={locationOrganizations.results} facilityId={facilityId} trigger={ - From c4586e61f1b688ae72c2f38307540c2d1be14955 Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Wed, 5 Feb 2025 16:32:10 +0530 Subject: [PATCH 4/9] added responsiveness in organization users page --- src/pages/Organization/OrganizationUsers.tsx | 4 ++-- src/pages/Organization/components/AddUserSheet.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/Organization/OrganizationUsers.tsx b/src/pages/Organization/OrganizationUsers.tsx index 479059fa9a3..02efa8b4f44 100644 --- a/src/pages/Organization/OrganizationUsers.tsx +++ b/src/pages/Organization/OrganizationUsers.tsx @@ -57,7 +57,7 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) { return (
-
+
-
+
{ diff --git a/src/pages/Organization/components/AddUserSheet.tsx b/src/pages/Organization/components/AddUserSheet.tsx index 1efba82ca81..b6054eb4a56 100644 --- a/src/pages/Organization/components/AddUserSheet.tsx +++ b/src/pages/Organization/components/AddUserSheet.tsx @@ -33,7 +33,7 @@ export default function AddUserSheet({ return ( - From 73c1773e8f61870bd0a3738087571d097c992047 Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Wed, 5 Feb 2025 17:04:52 +0530 Subject: [PATCH 5/9] minor change in button --- src/pages/Organization/components/LinkUserSheet.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Organization/components/LinkUserSheet.tsx b/src/pages/Organization/components/LinkUserSheet.tsx index 967783d61be..cee05d79724 100644 --- a/src/pages/Organization/components/LinkUserSheet.tsx +++ b/src/pages/Organization/components/LinkUserSheet.tsx @@ -111,7 +111,7 @@ export default function LinkUserSheet({ return ( - From 2b7ad7d76c1ff6ec814f20e650802ef6a2d9663b Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Thu, 6 Feb 2025 09:54:02 +0530 Subject: [PATCH 6/9] added responsiveness --- .../components/EditFacilityUserRoleSheet.tsx | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx index 3d96f2210a7..64de6747147 100644 --- a/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx +++ b/src/pages/Facility/settings/organizations/components/EditFacilityUserRoleSheet.tsx @@ -155,18 +155,22 @@ export default function EditUserRoleSheet({
-
-
- {t("username")} -

{userRole.user.username}

+
+
+
+ {t("username")} +

+ {userRole.user.username} +

+
+
+ + {t("current_role")} + +

{userRole.role.name}

+
- - {t("current_role")} - -

{userRole.role.name}

-
-
{t("last_login")}{" "} From 4d85716428a33dbacf35d2a3810f1375d0252bdf Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Sat, 8 Feb 2025 15:31:40 +0530 Subject: [PATCH 7/9] minor cleanup --- src/components/Medicine/MedicationRequestTable/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Medicine/MedicationRequestTable/index.tsx b/src/components/Medicine/MedicationRequestTable/index.tsx index 921e43cc27c..389093ae429 100644 --- a/src/components/Medicine/MedicationRequestTable/index.tsx +++ b/src/components/Medicine/MedicationRequestTable/index.tsx @@ -131,7 +131,7 @@ export default function MedicationRequestTable({
-
+
Date: Sat, 8 Feb 2025 15:33:53 +0530 Subject: [PATCH 8/9] remove unwanted changes --- .../Facility/settings/locations/LocationView.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/Facility/settings/locations/LocationView.tsx b/src/pages/Facility/settings/locations/LocationView.tsx index 9b1e89c39f8..d5527d5fe4f 100644 --- a/src/pages/Facility/settings/locations/LocationView.tsx +++ b/src/pages/Facility/settings/locations/LocationView.tsx @@ -95,10 +95,10 @@ export default function LocationView({ id, facilityId }: Props) { return ( -
-
-
-
+
+
+
+

{t("locations")}

{getLocationFormLabel(location?.form)} @@ -117,7 +117,7 @@ export default function LocationView({ id, facilityId }: Props) { )}
-
+
@@ -136,7 +136,7 @@ export default function LocationView({ id, facilityId }: Props) { currentOrganizations={locationOrganizations.results} facilityId={facilityId} trigger={ - From 837a6c991c15e3d30a2b09a999579a232a830414 Mon Sep 17 00:00:00 2001 From: Tanuj Nainwal Date: Sat, 8 Feb 2025 15:55:27 +0530 Subject: [PATCH 9/9] added truncate class --- src/components/Common/UserSelector.tsx | 2 +- .../settings/organizations/FacilityOrganizationUsers.tsx | 2 +- .../organizations/components/EditFacilityUserRoleSheet.tsx | 2 +- .../organizations/components/LinkFacilityUserSheet.tsx | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Common/UserSelector.tsx b/src/components/Common/UserSelector.tsx index ff2221d5561..a29187fcab1 100644 --- a/src/components/Common/UserSelector.tsx +++ b/src/components/Common/UserSelector.tsx @@ -63,7 +63,7 @@ export default function UserSelector({ className="min-w-60 justify-start" > {selected ? ( -
+
-
+

{t("users")}

{t("username")} -

+

{userRole.user.username}

diff --git a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx index c0cb464b2b1..00a458e755b 100644 --- a/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx +++ b/src/pages/Facility/settings/organizations/components/LinkFacilityUserSheet.tsx @@ -136,13 +136,13 @@ export default function LinkFacilityUserSheet({ {selectedUser && (
-
+
-
+
{selectedUser.first_name} {selectedUser.last_name} @@ -153,7 +153,7 @@ export default function LinkFacilityUserSheet({
-
+
Username

{selectedUser.username}