Omega - subjective/plan UI tweaks

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

@@ -26,28 +26,27 @@
                         </div>
                     </td>
                     <td class="width-300px">
-                        <div class="pl-3">
+                        <div class="d-flex align-items-baseline pl-2">
                             <?php $plan = $point->childPlanAddedInNote($note); ?>
                             <?php if(!!$plan): ?>
-                                <span>{!! $plan->data->value !!}</span>
+                            <span class="pr-2">{!! $plan->data->value !!}</span>
                             <?php endif; ?>
+                            <span>
+                                <?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">* Diagnosed during visit</span>
+                                <?php else: ?>
+                                <span class="text-sm text-info">* Diagnosed on intake</span>
+                                <?php endif;?>
+                                <?php endif; ?>
+                            </span>
                         </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">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; ?>
-                        </div>
-
                     </td>
                     <td></td>
                 </tr>

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

@@ -26,28 +26,27 @@
                         </div>
                     </td>
                     <td class="width-300px">
-                        <div class="pl-3">
+                        <div class="d-flex align-items-baseline pl-2">
                             <?php $plan = $point->childPlanAddedInNote($note); ?>
                             <?php if(!!$plan): ?>
-                                <span>{!! $plan->data->value !!}</span>
+                            <span class="pr-2">{!! $plan->data->value !!}</span>
                             <?php endif; ?>
+                            <span>
+                                <?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>
-                        <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">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; ?>
-                        </div>
-
                     </td>
                     <td></td>
                 </tr>

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

@@ -26,28 +26,27 @@
                         </div>
                     </td>
                     <td class="width-300px">
-                        <div class="pl-3">
+                        <div class="d-flex align-items-baseline pl-2">
                             <?php $plan = $point->childPlanAddedInNote($note); ?>
                             <?php if(!!$plan): ?>
-                                <span>{!! $plan->data->value !!}</span>
+                            <span class="pr-2">{!! $plan->data->value !!}</span>
                             <?php endif; ?>
+                            <span>
+                                <?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>
-                        <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">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; ?>
-                        </div>
-
                     </td>
                     <td></td>
                 </tr>

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

@@ -26,28 +26,27 @@
                         </div>
                     </td>
                     <td class="width-300px">
-                        <div class="pl-3">
+                        <div class="d-flex align-items-baseline pl-2">
                             <?php $plan = $point->childPlanAddedInNote($note); ?>
                             <?php if(!!$plan): ?>
-                                <span>{!! $plan->data->value !!}</span>
+                            <span class="pr-2">{!! $plan->data->value !!}</span>
                             <?php endif; ?>
+                            <span>
+                                <?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">* Prescribed during visit</span>
+                                <?php else: ?>
+                                <span class="text-sm text-info">* Prescribed on intake</span>
+                                <?php endif;?>
+                                <?php endif; ?>
+                            </span>
                         </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">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; ?>
-                        </div>
-
                     </td>
                     <td></td>
                 </tr>

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

@@ -26,28 +26,27 @@
                         </div>
                     </td>
                     <td class="width-300px">
-                        <div class="pl-3">
+                        <div class="d-flex align-items-baseline pl-2">
                             <?php $plan = $point->childPlanAddedInNote($note); ?>
                             <?php if(!!$plan): ?>
-                                <span>{!! $plan->data->value !!}</span>
+                            <span class="pr-2">{!! $plan->data->value !!}</span>
                             <?php endif; ?>
+                            <span>
+                                <?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">* Diagnosed during visit</span>
+                                <?php else: ?>
+                                <span class="text-sm text-info">* Diagnosed on intake</span>
+                                <?php endif;?>
+                                <?php endif; ?>
+                            </span>
                         </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">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; ?>
-                        </div>
-
                     </td>
                     <td></td>
                 </tr>

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

@@ -40,14 +40,13 @@ $plural = 'Allergies';
                 </div>
 		    </td>
             <td class="width-300px">
-                <div class="pl-3">
+                <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
-                            <span>{!! $review->data->value !!}</span>
+                        <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                </div>	
-                <div class="pl-3">
-                    <?php if ($point->is_removed): ?>
+                    <span>
+                        <?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')
@@ -60,8 +59,8 @@ $plural = 'Allergies';
                                 <span class="text-sm text-info">* Added on intake</span>
                             <?php endif;?>
                         <?php endif; ?>
-                </div>	
-
+                    </span>
+                </div>
             </td>
             <td></td>
         </tr>

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

@@ -34,29 +34,27 @@ $plural = 'Care team members';
                     <?= !!@($point->data->date) ? '&nbsp;/&nbsp;Date: ' . @($point->data->date) : '' ?>
                 </div>
             </td>
