Merge branch 'develop' into facility_delete

ohcnetwork · Nov 25, 2023 · 888df33 · 888df33
2 parents 2458101 + c37b554
commit 888df33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/Components/Common/FilePreviewDialog.tsx b/src/Components/Common/FilePreviewDialog.tsx
@@ -192,6 +192,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
                           />
                         ) : (
                           <iframe
+                            sandbox
                             title="Source Files"
                             src={fileUrl}
                             className="mx-auto h-5/6 w-5/6 border-2 border-black bg-white md:my-6 md:w-4/6"

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
@@ -724,6 +724,7 @@ export const ConsultationForm = (props: any) => {
             : undefined,
         consultation_notes: state.form.consultation_notes,
         is_telemedicine: state.form.is_telemedicine,
+        icu_admission_date: state.form.icu_admission_date,
         action: state.form.action,
         review_interval: state.form.review_interval,
         assigned_to:

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -28,10 +28,10 @@ export const DailyRoundsList = (props: any) => {
       }}
     >
       {(_) => (
-        <div className="flex w-full flex-col gap-4">
+        <div className="-mt-2 flex w-full flex-col gap-4">
           <div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
-            <PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-gray-200 bg-white p-5 text-center text-2xl font-bold text-gray-500">
-              <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700 shadow">
+            <PaginatedList.WhenEmpty className="flex w-full justify-center rounded-md border-b border-gray-200 bg-white px-5 py-1 text-center text-2xl font-bold text-gray-500">
+              <span className="flex justify-center rounded-lg bg-white p-3 text-gray-700">
                 {t("no_consultation_updates")}
               </span>
             </PaginatedList.WhenEmpty>
@@ -42,7 +42,7 @@ export const DailyRoundsList = (props: any) => {
                 ))}
               </>
             </PaginatedList.WhenLoading>
-            <PaginatedList.Items<DailyRoundsModel> className="my-8 flex grow flex-col gap-3 lg:mx-8">
+            <PaginatedList.Items<DailyRoundsModel> className="flex grow flex-col gap-3">
               {(item, items) => {
                 if (item.rounds_type === "AUTOMATED") {
                   return (

diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
@@ -358,6 +358,7 @@ export default function NotificationsList({
     manageResults = (
       <>
         {data
+          .filter((notification: any) => notification.event != "PUSH_MESSAGE")
           .filter((notification: any) =>
             showUnread ? notification.read_at === null : true
           )
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,6 +192,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => { @@
                               />
                             ) : (
                               <iframe
+                                sandbox
                                 title="Source Files"
                                 src={fileUrl}
                                 className="mx-auto h-5/6 w-5/6 border-2 border-black bg-white md:my-6 md:w-4/6"
@@ Expand Down @@