diff --git a/src/CAREUI/display/RecordMeta.tsx b/src/CAREUI/display/RecordMeta.tsx
index 83928f1f23a..48cc8d370ad 100644
--- a/src/CAREUI/display/RecordMeta.tsx
+++ b/src/CAREUI/display/RecordMeta.tsx
@@ -11,13 +11,14 @@ interface Props {
last_name: string;
last_login: string | undefined;
};
+ inlineUser?: boolean;
}
/**
* A generic component to display relative time along with a tooltip and a user
* if provided.
*/
-const RecordMeta = ({ time, user, prefix, className }: Props) => {
+const RecordMeta = ({ time, user, prefix, className, inlineUser }: Props) => {
const isOnline = user && isUserOnline(user);
let child = (
@@ -25,14 +26,15 @@ const RecordMeta = ({ time, user, prefix, className }: Props) => {
{relativeTime(time)}
{formatDateTime(time)}
- {user && (
- <>
+ {user && !inlineUser && (
+
+ by
{user.first_name} {user.last_name}
{isOnline && (
-
+
)}
- >
+
)}
@@ -43,7 +45,13 @@ const RecordMeta = ({ time, user, prefix, className }: Props) => {
{prefix}
{child}
+ {user && inlineUser && by}
{user && }
+ {user && inlineUser && (
+
+ {user.first_name} {user.last_name}
+
+ )}
);
}
diff --git a/src/Components/Medicine/PrescriptionDetailCard.tsx b/src/Components/Medicine/PrescriptionDetailCard.tsx
index 6da4fa7ae8d..bf27aa34068 100644
--- a/src/Components/Medicine/PrescriptionDetailCard.tsx
+++ b/src/Components/Medicine/PrescriptionDetailCard.tsx
@@ -5,6 +5,7 @@ import ReadMore from "../Common/components/Readmore";
import ButtonV2 from "../Common/components/ButtonV2";
import { PrescriptionActions } from "../../Redux/actions";
import { useTranslation } from "react-i18next";
+import RecordMeta from "../../CAREUI/display/RecordMeta";
export default function PrescriptionDetailCard({
prescription,
@@ -29,7 +30,7 @@ export default function PrescriptionDetailCard({
prescription.discontinued && "bg-gray-200 opacity-80"
)}
>
-
+
@@ -83,7 +84,7 @@ export default function PrescriptionDetailCard({
-
+
{prescription.medicine_object?.name ?? prescription.medicine_old}
@@ -146,6 +147,23 @@ export default function PrescriptionDetailCard({
)}
+
+
+
+ Prescribed
+
+
+ {prescription.discontinued && (
+
+ and was discontinued
+
+
+ )}
+
{props.children}