Merge branch 'cleanup' of https://rav.triplestart.com/tigerphp/stagfe2 into cleanup

resources/views/app/patient/module-specific-summary-renderers/behavior/plan.blade.php

@@ -13,7 +13,9 @@
         </span>
         <div class="flex-grow-1">
             <table class="table table-bordered table-xs table-cage mb-0">
-                <?php $j = 0; foreach ($points as $point): $j++; ?>
+                <?php $j = 0; foreach ($points as $point): ?>
+                    <?php  $plan = $point->childPlanAddedInNote($note); if(!$plan) continue; $j++;  ?>
+
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
                     <td class="width-22px pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
@@ -25,12 +27,13 @@
                     </td>
                     <td class="px-2">
                         <div class=" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px">
+
                             {{ucwords(str_replace('_', ' ', strtolower($point->category)))}}
                         </div>
                     </td>
                     <td class="width-300px">
                         <div class="pl-2">
-                            <?php $plan = $point->childPlanAddedInNote($note); ?>
+
                             <?php if(!!$plan): ?>
                                 <?php
                                 $flat = true;
@@ -38,19 +41,20 @@
                                 ?>
                             <?php endif; ?>
                         </div>
+
                         <div class="pl-3">
                             <?php if ($point->is_removed): ?>
-                            @if($point->removal_reason_category === 'DURING_VISIT')
-                                <span class="text-sm text-secondary">Removed during visit</span>
-                            @elseif($point->removal_reason_category === 'ON_INTAKE')
-                                <span class="text-sm text-secondary">Historic</span>
-                            @endif
+                                @if($point->removal_reason_category === 'DURING_VISIT')
+                                    <span class="text-sm text-secondary">Removed during visit</span>
+                                @elseif($point->removal_reason_category === 'ON_INTAKE')
+                                    <span class="text-sm text-secondary">Historic</span>
+                                @endif
                             <?php elseif ($point->added_in_note_id === $note->id): ?>
-                            <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                            <span class="text-sm text-success">* Added during visit</span>
-                            <?php else: ?>
-                            <span class="text-sm text-info">* Added on intake</span>
-                            <?php endif;?>
+                                <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
+                                    <span class="text-sm text-success">* Added during visit</span>
+                                <?php else: ?>
+                                    <span class="text-sm text-info">* Added on intake</span>
+                                <?php endif;?>
                             <?php endif; ?>
                         </div>
 
@@ -62,4 +66,4 @@
 
         </div>
     </div>
-@endif
+@endif

resources/views/app/patient/module-specific-summary-renderers/behavior/subjective.blade.php

@@ -13,7 +13,8 @@
         </span>
         <div class="flex-grow-1">
             <table class="table table-bordered table-xs table-cage mb-0">
-                <?php $j = 0; foreach ($points as $point): $j++; ?>
+                <?php $j = 0; foreach ($points as $point): ?>
+                    <?php $review = $point->childReviewAddedInNote($note); if (!$review) continue;  $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
                     <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
@@ -30,7 +31,6 @@
                     </td>
                     <td class="width-300px">
                         <div class="pl-2">
-                            <?php $review = $point->childReviewAddedInNote($note); ?>
                             <?php if(!!$review): ?>
                                 <?php
                                 $flat = true;
@@ -46,4 +46,4 @@
 
         </div>
     </div>
-@endif
+@endif

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

@@ -149,6 +149,7 @@ foreach($inPoints as $point){
     $pointMap[$renderer][] = $point;
 }
 
+
 foreach ($pointMap as $renderer => $points) {
 ?>
     @include('app.patient.module-specific-summary-renderers.' . $renderer . '.subjective', compact('points'))