Преглед на файлове

Note rhs sidebar taking up even note is signed - fix

Vijayakrishnan преди 3 години
родител
ревизия
764062fbea
променени са 3 файла, в които са добавени 13 реда и са изтрити 2 реда
  1. 1 1
      config/app.php
  2. 4 1
      public/css/style.css
  3. 8 0
      resources/views/app/patient/note/dashboard.blade.php

+ 1 - 1
config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 29,
+    'asset_version' => 30,
 
     'temp_dir' => env('TEMP_DIR'),
 

+ 4 - 1
public/css/style.css

@@ -2151,7 +2151,7 @@ body.in-iframe .main-row > .sidebar {
 .note-container .note-lhs-tree:hover {
     overflow: overlay;
 }
-.note-container .note-lhs-tree.fixed {
+.note-container .note-lhs-tree.fixed, .note-container .note-lhs-tree.fixed-left {
     position: fixed;
     top: 55px;
     max-height: calc(100vh - 55px) !important;
@@ -2162,6 +2162,9 @@ body.in-iframe .main-row > .sidebar {
     margin-left: 220px;
     margin-right: 180px;
 }
+.note-container .note-lhs-tree.fixed-left ~ .note-rhs-content {
+    margin-left: 220px;
+}
 .note-container .note-lhs-tree .note-tree-node.note-tree-heading>a {
 
 }

+ 8 - 0
resources/views/app/patient/note/dashboard.blade.php

@@ -2620,11 +2620,19 @@
                 if(!noteCardHeader.length) return;
                 let resultTop = (noteCardHeader.offset().top + noteCardHeader.outerHeight(true)) - $(window).scrollTop();
                 if(resultTop <= 55) {
+                    @if(!$note->is_signed_by_hcp)
                     tree.addClass('fixed');
                     rhsSidebar.addClass('fixed');
+                    @else
+                    tree.addClass('fixed-left');
+                    @endif
                 }
                 else {
+                    @if(!$note->is_signed_by_hcp)
                     tree.removeClass('fixed');
+                    @else
+                    tree.removeClass('fixed-left');
+                    @endif
                     tree.css('height', 'calc(100vh - ' + resultTop + 'px)');
                     tree.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
                     rhsSidebar.removeClass('fixed');