Merge branch 'develop' into issues/8643/fix-full-content-of-notes

ohcnetwork · Sep 28, 2024 · b01eac3 · b01eac3
2 parents 52d24be + 5534762
commit b01eac3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Components/CameraFeed/CameraFeed.tsx b/src/Components/CameraFeed/CameraFeed.tsx
@@ -145,10 +145,10 @@ export default function CameraFeed(props: Props) {
   );
 
   return (
-    <div ref={playerWrapperRef} className="flex flex-col justify-center">
+    <div ref={playerWrapperRef} className="flex h-full flex-col justify-center">
       <div
         className={classNames(
-          "flex max-h-screen flex-col justify-center",
+          "flex max-h-screen min-h-full flex-col justify-center",
           props.className,
           isFullscreen ? "bg-black" : "bg-zinc-100",
           isIOS && isFullscreen && "px-20",
@@ -157,7 +157,7 @@ export default function CameraFeed(props: Props) {
         <div
           className={classNames(
             isFullscreen ? "hidden lg:flex" : "flex",
-            "items-center justify-between px-4 py-0.5 transition-all duration-500 ease-in-out lg:py-1",
+            "shrink-0 items-center justify-between px-4 py-0.5 transition-all duration-500 ease-in-out lg:py-1",
             (() => {
               if (playerStatus !== "playing") {
                 return "bg-black text-zinc-400";
@@ -202,7 +202,7 @@ export default function CameraFeed(props: Props) {
             )}
           </div>
         </div>
-        <div className="group relative aspect-video bg-black">
+        <div className="group relative flex-1 bg-black">
           {/* Notifications */}
           <FeedAlert state={state} />
           {playerStatus === "playing" && <FeedWatermark />}
@@ -250,7 +250,7 @@ export default function CameraFeed(props: Props) {
           <VideoPlayer
             playerRef={playerRef}
             streamUrl={streamUrl}
-            className="absolute inset-x-0 mx-auto aspect-video max-h-full w-full"
+            className="max-h-[calc(100vh-40px)] w-full object-contain"
             onPlay={() => {
               setPlayedOn(new Date());
               setState("playing");
@@ -266,6 +266,7 @@ export default function CameraFeed(props: Props) {
             }}
             onError={props.onStreamError}
           />
+
           {inlineControls && playerStatus === "playing" && controls}
         </div>
         {!inlineControls && (

diff --git a/src/Components/LogUpdate/Sections/Vitals.tsx b/src/Components/LogUpdate/Sections/Vitals.tsx
@@ -29,7 +29,7 @@ const Vitals = ({ log, onChange }: LogUpdateSectionProps) => {
       <BPAttributeEditor attribute="diastolic" log={log} onChange={onChange} />
       <hr />
       <RangeFormField
-        label={t("ventilator_spo2")}
+        label={t("LOG_UPDATE_FIELD_LABEL__ventilator_spo2")}
         name="ventilator_spo2"
         onChange={(c) => onChange({ ventilator_spo2: c.value })}
         value={log.ventilator_spo2}

diff --git a/src/Components/Patient/PatientConsentRecordBlock.tsx b/src/Components/Patient/PatientConsentRecordBlock.tsx
@@ -103,6 +103,7 @@ export default function PatientConsentRecordBlockGroup(props: {
           file={file}
           editable={hasEditPermission(file)}
           associating_id={consentRecord.id}
+          archivable
         />
       ))}
     </div>