+
+ {config.enable_abdm ? (
+
+ ) : (
+ <>
+ )}
);
};
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 05cdd8cde7d..5c24c80687a 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -100,7 +100,7 @@ export interface ConsultationModel {
modified_date?: string;
other_symptoms?: string;
patient?: string;
- prescribed_medication?: string;
+ treatment_plan?: string;
referred_to?: number | null;
referred_to_object?: FacilityModel;
referred_to_external?: string;
diff --git a/src/Components/Form/AutoCompleteAsync.tsx b/src/Components/Form/AutoCompleteAsync.tsx
index 97468d96390..d06067af957 100644
--- a/src/Components/Form/AutoCompleteAsync.tsx
+++ b/src/Components/Form/AutoCompleteAsync.tsx
@@ -3,7 +3,10 @@ import { Combobox } from "@headlessui/react";
import { debounce } from "lodash";
import { DropdownTransition } from "../Common/components/HelperComponents";
import CareIcon from "../../CAREUI/icons/CareIcon";
-import { dropdownOptionClassNames } from "./MultiSelectMenuV2";
+import {
+ MultiSelectOptionChip,
+ dropdownOptionClassNames,
+} from "./MultiSelectMenuV2";
interface Props {
name?: string;
@@ -143,19 +146,14 @@ const AutoCompleteAsync = (props: Props) => {
{multiple && selected?.length > 0 && (
{selected?.map((option: any) => (
-
- {optionLabel(option)}
- {
- onChange(
- selected.filter((item: any) => item.id !== option.id)
- );
- }}
- >
-
-
-
+
+ onChange(
+ selected.filter((item: any) => item.id !== option.id)
+ )
+ }
+ />
))}
)}
diff --git a/src/Components/Medicine/AdministerMedicine.tsx b/src/Components/Medicine/AdministerMedicine.tsx
index ec749e7a535..0159bc4b7a8 100644
--- a/src/Components/Medicine/AdministerMedicine.tsx
+++ b/src/Components/Medicine/AdministerMedicine.tsx
@@ -53,7 +53,7 @@ export default function AdministerMedicine({ prescription, ...props }: Props) {
setIsLoading(false);
props.onClose(true);
}}
- className="w-full max-w-4xl"
+ className="w-full md:max-w-4xl"
>
();
+ const { t } = useTranslation();
+
+ const [state, setState] = useState();
+ const pagination = useRangePagination({
+ bounds: state?.administrationsTimeBounds ?? {
+ start: new Date(),
+ end: new Date(),
+ },
+ perPage: 24 * 60 * 60 * 1000,
+ slots: 24,
+ defaultEnd: true,
+ });
+ const [showBulkAdminister, setShowBulkAdminister] = useState(false);
+
+ const { list, prescription } = useMemo(
+ () => PrescriptionActions(consultation_id),
+ [consultation_id]
+ );
+
+ const refetch = useCallback(async () => {
+ const res = await dispatch(
+ list({ is_prn: prn, prescription_type: "REGULAR" })
+ );
+
+ setState({
+ prescriptions: (res.data.results as Prescription[]).sort(
+ (a, b) => (a.discontinued ? 1 : 0) - (b.discontinued ? 1 : 0)
+ ),
+ administrationsTimeBounds: getAdministrationBounds(res.data.results),
+ });
+ }, [consultation_id, dispatch]);
+
+ useEffect(() => {
+ refetch();
+ }, [refetch]);
+
+ return (
+
+ {state?.prescriptions && (
+
+ {
+ setShowBulkAdminister(false);
+ refetch();
+ }}
+ />
+
+ )}
+
+
+
+
+
+ {t("edit_prescriptions")}
+
+ {t("edit")}
+
+ setShowBulkAdminister(true)}
+ className="w-full"
+ >
+
+
+ {t("administer_medicines")}
+
+ {t("administer")}
+
+
+ )
+ }
+ />
+
+
+
+
+
+ | {t("medicine")} |
+
+
+ Dosage &
+
+ {!state?.prescriptions[0]?.is_prn ? "Frequency" : "Indicator"}
+
+ |
+
+
+
+
+
+ |
+ {state === undefined
+ ? Array.from({ length: 24 }, (_, i) => i).map((i) => (
+
+
+ |
+ ))
+ : pagination.slots?.map(({ start, end }, index) => (
+
+ {formatDateTime(start, "DD/MM")}
+ {formatDateTime(start, "HH:mm")}
+
+
+ Administration(s) between
+
+ {formatTime(start)} and{" "}
+ {formatTime(end)}
+
+ on {formatDate(start)}
+
+ |
+ ))}
+
+
+
+
+ |
+
+ |
+
+
+
+
+ {state?.prescriptions?.map((item) => (
+
+ ))}
+ {state?.prescriptions.length === 0 && (
+
+
+
+ {prn
+ ? "No PRN Prescriptions Prescribed"
+ : "No Prescriptions Prescribed"}
+
+
+ )}
+
+
+
+ {showDiscontinue && (
+ {
+ setShowDiscontinue(false);
+ if (success) {
+ props.refetch();
+ }
+ }}
+ />
+ )}
+ {showAdminister && (
+ {
+ setShowAdminister(false);
+ if (success) {
+ props.refetch();
+ }
+ }}
+ />
+ )}
+ {showDetails && (
+ setShowDetails(false)}
+ className="w-full md:max-w-4xl"
+ show
+ >
+
+
+
+ setShowDetails(false)}
+ label={t("close")}
+ />
+ setShowDiscontinue(true)}
+ >
+
+ {t("discontinue")}
+
+ setShowAdminister(true)}
+ >
+
+ {t("administer")}
+
+
+
setShowDetails(true)}
+ >
+
+
+ {prescription.medicine_object?.name ?? prescription.medicine_old}
+
+
+ {prescription.discontinued && (
+
+ {t("discontinued")}
+
+ )}
+
+ {prescription.route && (
+
+ {t(prescription.route)}
+
+ )}
+
+ |
+
+
+ {prescription.dosage}
+
+ {!prescription.is_prn
+ ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
+ : prescription.indicator}
+
+ |
+
+ |
+ {/* Administration Cells */}
+ {props.intervals.map(({ start, end }, index) => (
+
+ {administrations === undefined ? (
+
+ ) : (
+
+ )}
+ |
+ ))}
+ |
+
+ {/* Action Buttons */}
+
+ setShowAdminister(true)}
+ >
+ {t("administer")}
+
+ |
+
+ );
+};
+
+interface AdministrationCellProps {
+ administrations: MedicineAdministrationRecord[];
+ interval: DateRange;
+ prescription: Prescription;
+}
+
+const AdministrationCell = ({
+ administrations,
+ interval: { start, end },
+ prescription,
+}: AdministrationCellProps) => {
+ // Check if cell belongs to an administered prescription
+ const administered = administrations.filter((administration) =>
+ dayjs(administration.administered_date).isBetween(start, end)
+ );
+
+ if (administered.length) {
+ return (
+
+
+
+ {administered.length > 1 && (
+
+ {administered.length}
+
+ )}
+
+
+
+ Administered on{" "}
+ {formatDateTime(administered[0].administered_date)}
+
+
+ {administered.length > 1
+ ? `Administered ${administered.length} times`
+ : `Administered ${formatTime(administered[0].administered_date)}`}
+
+
+
+
+
+
+ Discontinued on{" "}
+ {formatDateTime(prescription.discontinued_date)}
+
+
+ Reason:{" "}
+ {prescription.discontinued_reason ? (
+ {prescription.discontinued_reason}
+ ) : (
+ Not specified
+ )}
+
+
+
+ //
+ //
+ //
+ // Prescribed on{" "}
+ // {formatDateTime(prescription.created_date)}
+ //
+ //
+ //
diff --git a/src/Components/Users/SkillsSlideOver.tsx b/src/Components/Users/SkillsSlideOver.tsx
index 49de110fd86..cf43b738181 100644
--- a/src/Components/Users/SkillsSlideOver.tsx
+++ b/src/Components/Users/SkillsSlideOver.tsx
@@ -120,19 +120,19 @@ export default ({ show, setShow, username }: IProps) => {
selected={selectedSkill}
setSelected={setSelectedSkill}
errors=""
+ username={username}
/>
- addSkill(username, selectedSkill)}
- className="w-6rem"
- >
- {/* Replace "Add" in button with CircularProgress */}
- {isLoading ? (
-
- ) : (
- t("add")
- )}
-
+ {isLoading ? (
+
+ ) : (
+ addSkill(username, selectedSkill)}
+ className="w-6rem"
+ >
+ {t("add")}
+
+ )}
{!authorizeForAddSkill && (
{t("contact_your_admin_to_add_skills")}
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index b15e76f7177..e00fd33bec6 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -1027,6 +1027,18 @@ export const PrescriptionActions = (consultation_external_id: string) => {
`administer-medicine-${external_id}`
),
+ listAdministrations: (query?: {
+ administered_date_after?: string;
+ administered_date_before?: string;
+ }) =>
+ fireRequest(
+ "listAdministrations",
+ [],
+ { prescription: external_id, ...query },
+ pathParams,
+ `list-administrations-${external_id}`
+ ),
+
/** Discontinue a prescription */
discontinue: (discontinued_reason: string | undefined) =>
fireRequest(
diff --git a/src/Router/AppRouter.tsx b/src/Router/AppRouter.tsx
index 6c2ea6a4e8d..24b24cfdf09 100644
--- a/src/Router/AppRouter.tsx
+++ b/src/Router/AppRouter.tsx
@@ -73,10 +73,9 @@ import { handleSignOut } from "../Utils/utils";
import SessionExpired from "../Components/ErrorPages/SessionExpired";
import ManagePrescriptions from "../Components/Medicine/ManagePrescriptions";
import CentralNursingStation from "../Components/Facility/CentralNursingStation";
-import { ConfigureHealthFacility } from "../Components/ABDM/ConfigureHealthFacility";
export default function AppRouter() {
- const { main_logo, enable_hcx, enable_abdm } = useConfig();
+ const { main_logo, enable_hcx } = useConfig();
const routes = {
"/": () => ,
@@ -99,15 +98,6 @@ export default function AppRouter() {
"/facility/:facilityId/update": ({ facilityId }: any) => (
),
- ...(enable_abdm
- ? {
- "/facility/:facilityId/health_facility": ({
- facilityId,
- }: {
- facilityId: string;
- }) => ,
- }
- : {}),
"/facility/:facilityId/middleware/update": ({ facilityId }: any) => (
),
diff --git a/src/Utils/dayjs.ts b/src/Utils/dayjs.ts
index f883229b45e..b70c2fc044b 100644
--- a/src/Utils/dayjs.ts
+++ b/src/Utils/dayjs.ts
@@ -2,9 +2,11 @@ import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime";
import duration from "dayjs/plugin/duration";
import customParseFormat from "dayjs/plugin/customParseFormat";
+import isBetween from "dayjs/plugin/isBetween";
dayjs.extend(relativeTime);
dayjs.extend(duration);
dayjs.extend(customParseFormat);
+dayjs.extend(isBetween);
export default dayjs;
diff --git a/src/style/index.css b/src/style/index.css
index 6b06aacef6d..103b2ef04ce 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -446,19 +446,6 @@ button:disabled,
}
-/* .player-wrapper {
- width: auto;
- height: auto;
-}
-.react-player {
- aspect-ratio: 16/9;
- position: relative;
-}
-
-.react-player > div {
- position: absolute;
-} */
-
@media print {
body * {
visibility: hidden;
@@ -523,116 +510,6 @@ button:disabled,
100% {opacity: 0;}
}
-.main-content {
- margin-top: 64px;
- border-bottom: solid 50px #f1f1f1;
- background: #f1f1f1;
- min-height: 100vh;
-}
-
-@media only screen and (min-width: 601px) {
- .main-content {
- margin-left: 240px;
- }
-}
-
-.app-footer {
- width: 100%;
- background: #ffffff no-repeat;
- background-size: 100% 100%;
- min-height: 80px;
- z-index: 1202;
- display: flex;
- flex-direction: row;
- margin-top: auto;
-}
-
-@media (max-width: 768px) {
- .app-footer {
- flex-direction: column;
- }
-}
-
-.appBar {
- background-color: white !important;
-}
-
-.vertical-align {
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.add-item-card {
- background: #ffffff;
- border: dashed 1px #333;
- cursor: pointer;
- min-height: 120px;
- line-height: 120px;
-}
-
-.stats-cards .stats-card-item {
- padding: 10px;
- margin: 16px;
-}
-
-@media only screen and (max-width: 601px) {
- .createBtn {
- position: relative !important;
- right: 20px;
- top: 0px;
- }
-}
-
-.cursor-pointer {
- cursor: pointer;
-}
-
-.description-text {
- overflow: hidden;
- text-overflow: ellipsis;
- padding: 5px 0px;
-}
-
-.wrap-text {
- white-space: pre-wrap;
-}
-
-.no-wrap-text {
- white-space: nowrap;
-}
-
-.non-clickable {
- cursor: not-allowed;
-}
-
-.pagination {
- margin: auto;
-}
-
-.error-text {
- font-size: 0.75rem;
- line-height: 1rem;
- font-weight: 500;
- letter-spacing: 0.025em;
-}
-
-.hometext {
- margin: 10px 35px !important;
-}
-
-@media (max-width: 768px) {
- .hometext {
- margin: 10px 15px !important;
- }
-}
-
-@media (min-width: 768px) {
- .hometitle {
- margin-top: 15px !important;
- }
-}
-
.badge {
display: inline-block;
padding: 0.25em 0.4em;
@@ -690,28 +567,6 @@ button:disabled,
border-color: #28a745;
}
-.react-tel-input .form-control+div:before {
- content: "";
-}
-
-.react-tel-input {
- margin-top: 8px;
- margin-bottom: 4px;
-}
-
-.react-tel-input .form-control {
- padding-top: 6px;
- padding-bottom: 6px;
- width: 100%;
- border-radius: 4px;
- height: 38px;
-}
-
-.react-tel-input .form-control:focus {
- border-color: #28a745;
- box-shadow: 0 0 0 1px #28a745;
-}
-
.form-input {
padding-top: 6px;
padding-bottom: 6px;
@@ -725,15 +580,6 @@ button:disabled,
box-shadow: 0 0 0 1px #28a745 !important;
}
-@media (min-width:770px) {
- .title-text {
- position: absolute;
- top: 0;
- right: 0;
- margin-top: -3rem;
- }
-}
-
.copied-to-cb {
color: #28a745;
font-size: 13px;
diff --git a/tailwind.config.js b/tailwind.config.js
index afb60c951a6..7c889ea5d16 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -83,14 +83,10 @@ module.exports = {
},
},
},
- corePlugins: {
- aspectRatio: false,
- },
content: ["./src/**/*.{html,md,js,jsx,ts,tsx,res}", "./index.html"],
plugins: [
require("@tailwindcss/forms"),
require("@tailwindcss/typography"),
- require("@tailwindcss/aspect-ratio"),
require("@tailwindcss/container-queries"),
],
};