navigate("/facility/create")}
>
diff --git a/src/Components/Facility/TransferPatientDialog.tsx b/src/Components/Facility/TransferPatientDialog.tsx
index 05d08635b01..3ead082c610 100644
--- a/src/Components/Facility/TransferPatientDialog.tsx
+++ b/src/Components/Facility/TransferPatientDialog.tsx
@@ -58,7 +58,12 @@ const TransferPatientDialog = (props: Props) => {
const patientOptions: Array = patientList.map((patient) => {
return {
id: patient.patient_id as unknown as number,
- text: `${patient.name} (${patient.gender})`,
+ text: [
+ patient.name,
+ `(${patient.gender})`,
+ patient.is_expired ? "(Expired)" : "",
+ ].join(" "),
+ disabled: patient.is_expired,
};
});
@@ -171,6 +176,7 @@ const TransferPatientDialog = (props: Props) => {
options={patientOptions}
optionLabel={(patient) => patient.text}
optionValue={(patient) => patient.id}
+ optionDisabled={(patient) => patient.disabled ?? false}
value={state.form.patient}
onChange={handleChange}
error={state.errors.patient}
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 4114c61dee0..f93d95448a5 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -208,6 +208,7 @@ export interface DupPatientModel {
date_of_birth: string;
year_of_birth: number;
state_id: number;
+ is_expired: boolean;
}
export interface InventoryItemsModel {
diff --git a/src/Components/Form/MultiSelectMenuV2.tsx b/src/Components/Form/MultiSelectMenuV2.tsx
index ac180a88fca..9ab2f4d55c7 100644
--- a/src/Components/Form/MultiSelectMenuV2.tsx
+++ b/src/Components/Form/MultiSelectMenuV2.tsx
@@ -158,10 +158,10 @@ const MultiSelectMenuV2 = (props: Props) => {
className={classNames(
"text-sm font-normal",
option.disabled
- ? "text-secondary-700"
+ ? "text-secondary-500"
: active
? "text-primary-200"
- : "text-secondary-700",
+ : "text-secondary-500",
)}
>
{option.description}
@@ -226,7 +226,7 @@ export const dropdownOptionClassNames = ({
!disabled && active && "bg-primary-500 text-white",
!disabled && !active && selected && "text-primary-500",
!disabled && !active && !selected && "text-secondary-900",
- disabled && "cursor-not-allowed text-secondary-800",
+ disabled && "cursor-not-allowed text-secondary-600",
selected ? "font-semibold" : "font-normal",
);
};
diff --git a/src/Components/Patient/FileUpload.tsx b/src/Components/Patient/FileUpload.tsx
index d8f865d3fef..cfef384afe9 100644
--- a/src/Components/Patient/FileUpload.tsx
+++ b/src/Components/Patient/FileUpload.tsx
@@ -1397,10 +1397,12 @@ export const FileUpload = (props: FileUploadProps) => {
className="text-lg text-danger-500"
/>
-
+
Archive File
- This action is irreversible. Once a file is archived it cannot be
- unarchived.
+
+ This action is irreversible. Once a file is archived it cannot
+ be unarchived.
+
}
@@ -1447,10 +1449,12 @@ export const FileUpload = (props: FileUploadProps) => {
className="text-lg text-primary-500"
/>
-
-
+
{patient?.last_consultation?.current_bed &&
patient?.last_consultation?.discharge_date === null ? (
@@ -707,7 +707,7 @@ export const PatientManager = () => {
)}
- {!!patient.last_consultation?.has_consents.length || (
+ {/* {!!patient.last_consultation?.has_consents.length || (
{
- )}
+ )} */}
@@ -788,7 +788,6 @@ export const PatientManager = () => {
name,
value: qParams[name] || defaultValue,
onChange: (e: FieldChangeEvent
) => updateQuery({ [e.name]: e.value }),
- className: "grow w-full mb-2",
};
};
@@ -975,21 +974,23 @@ export const PatientManager = () => {
-
-
+
+
-
+
{
onChange={(e) => setPhoneNum(e.value)}
error={phoneNumberError}
types={["mobile", "landline"]}
+ className="w-full grow"
/>
{
onChange={(e) => setEmergencyPhoneNum(e.value)}
error={emergencyPhoneNumberError}
types={["mobile", "landline"]}
+ className="w-full"
/>
- {!qParams.last_consultation__consent_types &&
+ {/*!qParams.last_consultation__consent_types &&
(patientsWithNoConsents || 0) > 0 && (
@@ -1027,7 +1030,7 @@ export const PatientManager = () => {
- )}
+ )*/}
-
+
{userData.show && (
diff --git a/src/Utils/useFileManager.tsx b/src/Utils/useFileManager.tsx
index 145c63800a8..6d73710d2b4 100644
--- a/src/Utils/useFileManager.tsx
+++ b/src/Utils/useFileManager.tsx
@@ -224,10 +224,12 @@ export default function useFileManager(
className="text-lg text-danger-500"
/>
-
+
Archive File
- This action is irreversible. Once a file is archived it cannot be
- unarchived.
+
+ This action is irreversible. Once a file is archived it cannot
+ be unarchived.
+
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 43e2412b93c..a40c805621f 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -3,6 +3,7 @@ const colors = require("tailwindcss/colors");
const defaultTheme = require("tailwindcss/defaultTheme");
const gray = {
+ 50: "#F9FAFB",
100: "#FBFAFC",
200: "#F7F5FA",
300: "#F1EDF7",