fix archive not disabled

ohcnetwork · Apr 21, 2024 · dfede2c · dfede2c
1 parent 6fceb42
commit dfede2c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
@@ -12,13 +12,15 @@ interface Props {
   interval: { start: Date; end: Date };
   prescription: Prescription;
   refetch: () => void;
+  readonly?: boolean;
 }
 
 export default function AdministrationEventCell({
   administrations,
   interval: { start, end },
   prescription,
   refetch,
+  readonly,
 }: Props) {
   const [showTimeline, setShowTimeline] = useState(false);
   // Check if cell belongs to an administered prescription (including start and excluding end)
@@ -56,6 +58,7 @@ export default function AdministrationEventCell({
             prescription={prescription}
             showPrescriptionDetails
             onRefetch={refetch}
+            readonly={readonly}
           />
         </DialogModal>
         <button

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -240,6 +240,7 @@ export default function MedicineAdministrationTableRow({
                   interval={{ start, end }}
                   prescription={prescription}
                   refetch={refetch}
+                  readonly={props.readonly}
                 />
               )}
             </td>

diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx
@@ -29,12 +29,14 @@ interface Props {
   prescription: Prescription;
   showPrescriptionDetails?: boolean;
   onRefetch?: () => void;
+  readonly?: boolean;
 }
 
 export default function PrescrpitionTimeline({
   prescription,
   interval,
   onRefetch,
+  readonly,
 }: Props) {
   const consultation = useSlug("consultation");
   const { data, refetch, loading } = useQuery(
@@ -89,7 +91,7 @@ export default function PrescrpitionTimeline({
                   refetch();
                 }}
                 isLastNode={index === events.length - 1}
-                hideArchive={prescription.discontinued}
+                hideArchive={prescription.discontinued || readonly}
               />
             );
         }