Segment summaries UI updates

public/css/style.css

@@ -2493,22 +2493,28 @@ table.table-cage {
 }
 
 table.table-cage tr:first-child td {
-	border-top: 0px;
+    border-top: 0;
 }
 
 table.table-cage tr:last-child td {
-	border-bottom: 0px;
+    border-bottom: 0;
 }
 
 table.table-cage tr td:first-child {
-	border-left: 0px;
+    border-left: 0;
 }
 
 table.table-cage tr td:last-child {
-	border-right: 0px;
+    border-right: 0;
+    border-left: 0 !important;
+}
+
+table.table-cage tr td:nth-last-child(2) {
+    border-right: 0 !important;
 }
+
 table.table-xs tr td {
-	padding: 0.15rem;
+    padding: 0.15rem;
 }
 
 [if-edit-mode], [if-read-mode] {
@@ -2520,25 +2526,30 @@ table.table-xs tr td {
 .read [if-read-mode] {
     display: block;
 }
-.rspace input[type="radio"]:checked {
+
+/* colored radios */
+.rspace input[type="radio"][value="-"]:checked,
+.rspace input[type="radio"][value="+"]:checked{
     position: relative;
 }
-.rspace input[type="radio"]:checked:before,
-.rspace input[type="radio"]:checked:after {
+.rspace input[type="radio"][value="-"]:checked:before,
+.rspace input[type="radio"][value="+"]:checked:before
+.rspace input[type="radio"][value="-"]:checked:after,
+.rspace input[type="radio"][value="+"]:checked:after{
     content: '';
     position: absolute;
     border-radius: 100%;
     background:#fff;
 }
-
-/* colored radios */
-.rspace input[type="radio"]:checked:before {
+.rspace input[type="radio"][value="-"]:checked:before,
+.rspace input[type="radio"][value="+"]:checked:before{
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
 }
-.rspace input[type="radio"]:checked:after {
+.rspace input[type="radio"][value="-"]:checked:after,
+.rspace input[type="radio"][value="+"]:checked:after{
     top: 3px;
     left: 3px;
     width: calc(100% - 6px);

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

@@ -45,21 +45,36 @@ if(!$contentData['unknown'] && !!$contentData['count']) {
     for ($i = 0; $i < $contentData['count']; $i++) {
 ?>
 <div class="<?= $i > 0 ? 'mt-2' : '' ?>">
-    <div class="pb-1">
+    <div class="">
         <b><?= isset($contentData['items'][$i]['relationship']) ? $contentData['items'][$i]['relationship'] : '--' ?></b>
         <?php if(isset($contentData['items'][$i]['status']) && !empty($contentData['items'][$i]['status'])): ?>
         <span class="ml-1 text-secondary">(<?= $contentData['items'][$i]['status'] ?>)</span>
         <?php endif; ?>
     </div>
-    <div class="d-flex ml-3">
-        <?php foreach ($labels as $k => $v): ?>
-                    <?php if(isset($contentData['items'][$i][$k])): ?>
-                        <div class="mr-3"><b class="text-secondary"><?= $v ?></b> <?= $contentData['items'][$i][$k] ?></div>
-                    <?php endif; ?>
-                <?php endforeach; ?>
+    <div class="ml-3">
+        <?php
+        $positives = [];
+        $negatives = [];
+        foreach ($labels as $k => $v) {
+            if(isset($contentData['items'][$i][$k])) {
+                if(strtolower($contentData['items'][$i][$k]) === 'yes') {
+                    $positives[] = $v;
+                }
+                else {
+                    $negatives[] = $v;
+                }
+            }
+        }
+        ?>
+        @if(count($positives))
+            <div class="pt-1"><b>Positive for</b>: {!!  implode(', ', $positives) !!}</div>
+        @endif
+        @if(count($negatives))
+            <div class="pt-1"><b>Negative for</b>: {!!  implode(', ', $negatives) !!}</div>
+        @endif
     </div>
     <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>
-    <div class="ml-3 pt-1 text-secondary client-rs-contents">
+    <div class="ml-3 pt-1 client-rs-contents">
         <b>Comments: </b><?= $contentData['items'][$i]['comments'] ?>
     </div>
     <?php endif; ?>

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

@@ -17,21 +17,24 @@ $point = Point::getGlobalSingletonOfCategory($patient, 'SCREENINGS_HISTORY', tru
 if ($point && @$point->data) {
     $contentData = $point->data;
     ?>
-    <table class="table table-bordered table-sm mb-0">
-    <?php
-    for ($i = 0; $i < $contentData['count']; $i++) {
-    ?>
-    <tr>
-    <td><b><?= isset($contentData['items'][$i]['screening']) ? $contentData['items'][$i]['screening'] : '--' ?></b></td>
-    <td>
-        <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>
-            <span class="ml-1 text-secondary">(<?= $contentData['items'][$i]['comments'] ?>)</span>
-        <?php endif; ?>
-    </td>
-    </tr>
-    <?php
-    }
-    ?>
+    <table class="table table-bordered table-sm mb-0 table-cage">
+        <?php
+        for ($i = 0; $i < $contentData['count']; $i++) {
+        ?>
+        <tr>
+            <td class="width-300px">
+                <?= isset($contentData['items'][$i]['screening']) ? $contentData['items'][$i]['screening'] : '--' ?>
+            </td>
+            <td class="width-300px pl-3">
+                <?php if(isset($contentData['items'][$i]['comments']) && !empty($contentData['items'][$i]['comments'])): ?>
+                <span class="ml-1 text-secondary">(<?= $contentData['items'][$i]['comments'] ?>)</span>
+                <?php endif; ?>
+            </td>
+            <td></td>
+        </tr>
+        <?php
+        }
+        ?>
     </table>
     <?php
 }

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

@@ -78,9 +78,8 @@ if ($point && @$point->data) {
     endif;
 
     if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
-        <div class="d-flex align-items-start mt-2 mb-1">
-            <div class="font-weight-bold mr-3">Comments:</div>
-            <div><?= $contentData['comments'] ?></div>
+        <div class="mt-2 mb-1">
+            <b>Comments: </b><?= $contentData['comments'] ?>
         </div>
     <?php }
 }

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

@@ -75,9 +75,8 @@ if ($point && @$point->data) {
     endif;
 
     if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
-        <div class="d-flex aslign-items-start mt-2 mb-1">
-            <div class="font-weight-bold mr-2">Comments:</div>
-            <div><?= $contentData['comments'] ?></div>
+        <div class="mt-2 mb-1">
+            <b>Comments: </b><?= $contentData['comments'] ?>
         </div>
     <?php }
 }

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

@@ -25,7 +25,7 @@ $plural = 'Allergies';
     <?php $j = 0; foreach ($points as $point): $j++; ?>
 	<?php $rel = $point->relevanceToNote($note); ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -33,13 +33,13 @@ $plural = 'Allergies';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                     
                 </div>
 		    </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
@@ -65,6 +65,7 @@ $plural = 'Allergies';
                 </div>	
 
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
 </table>

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

@@ -16,25 +16,26 @@ $points = [
     ["category" => 'SLEEP_HABITS', "name" => 'Sleep Habits', "point" => $sleepHabits],
 ];
 ?>
-
+<table class="table table-bordered table-sm mb-0 table-cage">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $review = $point->lastChildReview; ?>
 <?php if ($review && @($review->data)) $review->data = json_decode($review->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$review): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
-        <div class="inline-html-container">
-            <?php $review = $review->data; ?>
-            <?php include(resource_path('views/app/patient/segment-templates/_child_review/behavior/' . $p['category'] . '/view-review.php')); ?>
-        </div>
-    </div>
-    <?php endif; ?>
-</div>
+<tr>
+    <td class="width-300px">
+        <?= $p['name'] ?>
+    </td>
+    <td class="width-300px">
+        <?php if(!!$review): ?>
+            <div class="pl-3 inline-html-container">
+                <?php $review = $review->data; ?>
+                <?php include(resource_path('views/app/patient/segment-templates/_child_review/behavior/' . $p['category'] . '/view-review.php')); ?>
+            </div>
+        <?php endif; ?>
+    </td>
+    <td></td>
+</tr>
 <?php endif; ?>
 <?php endforeach; ?>
+</table>

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

@@ -16,7 +16,7 @@ $plural = 'Care team members';
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -24,7 +24,7 @@ $plural = 'Care team members';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                     <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
@@ -34,7 +34,7 @@ $plural = 'Care team members';
                     <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
@@ -61,6 +61,7 @@ $plural = 'Care team members';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -18,26 +18,25 @@ $points = [
 <?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
-<table class="table table-bordered table-sm mb-0">
+<table class="table table-bordered table-sm mb-0 table-cage">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $review = $point->lastChildReview; ?>
 <?php if ($review && @($review->data)) $review->data = json_decode($review->data); ?>
 <tr>
-    <td  style="max-width: 300px;"><b><?= $p['name'] ?></b></td>
-    <td>
+    <td class="width-300px">
+        <?= $p['name'] ?>
+    </td>
+    <td class="width-300px">
         <?php if(!!$review): ?>
-        <div class="pl-3 mt-1 d-flex align-items-baseline">
-            <span class="text-secondary font-weight-bold mr-2">Subjective:</span>
-            <div class="inline-html-container">
+            <div class="pl-3 inline-html-container">
                 <?php $review = $review->data; ?>
                 <?php include(resource_path('views/app/patient/segment-templates/_child_review/exercise/' . $p['category'] . '/view-review.php')); ?>
             </div>
-        </div>
         <?php endif; ?>
     </td>
-    
+    <td></td>
 </tr>
 <?php endif; ?>
 <?php endforeach; ?>

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

@@ -16,7 +16,7 @@ $plural = 'Goals';
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -24,12 +24,12 @@ $plural = 'Goals';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
@@ -56,6 +56,7 @@ $plural = 'Goals';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -21,7 +21,7 @@ $plural = 'Medications';
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
 	<tr>
-		<td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+		<td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
 			@if($rel)
 				<?php $numRelevant++; ?>
 				{{ $j }}.*
@@ -29,12 +29,12 @@ $plural = 'Medications';
 				{{ $j }}.
 			@endif
 		</td>
-		<td class="px-2" style="max-width: 300px;">
+		<td class="px-2 width-300px">
 			<div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
 				<?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
 			</div>
 		</td>
-		<td class="px-2" style="max-width:300px;">
+		<td class="px-2 width-300px">
 			<div class="">
 				<?php $review = $point->childReviewAddedInNote($note); ?>
 				<?php if(!!$review): ?>
@@ -61,6 +61,7 @@ $plural = 'Medications';
 				<?php endif; ?>
 			</div>
 		</td>
+		<td></td>
 	</tr>
     <?php endforeach; ?>
 	</table>

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

@@ -29,17 +29,17 @@ $points = [
     <span>-</span>
 <?php endif ?>
 
-<table class="table table-bordered table-sm mb-0">
+<table class="table table-bordered table-sm mb-0 table-cage">
 <?php foreach ($points as $p): ?>
 <?php $point = $p['point']; ?>
 <?php if(!!$point): ?>
 <?php $review = $point->lastChildReview; ?>
 <?php if ($review && @($review->data)) $review->data = json_decode($review->data); ?>
 <tr>
-<td>
+<td class="width-300px">
 	<?= $p['name'] ?>
 </td>
-<td>
+<td class="width-300px">
 <?php if(!!$review): ?>
     <div class="pl-3 d-flex align-items-baseline">
         <div>
@@ -56,6 +56,7 @@ $points = [
     </div>
 <?php endif; ?>
 </td>
+<td></td>
 </tr>
 <?php endif; ?>
 <?php endforeach; ?>

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

@@ -16,7 +16,7 @@ $plural = 'Problems';
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
        <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -24,12 +24,12 @@ $plural = 'Problems';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
@@ -56,6 +56,7 @@ $plural = 'Problems';
                     <?php endif; ?>
                 </div>
             </td>
+           <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -102,9 +102,8 @@ if ($point && @$point->data) {
     endif;
 
     if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
-        <div class="d-flex align-items-start mt-2 mb-1">
-            <div class="font-weight-bold mr-2">Comments:</div>
-            <div><?= $contentData['comments'] ?></div>
+        <div class="mt-2 mb-1">
+            <b>Comments: </b><?= $contentData['comments'] ?>
         </div>
     <?php }
 

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

@@ -30,7 +30,7 @@ $plural = 'Allergies';
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -38,12 +38,12 @@ $plural = 'Allergies';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                 </div>
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php if(!!$plan): ?>
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
@@ -70,6 +70,7 @@ $plural = 'Allergies';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -16,25 +16,26 @@ $points = [
     ["category" => 'SLEEP_HABITS', "name" => 'Sleep Habits', "point" => $sleepHabits],
 ];
 ?>
-
-<?php foreach ($points as $p): ?>
-<?php $point = $p['point']; ?>
-<?php if(!!$point): ?>
-<?php $plan = $point->lastChildPlan; ?>
-<?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$plan): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-        <div class="inline-html-container">
-            <?php $plan = $plan->data; ?>
-            <?php include(resource_path('views/app/patient/segment-templates/_child_plan/behavior/' . $p['category'] . '/view-plan.php')); ?>
-        </div>
-    </div>
+<table class="table table-bordered table-sm mb-0 table-cage">
+    <?php foreach ($points as $p): ?>
+    <?php $point = $p['point']; ?>
+    <?php if(!!$point): ?>
+    <?php $plan = $point->lastChildPlan; ?>
+    <?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+    <tr>
+        <td class="width-300px">
+            <?= $p['name'] ?>
+        </td>
+        <td class="width-300px">
+            <?php if(!!$plan): ?>
+            <div class="ml-3 inline-html-container">
+                <?php $plan = $plan->data; ?>
+                <?php include(resource_path('views/app/patient/segment-templates/_child_plan/behavior/' . $p['category'] . '/view-plan.php')); ?>
+            </div>
+            <?php endif; ?>
+        </td>
+        <td></td>
+    </tr>
     <?php endif; ?>
-</div>
-<?php endif; ?>
-<?php endforeach; ?>
+    <?php endforeach; ?>
+</table>

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

@@ -21,7 +21,7 @@ $plural = 'Care team members';
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -29,7 +29,7 @@ $plural = 'Care team members';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                     <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
@@ -39,7 +39,7 @@ $plural = 'Care team members';
                     <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php if(!!$plan): ?>
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
@@ -65,6 +65,7 @@ $plural = 'Care team members';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -18,27 +18,26 @@ $points = [
 <?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
-<table class="table table-bordered table-sm mb-0">
-<?php foreach ($points as $p): ?>
-<?php $point = $p['point']; ?>
-<?php if(!!$point): ?>
-<?php $plan = $point->lastChildPlan; ?>
-<?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
-<tr>
-    <td style="width: 300px;"><b><?= $p['name'] ?></b></td>
-    <td>
-        <?php if(!!$plan): ?>
-        <div class="pl-3 mt-1 d-flex align-items-baseline">
-            <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-            <div class="inline-html-container">
+<table class="table table-bordered table-sm mb-0 table-cage">
+    <?php foreach ($points as $p): ?>
+    <?php $point = $p['point']; ?>
+    <?php if(!!$point): ?>
+    <?php $plan = $point->lastChildPlan; ?>
+    <?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+    <tr>
+        <td class="width-300px">
+            <?= $p['name'] ?>
+        </td>
+        <td class="width-300px">
+            <?php if(!!$plan): ?>
+            <div class="ml-3 inline-html-container">
                 <?php $plan = $plan->data; ?>
                 <?php include(resource_path('views/app/patient/segment-templates/_child_plan/exercise/' . $p['category'] . '/view-plan.php')); ?>
             </div>
-        </div>
-        <?php endif; ?>
-    </td>
-    
-</tr>
-<?php endif; ?>
-<?php endforeach; ?>
+            <?php endif; ?>
+        </td>
+        <td></td>
+    </tr>
+    <?php endif; ?>
+    <?php endforeach; ?>
 </table>

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

@@ -21,7 +21,7 @@ $plural = 'Goals';
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -29,12 +29,12 @@ $plural = 'Goals';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php if(!!$plan): ?>
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
@@ -60,6 +60,7 @@ $plural = 'Goals';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -26,7 +26,7 @@ $plural = 'Medications';
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -34,12 +34,12 @@ $plural = 'Medications';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php if(!!$plan): ?>
                     <div class="pl-3 mt-1 d-flex align-items-baseline">
@@ -65,6 +65,7 @@ $plural = 'Medications';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

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

@@ -28,22 +28,25 @@ $points = [
 <?php if(!count($points)): ?>
     <span>-</span>
 <?php endif ?>
-
-<?php foreach ($points as $p): ?>
-<?php $point = $p['point']; ?>
-<?php if(!!$point): ?>
-<?php $plan = $point->lastChildPlan; ?>
-<?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
-<div class="mb-2">
-    <div class="d-flex align-items-baseline">
-        <b><?= $p['name'] ?></b>
-    </div>
-    <?php if(!!$plan): ?>
-    <div class="pl-3 mt-1 d-flex align-items-baseline">
-        <span class="text-secondary font-weight-bold mr-2">Plan:</span>
-        <span>{!! $plan->data->value ? strip_tags($plan->data->value) : '-' !!}</span>
-    </div>
+<table class="table table-bordered table-sm mb-0 table-cage">
+    <?php foreach ($points as $p): ?>
+    <?php $point = $p['point']; ?>
+    <?php if(!!$point): ?>
+    <?php $plan = $point->lastChildPlan; ?>
+    <?php if ($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
+    <tr>
+        <td class="width-300px">
+            <?= $p['name'] ?>
+        </td>
+        <td class="width-300px">
+            <?php if(!!$plan): ?>
+            <div class="ml-3">
+                <span>{!! $plan->data->value ? strip_tags($plan->data->value) : '-' !!}</span>
+            </div>
+            <?php endif; ?>
+        </td>
+        <td></td>
+    </tr>
     <?php endif; ?>
-</div>
-<?php endif; ?>
-<?php endforeach; ?>
+    <?php endforeach; ?>
+</table>

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

@@ -21,7 +21,7 @@ $plural = 'Problems';
         <?php if($plan && @($plan->data)) $plan->data = json_decode($plan->data); ?>
         <?php $numVisible++; ?>
         <tr>
-            <td class="fit px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
+            <td class="width-40px px-2 {{ $rel ? 'font-weight-bold text-info':'' }}">
                 @if($rel)
                     <?php $numRelevant++; ?>
                     {{ $j }}.*
@@ -29,12 +29,12 @@ $plural = 'Problems';
                     {{ $j }}.
                 @endif
             </td>
-            <td class="px-2" style="max-width: 300px;">
+            <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
                 </div>
             </td>
-            <td class="px-2" style="max-width:300px;">
+            <td class="px-2 width-300px">
                 <div>
                     <?php if(!!$plan): ?>
                         <div class="pl-3 mt-1 d-flex align-items-baseline">
@@ -60,6 +60,7 @@ $plural = 'Problems';
                     <?php endif; ?>
                 </div>
             </td>
+            <td></td>
         </tr>
     <?php endforeach; ?>
     </table>

resources/views/app/patient/segment-templates/ros/edit.blade.php

@@ -303,7 +303,7 @@ for ($i = 0; $i < count($fields); $i++) {
             </div>
 
             @if(!!$segment)
-                <div class="m-2">
+                <div class="my-2">
                     <button submit class="btn btn-sm btn-primary mr-2"><i class="fa fa-save"></i></button>
                     <div class="d-inline-flex align-self-stretch align-items-center">
                         <span class="autosave-indicator saving text-sm text-secondary">Saving changes &hellip;</span>
@@ -314,7 +314,7 @@ for ($i = 0; $i < count($fields); $i++) {
                     </div>
                 </div>
             @else
-                <div class="m-2">
+                <div class="my-2">
                     <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
                     <button cancel class="btn btn-sm btn-default border" {!! @$closeOnSave ? 'onmousedown="return closeStagPopup()"' : '' !!}>Close</button>
                 </div>

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

@@ -223,9 +223,8 @@ if ($point && @$point->data && !@($point->data['free_text'])) {
     }
     ?>
     @if(isset($contentData['comments']) && !empty(trim($contentData['comments'])))
-        <div class="d-flex align-items-start mt-2 mb-1">
-            <div class="font-weight-bold mr-2">Comments:</div>
-            <div><?= $contentData['comments'] ?></div>
+        <div class="mt-2 mb-1">
+            <b>Comments: </b><?= $contentData['comments'] ?>
         </div>
     @endif
     <?php