Plan renderers UI updates

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 76,
+    'asset_version' => 77,
 
     'temp_dir' => env('TEMP_DIR'),
 

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -16,9 +16,9 @@
                 <?php $j = 0; foreach ($points as $point): $j++; ?>
                 <?php $rel = $point->relevanceToNote($note); ?>
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -17,9 +17,9 @@
                 <?php $rel = $point->relevanceToNote($note); ?>
 		
                 <tr>
-                    <td class="width-40px pr-2 pl-0 {{ $rel ? ' text-info':'' }}">
+                    <td class="width-30px text-right pr-1 pl-0 {{ $rel ? ' text-info':'' }}">
                         @if($rel)
-                            {{ $j }}.*
+                            *{{ $j }}.
                         @else
                             {{ $j }}.
                         @endif

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

@@ -23,36 +23,39 @@ $plural = 'Care team members';
                 {{ $j }}.
             </td>
             <td class="px-2">
-                <div class="<?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px">
-                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
-                    <?= !!@($point->data->specialty) ? '/&nbsp;' . @($point->data->specialty) . '' : '' ?>
-                    <?= !!@($point->data->organization) ? '/&nbsp;' . @($point->data->organization) . '' : '' ?><br>
-                    <?= !!@($point->data->phone) ? 'Ph: ' . @($point->data->phone) . '' : '' ?>
-                    <?= !!@($point->data->fax) ? '&nbsp;/&nbsp;Fax: ' . @($point->data->fax) . '<br>' : '' ?>
-                    <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
-                </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
+                $parts = [];
+                if(@($point->data->name)) $parts[] = '<b>' . $point->data->name . '</b>';
+                if(@($point->data->specialty)) $parts[] = '<b>' . $point->data->specialty . '</b>';
+                if(@($point->data->organization)) $parts[] = $point->data->organization;
+                if(@($point->data->phone)) $parts[] = 'Ph:' . $point->data->phone;
+                if(@($point->data->fax)) $parts[] = 'Fax:' . $point->data->fax;
+                if(@($point->data->date)) $parts[] = $point->data->date;
+                $parts = implode(' • ', $parts);
+                ?>
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
+                    <?= $parts ?>
+                    <div>
+                        <?php $review = $point->childReviewAddedInNote($note); ?>
+                        <?php if(!!$review && @$review->data->value): ?>
+                        <span class="pr-2"><b>Subj.</b> {!! trim(strip_tags($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>
+                            @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>
+                                <span class="text-sm text-info">Added on intake</span>
                             <?php endif;?>
                         <?php endif; ?>
-                    </span>
+                        </span>
+                    </div>
                 </div>
             </td>
             <td></td>

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

@@ -57,10 +57,10 @@ $plural = 'Medications';
 		<td class="width-300px">
 			<div class="d-flex align-items-baseline pl-2">
 				@if(@$review && isset($review->experience))
-					{{trim(strip_tags($review->experience))}}
+					<span class="pr-2">{{trim(strip_tags($review->experience))}}</span>
 				@endif
 				<span class="text-nowrap">
-					<?php if ($point->is_removed): ?>
+				<?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')
@@ -68,9 +68,9 @@ $plural = 'Medications';
 				@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>
+					<span class="text-sm text-success">Added during visit</span>
 				<?php else: ?>
-					<span class="text-sm text-info">* Added on intake</span>
+					<span class="text-sm text-info">Added on intake</span>
 				<?php endif;?>
 				<?php endif; ?>
 				</span>