Browse Source

Note UI/logic updates

Vijayakrishnan 3 years ago
parent
commit
5c8dfb0e2c

+ 3 - 0
public/css/style.css

@@ -3173,3 +3173,6 @@ body.forced-masking #mask {
 .note_template_omega_soap_visit .system_segment .d-flex.border-bottom:last-of-type {
 .note_template_omega_soap_visit .system_segment .d-flex.border-bottom:last-of-type {
     border-bottom: 0 !important;
     border-bottom: 0 !important;
 }
 }
+.note-signed-by-hcp .hide-if-note-signed {
+    display: none !important;
+}

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

@@ -423,6 +423,7 @@
             @endif
             @endif
 
 
             {{-- additional modules --}}
             {{-- additional modules --}}
+            @if(!$note->is_signed_by_hcp)
             <?php
             <?php
             $availableModules = [
             $availableModules = [
                 [
                 [
@@ -526,6 +527,7 @@
                     @endforeach
                     @endforeach
                 </form>
                 </form>
             </div>
             </div>
+            @endif
 
 
 
 
             @if($note->is_signed_by_hcp)
             @if($note->is_signed_by_hcp)

+ 32 - 0
resources/views/app/patient/note/dashboard_script.blade.php

@@ -203,6 +203,38 @@
                             $('.note-bottom-toolbar .supplements-center-trigger').trigger('click');
                             $('.note-bottom-toolbar .supplements-center-trigger').trigger('click');
                             return false;
                             return false;
                         }
                         }
+                        else if(editParent.is('[data-segment-template-name="omega_history_past_medical"]')) {
+                            openDynamicStagPopup('/note-segment-view-by-name/{{$note->uid}}/past_medical_history/edit',
+                                'edit-univ_history_past_medical-container-{{$note->id}}',
+                                'Past Medical History',
+                                false,
+                                "overflow-visible");
+                            return false;
+                        }
+                        else if(editParent.is('[data-segment-template-name="omega_history_family"]')) {
+                            openDynamicStagPopup('/note-segment-view-by-name/{{$note->uid}}/history_family/edit',
+                                'edit-univ_history_family-container-{{$note->id}}',
+                                'Family History',
+                                false,
+                                "overflow-visible");
+                            return false;
+                        }
+                        else if(editParent.is('[data-segment-template-name="omega_history_social"]')) {
+                            openDynamicStagPopup('/note-segment-view-by-name/{{$note->uid}}/history_social/edit',
+                                'edit-univ_history_social-container-{{$note->id}}',
+                                'Social History',
+                                false,
+                                "overflow-visible");
+                            return false;
+                        }
+                        else if(editParent.is('[data-segment-template-name="omega_history_surgical"]')) {
+                            openDynamicStagPopup('/note-segment-view-by-name/{{$note->uid}}/history_surgical/edit',
+                                'edit-univ_history_surgical-container-{{$note->id}}',
+                                'Surgical History',
+                                false,
+                                "overflow-visible");
+                            return false;
+                        }
 
 
                         // TEMP: open in popup if LS segment
                         // TEMP: open in popup if LS segment
                         if(editParent.is('[data-segment-template-name^="lifestyle_"]')) {
                         if(editParent.is('[data-segment-template-name^="lifestyle_"]')) {

+ 2 - 1
resources/views/app/patient/note/segment-slim.blade.php

@@ -3,6 +3,7 @@ $iName = $segment->segmentTemplate->internal_name;
 
 
 // if omega system segment - no only read mode
 // if omega system segment - no only read mode
 $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) === '_system') && $iName !== 'omega_objective_system';
 $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) === '_system') && $iName !== 'omega_objective_system';
+$isOmegaHistorySegment = strpos($iName, 'omega_history_') === 0;
 ?>
 ?>
 
 
 <div class="border-bottom note-section visit-segment {{$isOmegaSystemSegment || $note->is_signed_by_hcp ? '' : 'edit-trigger'}}"
 <div class="border-bottom note-section visit-segment {{$isOmegaSystemSegment || $note->is_signed_by_hcp ? '' : 'edit-trigger'}}"
@@ -33,7 +34,7 @@ $isOmegaSystemSegment = (strpos($iName, 'omega_') === 0 && substr($iName, -7) ==
                     @endif
                     @endif
                 </div>
                 </div>
 
 
-                <?php if($iName !== 'ros' && $iName !== 'omega_ros') { ?>
+                <?php if($iName !== 'ros' && $iName !== 'omega_ros' && !$isOmegaHistorySegment) { ?>
                 <div class="d-none if-edit edit-container">
                 <div class="d-none if-edit edit-container">
                     {!! $segment->edit_html !!}
                     {!! $segment->edit_html !!}
                 </div>
                 </div>

+ 5 - 2
resources/views/app/patient/segment-templates/omega_subjective_system/summary.blade.php

@@ -65,7 +65,7 @@ $wizardLinks = [
 
 
 ?>
 ?>
 
 
-<div class="mb-2">
+<div class="mb-2 hide-if-note-signed">
     @foreach($wizardLinks as $link)
     @foreach($wizardLinks as $link)
         @if(@$link['name'])
         @if(@$link['name'])
             <a href="{{$link['href']}}"
             <a href="{{$link['href']}}"
@@ -80,7 +80,7 @@ $wizardLinks = [
 
 
 <div class="system_segment">
 <div class="system_segment">
 <?php
 <?php
-
+/*
 $inPoints = Point::getPointsOfCategory($patient, 'ALLERGY');
 $inPoints = Point::getPointsOfCategory($patient, 'ALLERGY');
 if(count($inPoints)) {
 if(count($inPoints)) {
 ?>
 ?>
@@ -142,6 +142,9 @@ foreach ($pointMap as $renderer => $points) {
 @include('app.patient.module-specific-summary-renderers.' . $renderer . '.subjective', compact('points'))
 @include('app.patient.module-specific-summary-renderers.' . $renderer . '.subjective', compact('points'))
 <?php
 <?php
 }
 }
+*/
+
+$inPoints = Point::getIntakePointsWithChildReview($patient, $note);
 
 
 $topLevelPointToRendererMap = [
 $topLevelPointToRendererMap = [
     'HIGH_SUGAR_BEVERAGES' => 'nutrition',
     'HIGH_SUGAR_BEVERAGES' => 'nutrition',