server changes

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

@@ -73,7 +73,7 @@ if ($contentData) {
     $blood = implode(" ", $blood);
     if(!empty(trim($blood))) { ?>
         <div class="mb-2">
-            <div>Blood Type &amp; RH: <b><?= $blood ?></b></div>
+            <div><b>Blood Type &amp; RH: </b><?= $blood ?></div>
         </div>
     <?php }
 
@@ -109,10 +109,10 @@ if ($contentData) {
 	foreach($commonMap as $head => $set):
 		?>
 		<div>
-			<span class="font-weight-bold"><?= ucwords($head) ?>:</span>
-			<i class="fa fa-arrow-right d-none"></i>
+			<span class="font-weight-bold"><?= ucwords($head) ?></span>
+			<i class="fa fa-arrow-right text-secondary d-none_"></i>
 			<span class="">
-			<?php $out = []; foreach($set as $item) { $out[] = '<span class="__font-weight-bold">' . $item['value'] . '</span>' . ($item['comments'] ? ('<span class="text-sm ml-1 text-secondary">(' . $item['comments'] . ')</span>') : ''); } echo implode(', ', $out); ?>
+			<?php $out = []; foreach($set as $item) { $out[] = '<span class="__font-weight-bold">' . $item['value'] . '</span>' . ($item['comments'] ? ('<span class="text-sm ml-1 text-secondary">(' . $item['comments'] . ')</span>') : ''); } if(!empty($out)) echo ' • '; echo implode(' • ', $out); ?>
 			</span>
 		</div>
 		<?php

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

@@ -12,30 +12,15 @@ $plural = 'Problems';
 <?php if (!count($points)): ?>
     <div class="text-secondary">-</div>
 <?php else: ?>
-    <table class="table table-bordered table-xs table-cage mb-0">
+    <div>
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
-       <tr>
-            <td class="width-30px text-right pl-0 pr-1 {{ $rel ? ' text-info':'' }}">
-                @if($rel)
-                    <?php $numRelevant++; ?>
-                    *{{ $j }}.
-                @else
-                    {{ $j }}.
-                @endif
-            </td>
-            <td class="px-2">
-                <div class=" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px" >
-                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
-                </div>
-            </td>
-           <td class="width-300px">
-               <div class="d-flex align-items-baseline pl-2">
-                   <?php $review = $point->childReviewAddedInNote($note); ?>
-                   <?php if(!!$review && @$review->data->value): ?>
-                   <span class="pr-2">{!! $review->data->value !!}</span>
-                   <?php endif; ?>
-                   <span class="text-nowrap">
+       <div>
+            <span class="">
+                <span class="font-weight-bold" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px" >
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>:
+                </span>
+		<span class="text-nowrap">
                        <?php if ($point->is_removed): ?>
                        @if($point->removal_reason_category === 'DURING_VISIT')
                            <span class="text-sm text-secondary">Removed during visit</span>
@@ -50,11 +35,15 @@ $plural = 'Problems';
                             <?php endif;?>
                        <?php endif; ?>
                     </span>
-               </div>
-           </td>
-           <td></td>
-        </tr>
+            </span>
+           <div class="ml-3 mb-1">
+                   <?php $review = $point->childReviewAddedInNote($note); ?>
+                   <?php if(!!$review && @$review->data->value): ?>
+                   <span class="pr-2" style="display: inline-block">{!! $review->data->value !!}</span>
+                   <?php endif; ?>
+           </div>
+        </div>
     <?php endforeach; ?>
-    </table>
+    </div>
 <?php endif; ?>
 

resources/views/app/patient/segment-templates/omega_problems/summary.blade.php__NEW

@@ -0,0 +1,60 @@
+<?php
+
+use App\Models\Point;
+
+/** @var \App\Models\Client $patient */
+
+$points = Point::getIntakePointsOfCategory($patient, 'PROBLEM', $note);
+$numRelevant = 0;
+$plural = 'Problems';
+?>
+
+<?php if (!count($points)): ?>
+    <div class="text-secondary">-</div>
+<?php else: ?>
+    <table class="table table-bordered table-xs table-cage mb-0">
+    <?php $j = 0; foreach ($points as $point): $j++; ?>
+        <?php $rel = $point->relevanceToNote($note); ?>
+       <tr>
+            <td class="width-30px text-right pl-0 pr-1 {{ $rel ? ' text-info':'' }}">
+                @if($rel)
+                    <?php $numRelevant++; ?>
+                    *{{ $j }}.
+                @else
+                    {{ $j }}.
+                @endif
+            </td>
+            <td class="px-2">
+                <div class=" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px" >
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
+                </div>
+            </td>
+           <td class="width-300px">
+               <div class="d-flex align-items-baseline pl-2">
+                   <?php $review = $point->childReviewAddedInNote($note); ?>
+                   <?php if(!!$review && @$review->data->value): ?>
+                   <span class="pr-2">{!! $review->data->value !!}</span>
+                   <?php endif; ?>
+                   <span class="text-nowrap">
+                       <?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">Removed on intake</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 endif; ?>
+                    </span>
+               </div>
+           </td>
+           <td></td>
+        </tr>
+    <?php endforeach; ?>
+    </table>
+<?php endif; ?>
+