Note UI rhs new content

config/app.php

@@ -263,7 +263,19 @@ return [
     ],
 
     'note_rhs_segments' => [
-
+        'allergies',
+        'allergies',
+        'medications',
+        'past_medical_history',
+        'problems',
+        'family_history',
+        'social_history',
+        'surgical_history',
+        'nutrition',
+        'exercise',
+        'behavior',
+        'goals',
+        'care_team'
     ]
 
 ];

resources/views/app/patient/note/dashboard.blade.php

@@ -544,7 +544,8 @@
                         </div>
                         <div class="w-50 border-left">
                             @if($isVisitTemplateBased && !$note->is_signed_by_hcp)
-                                @include('app.patient.note.rhs-sidebar')
+                                {{--@include('app.patient.note.rhs-sidebar')--}}
+                                @include('app.patient.note.note-segment-list-rhs')
                             @endif
                         </div>
                     </div>

resources/views/app/patient/note/dashboard_script.blade.php

@@ -119,27 +119,32 @@
 
                         // TEMP: show wizard for allergies, rx, dx, goals
                         if(editParent.is('[data-segment-template-name="plan_allergies"]') ||
-                            editParent.is('[data-segment-template-name="intake_allergies"]')) {
+                            editParent.is('[data-segment-template-name="intake_allergies"]') ||
+                            editParent.is('[data-segment-template-name="allergies"]')) {
                             $('.note-bottom-toolbar .allergies-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_problems"]') ||
-                            editParent.is('[data-segment-template-name="intake_problems"]')) {
+                            editParent.is('[data-segment-template-name="intake_problems"]') ||
+                            editParent.is('[data-segment-template-name="problems"]')) {
                             $('.note-bottom-toolbar .problems-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_medications"]') ||
-                            editParent.is('[data-segment-template-name="intake_medications"]')) {
+                            editParent.is('[data-segment-template-name="intake_medications"]') ||
+                            editParent.is('[data-segment-template-name="medications"]')) {
                             $('.note-bottom-toolbar .medications-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_goals"]') ||
-                            editParent.is('[data-segment-template-name="intake_goals"]')) {
+                            editParent.is('[data-segment-template-name="intake_goals"]') ||
+                            editParent.is('[data-segment-template-name="goals"]')) {
                             $('.note-bottom-toolbar .goals-center-trigger').trigger('click');
                             return false;
                         }
                         else if(editParent.is('[data-segment-template-name="plan_care_team"]') ||
-                            editParent.is('[data-segment-template-name="intake_care_team"]')) {
+                            editParent.is('[data-segment-template-name="intake_care_team"]') ||
+                            editParent.is('[data-segment-template-name="care_team"]')) {
                             $('.note-bottom-toolbar .careteam-center-trigger').trigger('click');
                             return false;
                         }
@@ -156,7 +161,8 @@
                         }
 
                         if(editParent.is('[data-segment-template-name="plan_nutrition"]') ||
-                            editParent.is('[data-segment-template-name="intake_nutrition"]')) {
+                            editParent.is('[data-segment-template-name="intake_nutrition"]') ||
+                            editParent.is('[data-segment-template-name="nutrition"]')) {
                             openDynamicStagPopup('/nutrition-center/{{$note->client->uid}}/{{$note->uid}}',
                                 'nutrition-center-{{$note->id}}',
                                 '<img src="/img/nutrition-rx.png" class=""/> Nutrition Rx',
@@ -166,7 +172,8 @@
                         }
 
                         if(editParent.is('[data-segment-template-name="plan_exercise"]') ||
-                            editParent.is('[data-segment-template-name="intake_exercise"]')) {
+                            editParent.is('[data-segment-template-name="intake_exercise"]') ||
+                            editParent.is('[data-segment-template-name="exercise"]')) {
                             openDynamicStagPopup('/exercise-center/{{$note->client->uid}}/{{$note->uid}}',
                                 'exercise-center-{{$note->id}}',
                                 '<img src="/img/exercise-rx.png" class=""/> Exercise Rx',
@@ -176,7 +183,8 @@
                         }
 
                         if(editParent.is('[data-segment-template-name="plan_behavior"]') ||
-                            editParent.is('[data-segment-template-name="intake_behavior"]')) {
+                            editParent.is('[data-segment-template-name="intake_behavior"]') ||
+                            editParent.is('[data-segment-template-name="behavior"]')) {
                             openDynamicStagPopup('/behavior-center/{{$note->client->uid}}/{{$note->uid}}',
                                 'behavior-center-{{$note->id}}',
                                 '<img src="/img/behavior-rx.png" class=""/> Behavior Rx',

resources/views/app/patient/note/note-segment-list-rhs.blade.php

@@ -0,0 +1,37 @@
+<div class="segments-list" id="note-rhs-segments-list">
+    <?php
+    $previousHeading = null;
+    $previousSubHeading = null;
+    ?>
+    @foreach($note->segments as $segment)
+        @if(in_array($segment->segmentTemplate->internal_name, config('app.note_rhs_segments')))
+        <?php
+        if ($segment->heading !== $previousHeading) {
+            if (!empty($previousHeading)) {
+                echo '</div></div>'; // <!-- end the previous parent section -->
+            }
+            if (!empty($segment->heading)) {
+
+	?>
+	<div class="note-content-node note-content-heading">
+		<div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary {{ $previousHeading ? 'mt-4 border-top' : '' }}">
+			{{ $segment->heading }}
+		</div>
+		<div class="note-content-children ml-5 border-left">
+			<!-- open new node -->
+        <?php
+	    }
+            $previousHeading = $segment->heading;
+        }
+        ?>
+        <div>
+            @include('app.patient.note.segment')
+        </div>
+        @endif
+    @endforeach
+    <?php
+    if (!empty($previousHeading)) {
+        echo '</div></div>'; // <!-- close any open parent section -->
+    }
+    ?>
+</div>

resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -322,6 +322,7 @@ parentSegment.find('#frm-add-{{$label}}')
                 refreshDynamicStagPopup();
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
 
                 // only for canvas-migrate
@@ -447,6 +448,7 @@ parentSegment.find('.frm-edit-{{$label}}')
                 refreshDynamicStagPopup();
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
             }
         }, 'json');
@@ -463,6 +465,7 @@ parentSegment.find('.frm-upsert-review-plan-{{$label}}')
             if(!hasResponseError(_data)) {
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 refreshDynamicStagPopup();
             }
         }).then(() => {
@@ -591,6 +594,7 @@ parentSegment.find('.frm-review-plan-lifestyle')
             if(!hasResponseError(_data)) {
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 refreshDynamicStagPopup();
             }
         }).then(() => {
@@ -612,6 +616,7 @@ parentSegment.find('.toggle-relevance')
                     refreshDynamicStagPopup();
                     $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                    $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
                 }
             }, 'json');
@@ -624,6 +629,7 @@ parentSegment.find('.toggle-relevance')
                         refreshDynamicStagPopup();
                         $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                        $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
                     }
                 }, 'json');
@@ -659,6 +665,7 @@ parentSegment.find('.tracker-input')
                 refreshDynamicStagPopup();
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
             }
         }, 'json');
     });