Jelajahi Sumber

Note UI updates

Vijayakrishnan 3 tahun lalu
induk
melakukan
68c8133214

+ 9 - 10
public/css/style.css

@@ -2150,8 +2150,6 @@ body.in-iframe .main-row > .sidebar {
     align-items: start;
 }
 .note-container .note-lhs-tree {
-    min-width: 220px;
-    max-width: 220px;
     align-self: stretch;
     border-right: 1px solid #ddd;
     padding-top: 0.85rem;
@@ -2159,6 +2157,8 @@ body.in-iframe .main-row > .sidebar {
     overflow: hidden;
     max-height: calc(100vh - 55px);
     background-color: #fff;
+    width: 0 !important;
+    opacity: 0 !important;
 }
 .note-container .note-lhs-tree:hover {
     overflow: overlay;
@@ -2171,11 +2171,11 @@ body.in-iframe .main-row > .sidebar {
     z-index: 1;
 }
 .note-container .note-lhs-tree.fixed ~ .note-rhs-content {
-    margin-left: 220px;
-    margin-right: 180px;
+    /*margin-left: 220px;*/
+    /*margin-right: 40vw;*/
 }
 .note-container .note-lhs-tree.fixed-left ~ .note-rhs-content {
-    margin-left: 220px;
+    /*margin-left: 220px;*/
 }
 .note-container .note-lhs-tree .note-tree-node.note-tree-heading>a {
 
@@ -2249,12 +2249,11 @@ body.in-iframe .main-row > .sidebar {
     padding-left: 4rem;
 }
 
-.note-container .note-rhs-sidebar {
-    min-width: 180px;
-    max-width: 180px;
+/*.note-container .note-rhs-sidebar {
+    min-width: 40vw;
+    max-width: 40vw;
     align-self: stretch;
     border-right: 1px solid #ddd;
-    height: 300px;
     overflow: hidden;
     max-height: calc(100vh - 55px);
     background-color: #fff;
@@ -2272,7 +2271,7 @@ body.in-iframe .main-row > .sidebar {
 }
 .note-container .note-rhs-sidebar.fixed ~ .note-rhs-content {
     margin-right: 180px;
-}
+}*/
 .spot-highlight {
     background: aliceblue !important;
 }

+ 9 - 7
resources/views/app/patient/note/dashboard.blade.php

@@ -461,7 +461,7 @@
                 <div class="note-rhs-content">
                 <div>
                 <div class="border-bottom pb-3">
-                    <div>
+                    <div class="d-flex align-items-stretch">
                         <?php
                         $shortCutsObject = [];
                         foreach ($pro->allShortcuts() as $shortcut) {
@@ -531,7 +531,7 @@
                         $shortcuts = "";
                         $latestSectionTS = 0;
                         ?>
-                        <div class="{{ $note->is_signed_by_hcp ? 'note-signed-by-hcp' : '' }}">
+                        <div class="{{ $note->is_signed_by_hcp ? 'note-signed-by-hcp' : '' }} flex-grow-1">
                             @if($isVisitTemplateBased && $doesVisitTemplateLayoutExist)
                                 @include($visitLayoutPath)
                             @elseif($isVisitTemplateBased && !$doesVisitTemplateUiConfigExist)
@@ -542,6 +542,11 @@
                                 @include('app.patient.note.note-section-list')
                             @endif
                         </div>
+                        <div class="w-50 border-left">
+                            @if($isVisitTemplateBased && !$note->is_signed_by_hcp)
+                                @include('app.patient.note.rhs-sidebar')
+                            @endif
+                        </div>
                     </div>
                 </div>
 
@@ -2539,9 +2544,6 @@
                     @endif
 
                 </div>
-                @if($isVisitTemplateBased && !$note->is_signed_by_hcp)
-                    @include('app.patient.note.rhs-sidebar')
-                @endif
             </div>
         </div>
     </div>
@@ -2554,9 +2556,9 @@
     <script>
         (function() {
             function init() {
-                fixTreeTopAndHeight();
+                /*fixTreeTopAndHeight();
                 $(window).on('resize', fixTreeTopAndHeight);
-                $(window).on('scroll', fixTreeTopAndHeight);
+                $(window).on('scroll', fixTreeTopAndHeight);*/
                 $('.note-tree-node>a[data-segment-uid]')
                     .off('click.scroll-to-segment')
                     .on('click.scroll-to-segment', function() {

+ 2 - 1
resources/views/app/patient/note/lhs-tree.blade.php

@@ -1,4 +1,5 @@
 <div class="note-lhs-tree pb-4" id="note-lhs-tree">
+<?php /*
     <?php
     $previousHeading = null;
     $previousSubHeading = null;
@@ -69,5 +70,5 @@
     @if($note->is_signed_by_hcp)
         <div class="note-tree-node mb-3"><a native="" target="_top" data-non-segment-target="Addendums" href="#">Addendums</a></div>
     @endif
-
+*/ ?>
 </div>

+ 1 - 1
resources/views/app/patient/note/rhs-sidebar.blade.php

@@ -1,4 +1,4 @@
-<div class="note-rhs-sidebar border-left" id="note-rhs-sidebar">
+<div class="note-rhs-sidebar" id="note-rhs-sidebar">
     <?php
     $allergies = \App\Models\Point::getPointsOfCategory($patient, "ALLERGY");
     $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");