-            <td class="px-2 width-300px">
-                <div>
+            <td class="width-300px">
+                <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $review->data->value !!}</span>
-                        </div>
+                    <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                </div>
-                <div class="d-flex align-items-baseline">
-                    <?php if ($point->is_removed): ?>
+                    <span>
+                        <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
-                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                            <span class="text-sm text-secondary">Removed during visit</span>
                         @elseif($point->removal_reason_category === 'ON_INTAKE')
-                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                            <span class="text-sm text-secondary">Removed on intake</span>
                         @endif
-                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php elseif ($point->added_in_note_id === $note->id): ?>
                         <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                            <span class="ml-2 text-sm text-success">* Added during visit</span>
-                        <?php else: ?>
-                            <span class="ml-2 text-sm text-info">* Added on intake</span>
-                        <?php endif;?>
-                    <?php endif; ?>
+                                <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>

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

@@ -29,29 +29,27 @@ $plural = 'Goals';
                     <?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?>
                 </div>
             </td>
-            <td class="px-2 width-300px">
-                <div>
+            <td class="width-300px">
+                <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
                     <?php if(!!$review): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $review->data->value !!}</span>
-                        </div>
+                    <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                </div>
-                <div class="d-flex align-items-baseline">                
-                    <?php if ($point->is_removed): ?>
+                    <span>
+                        <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
-                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
+                            <span class="text-sm text-secondary">Removed during visit</span>
                         @elseif($point->removal_reason_category === 'ON_INTAKE')
-                            <span class="ml-2 text-sm text-secondary">Removed on intake</span>
+                            <span class="text-sm text-secondary">Removed on intake</span>
                         @endif
-                    <?php elseif ($point->added_in_note_id === $note->id): ?>
+                        <?php elseif ($point->added_in_note_id === $note->id): ?>
                         <?php if ($point->addition_reason_category === 'DURING_VISIT'): ?>
-                            <span class="ml-2 text-sm text-success">* Prescribed during visit</span>
-                        <?php else: ?>
-                            <span class="ml-2 text-sm text-info">* Added on intake</span>
-                        <?php endif;?>
-                    <?php endif; ?>
+                                <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>

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

@@ -35,28 +35,26 @@ $plural = 'Medications';
 			</div>
 		</td>
 		<td class="width-300px">
-			<div class="pl-3">
+			<div class="d-flex align-items-baseline pl-2">
 				<?php $review = $point->childReviewAddedInNote($note); ?>
 				<?php if(!!$review): ?>
-					<div class="d-flex align-items-baseline">
-						<span>{!! $review->data->value !!}</span>
-					</div>
+					<span class="pr-2">{!! $review->data->value !!}</span>
 				<?php endif; ?>
-			</div>
-			<div class="pl-3 d-flex align-items-baseline">
-				<?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
+				<span>
+					<?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">* Prescribed 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">* Prescribed during visit</span>
+				<?php else: ?>
+					<span class="text-sm text-info">* Prescribed on intake</span>
+				<?php endif;?>
 				<?php endif; ?>
+				</span>
 			</div>
 		</td>
 		<td></td>

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

@@ -29,31 +29,29 @@ $plural = 'Problems';
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>
-            <td class="px-2 width-300px">
-                <div>
-                    <?php $review = $point->childReviewAddedInNote($note); ?>
-                    <?php if(!!$review): ?>
-                        <div class="pl-3 mt-1 d-flex align-items-baseline">
-                            <span>{!! $review->data->value !!}</span>
-                        </div>
-                    <?php endif; ?>
-                </div>
-                <div class="d-flex align-items-baseline">
-                    <?php if ($point->is_removed): ?>
-                        @if($point->removal_reason_category === 'DURING_VISIT')
-                            <span class="ml-2 text-sm text-secondary">Removed during visit</span>
-                        @elseif($point->removal_reason_category === 'ON_INTAKE')
-                            <span class="ml-2 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="ml-2 text-sm text-success">* Diagnosed during visit</span>
-                        <?php else: ?>
-                            <span class="ml-2 text-sm text-info">* Added on intake</span>
-                        <?php endif;?>
-                    <?php endif; ?>
-                </div>
-            </td>
+           <td class="width-300px">
+               <div class="d-flex align-items-baseline pl-2">
+                   <?php $review = $point->childReviewAddedInNote($note); ?>
+                   <?php if(!!$review): ?>
+                   <span class="pr-2">{!! $review->data->value !!}</span>
+                   <?php endif; ?>
+                   <span>
+                       <?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">* Diagnosed during visit</span>
+                            <?php else: ?>
+                                <span class="text-sm text-info">* Diagnosed on intake</span>
+                            <?php endif;?>
+                       <?php endif; ?>
+                    </span>
+               </div>
+           </td>
            <td></td>
         </tr>
     <?php endforeach; ?>