From 70127e093b9f187bbe90e057c2cf2455c28818b0 Mon Sep 17 00:00:00 2001 From: Ashesh <3626859+Ashesh3@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:56:55 +0530 Subject: [PATCH 01/16] Fix investigation builder crash (#6755) * Fix investigation advice assignment in ConsultationForm * allow category selection if null --- src/Components/Facility/ConsultationForm.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx index 1d4abbedc39..3207787a27d 100644 --- a/src/Components/Facility/ConsultationForm.tsx +++ b/src/Components/Facility/ConsultationForm.tsx @@ -400,7 +400,9 @@ export const ConsultationForm = (props: any) => { cause_of_death: res.data?.discharge_notes || "", death_datetime: res.data?.death_datetime || "", death_confirmed_doctor: res.data?.death_confirmed_doctor || "", - InvestigationAdvice: res.data.investigation, + InvestigationAdvice: Array.isArray(res.data.investigation) + ? res.data.investigation + : [], diagnoses: res.data.diagnoses.sort( (a: ConsultationDiagnosis, b: ConsultationDiagnosis) => ConditionVerificationStatuses.indexOf(a.verification_status) - @@ -410,7 +412,7 @@ export const ConsultationForm = (props: any) => { dispatch({ type: "set_form", form: { ...state.form, ...formData } }); setBed(formData.bed); - if (res.data.last_daily_round) { + if (res.data.last_daily_round && state.form.category) { setDisabledFields((fields) => [...fields, "category"]); } } else { From f8aae49f2c6f3bb21a574c10be107ba3e7bab3ad Mon Sep 17 00:00:00 2001 From: Pranshu Aggarwal <70687348+Pranshu1902@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:57:08 +0530 Subject: [PATCH 02/16] fix responsiveness on patients page (#6759) * fix responsiveness * remove left margin --- src/Components/Patient/ManagePatients.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index 6a52d68130c..9988a7b9576 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -589,10 +589,10 @@ export const PatientManager = () => { )}
-
-
+
+
{patient.name} - + {formatAge(patient.age, patient.date_of_birth, true)}
From c015a29f28aa284d2b3f6b8cd47d48d32884d771 Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Wed, 13 Dec 2023 10:57:42 +0530 Subject: [PATCH 03/16] fixes #6810; format date and time for discharge date (#6813) --- .../Facility/ConsultationDetails/ConsultationUpdatesTab.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx index 0d8a70781da..beac7f595a8 100644 --- a/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx +++ b/src/Components/Facility/ConsultationDetails/ConsultationUpdatesTab.tsx @@ -233,7 +233,7 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => { ? formatDate( props.consultationData.discharge_date ) - : "--/--/----"} + : "--/--/---- --:-- --"}
@@ -294,10 +294,10 @@ export const ConsultationUpdatesTab = (props: ConsultationTabProps) => { Discharge Date {" - "} {props.consultationData.discharge_date - ? formatDate( + ? formatDateTime( props.consultationData.discharge_date ) - : "--/--/----"} + : "--/--/---- --:-- --"}
From 1a6b3d3e1bf604882a76a419684c4e460d989229 Mon Sep 17 00:00:00 2001 From: Onkar Jadhav <56870381+Omkar76@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:57:58 +0530 Subject: [PATCH 04/16] Allow occupancy button to resize on default font size change. Fixes #6805 (#6806) --- src/Components/Facility/FacilityCard.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Facility/FacilityCard.tsx b/src/Components/Facility/FacilityCard.tsx index 900b6b00f47..c34fed49a6e 100644 --- a/src/Components/Facility/FacilityCard.tsx +++ b/src/Components/Facility/FacilityCard.tsx @@ -160,7 +160,7 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
0.85 ? "button-danger-border bg-red-500" : "button-primary-border bg-primary-100" @@ -178,7 +178,7 @@ export const FacilityCard = (props: { facility: any; userType: any }) => { )} />{" "}
0.85 ? "text-white" : "text-gray-700" From 9967daecddbfbfefcfc5d7157945559e1fd37a68 Mon Sep 17 00:00:00 2001 From: Ashesh <3626859+Ashesh3@users.noreply.github.com> Date: Wed, 13 Dec 2023 10:59:17 +0530 Subject: [PATCH 05/16] Refactor user delete permissions to allow StateAdmin and DistrictAdmin (#6781) * Refactor user delete permissions * Add user type validation --- src/Components/Facility/FacilityUsers.tsx | 12 ++++++++--- src/Components/Users/ManageUsers.tsx | 20 +++++++----------- src/Utils/utils.ts | 25 +++++++++++++++++++++++ 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/Components/Facility/FacilityUsers.tsx b/src/Components/Facility/FacilityUsers.tsx index aba12cc3833..ca2e1d0e363 100644 --- a/src/Components/Facility/FacilityUsers.tsx +++ b/src/Components/Facility/FacilityUsers.tsx @@ -3,7 +3,12 @@ import CountBlock from "../../CAREUI/display/Count"; import CareIcon from "../../CAREUI/icons/CareIcon"; import { RESULTS_PER_PAGE_LIMIT } from "../../Common/constants"; import * as Notification from "../../Utils/Notifications.js"; -import { classNames, isUserOnline, relativeTime } from "../../Utils/utils"; +import { + classNames, + isUserOnline, + relativeTime, + showUserDelete, +} from "../../Utils/utils"; import Pagination from "../Common/Pagination"; import UserDetails from "../Common/UserDetails"; import ButtonV2 from "../Common/components/ButtonV2"; @@ -16,6 +21,7 @@ import useAuthUser from "../../Common/hooks/useAuthUser"; import request from "../../Utils/request/request"; import routes from "../../Redux/api"; import useQuery from "../../Utils/request/useQuery"; +import { UserModel } from "../Users/models"; const Loading = lazy(() => import("../Common/Loading")); @@ -256,7 +262,7 @@ export default function FacilityUsers(props: any) { facilityUserData && facilityUserData.results && facilityUserData.results.length && - (userList = facilityUserData.results.map((user: any) => { + (userList = facilityUserData.results.map((user: UserModel) => { return (
) : null} - {authUser.user_type === "StateAdmin" && ( + {showUserDelete(authUser, user) && (
+ {consultation?.last_daily_round && ( +
+ +
+ )}
{!!consultation?.discharge_date && ( diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx index af69d8464bc..3a856a04765 100644 --- a/src/Components/Patient/models.tsx +++ b/src/Components/Patient/models.tsx @@ -301,6 +301,14 @@ export interface DailyRoundsModel { created_date?: string; modified_date?: string; taken_at?: string; + consciousness_level?: + | "UNRESPONSIVE" + | "RESPONDS_TO_PAIN" + | "RESPONDS_TO_VOICE" + | "ALERT" + | "AGITATED_OR_CONFUSED" + | "ONSET_OF_AGITATION_AND_CONFUSION" + | "UNKNOWN"; rounds_type: (typeof DailyRoundTypes)[number]; last_updated_by_telemedicine?: boolean; created_by_telemedicine?: boolean; From cdbe306ffb860544cfc4eaa3267da7821fb4e516 Mon Sep 17 00:00:00 2001 From: Vedant Jain <129421822+jainvedant392@users.noreply.github.com> Date: Wed, 13 Dec 2023 19:33:02 +0530 Subject: [PATCH 08/16] Add loading screen in index.html (#6836) --- index.html | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 58cb9fffcd1..83c80ef3214 100644 --- a/index.html +++ b/index.html @@ -34,7 +34,34 @@ -
+
+ +
+ +
+