Преглед на файлове

Subjective summaries - remove stray space before "added on xxx" etc.

Vijayakrishnan преди 3 години
родител
ревизия
380cbd5de1

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

@@ -42,24 +42,24 @@ $plural = 'Allergies';
             <td class="width-300px">
                 <div class="pl-3">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
-                    <?php if(!!$review): ?>
-                            <span>{!! $review->data->value !!}</span>
+                    <?php if(!!$review && @$review->data->value): ?>
+                        <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                </div>	
-                <div class="pl-3">
+                </div>
+                <div 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; ?>
+                        @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>

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

@@ -37,13 +37,11 @@ $plural = 'Care team members';
             <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 if(!!$review && @$review->data->value): ?>
+                    <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
                 </div>
-                <div class="d-flex align-items-baseline">
+                <div class="text-nowrap">
                     <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
                             <span class="ml-2 text-sm text-secondary">Removed during visit</span>

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

@@ -32,13 +32,11 @@ $plural = 'Goals';
             <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 if(!!$review && @$review->data->value): ?>
+                    <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
                 </div>
-                <div class="d-flex align-items-baseline">                
+                <div class="text-nowrap">
                     <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
                             <span class="ml-2 text-sm text-secondary">Removed during visit</span>

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

@@ -37,13 +37,11 @@ $plural = 'Medications';
 		<td class="width-300px">
 			<div class="pl-3">
 				<?php $review = $point->childReviewAddedInNote($note); ?>
-				<?php if(!!$review): ?>
-					<div class="d-flex align-items-baseline">
-						<span>{!! $review->data->value !!}</span>
-					</div>
+				<?php if(!!$review && @$review->data->value): ?>
+				<span class="pr-2">{!! $review->data->value !!}</span>
 				<?php endif; ?>
 			</div>
-			<div class="pl-3 d-flex align-items-baseline">
+			<div 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>

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

@@ -32,13 +32,11 @@ $plural = 'Problems';
             <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 if(!!$review && @$review->data->value): ?>
+                    <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
                 </div>
-                <div class="d-flex align-items-baseline">
+                <div class="text-nowrap">
                     <?php if ($point->is_removed): ?>
                         @if($point->removal_reason_category === 'DURING_VISIT')
                             <span class="ml-2 text-sm text-secondary">Removed during visit</span>

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

@@ -42,10 +42,10 @@ $plural = 'Allergies';
             <td class="width-300px">
                 <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
-                    <?php if(!!$review): ?>
+                    <?php if(!!$review && @$review->data->value): ?>
                         <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                    <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>

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

@@ -37,10 +37,10 @@ $plural = 'Care team members';
             <td class="width-300px">
                 <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
-                    <?php if(!!$review): ?>
+                    <?php if(!!$review && @$review->data->value): ?>
                     <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                    <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>

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

@@ -32,10 +32,10 @@ $plural = 'Goals';
             <td class="width-300px">
                 <div class="d-flex align-items-baseline pl-2">
                     <?php $review = $point->childReviewAddedInNote($note); ?>
-                    <?php if(!!$review): ?>
+                    <?php if(!!$review && @$review->data->value): ?>
                     <span class="pr-2">{!! $review->data->value !!}</span>
                     <?php endif; ?>
-                    <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>

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

@@ -37,10 +37,10 @@ $plural = 'Medications';
 		<td class="width-300px">
 			<div class="d-flex align-items-baseline pl-2">
 				<?php $review = $point->childReviewAddedInNote($note); ?>
-				<?php if(!!$review): ?>
+				<?php if(!!$review && @$review->data->value): ?>
 					<span class="pr-2">{!! $review->data->value !!}</span>
 				<?php endif; ?>
-				<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>

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

@@ -32,10 +32,10 @@ $plural = 'Problems';
            <td class="width-300px">
                <div class="d-flex align-items-baseline pl-2">
                    <?php $review = $point->childReviewAddedInNote($note); ?>
-                   <?php if(!!$review): ?>
+                   <?php if(!!$review && @$review->data->value): ?>
                    <span class="pr-2">{!! $review->data->value !!}</span>
                    <?php endif; ?>
-                   <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>