فهرست منبع

Meds UI updates (wizard & omega summary)

Vijayakrishnan 3 سال پیش
والد
کامیت
6961608383

+ 2 - 0
public/css/style.css

@@ -394,6 +394,8 @@ body>nav.navbar {
 }
 .mcp-theme-1 .width-30px {
     width: 30px !important;
+    min-width: 30px !important;
+    max-width: 30px !important;
 }
 .mcp-theme-1 .width-40px {
     width: 40px !important;

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

@@ -25,13 +25,11 @@ $plural = 'Allergies';
     <?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':'' }}">
+            <td class="width-30px text-right pl-0 pr-1">
                 @if($rel)
                     <?php $numRelevant++; ?>
-                    *{{ $j }}.
-                @else
-                    {{ $j }}.
                 @endif
+                {{ $j }}.
             </td>
             <td class="px-2">
                 <div class=" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px">

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

@@ -16,13 +16,11 @@ $plural = 'Care team members';
     <?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':'' }}">
+            <td class="width-30px text-right pl-0 pr-1">
                 @if($rel)
                     <?php $numRelevant++; ?>
-                    *{{ $j }}.
-                @else
-                    {{ $j }}.
                 @endif
+                {{ $j }}.
             </td>
             <td class="px-2">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px">

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

@@ -20,36 +20,36 @@ $plural = 'Medications';
 	<table class="table table-bordered table-xs table-cage mb-0">
     <?php $j = 0; foreach ($points as $point): $j++; ?>
         <?php $rel = $point->relevanceToNote($note); ?>
+		<?php
+		$review = null;
+		if($point->lastChildReview) {
+			$review = json_decode($point->lastChildReview->data);
+		}
+		?>
 	<tr>
-		<td class="width-30px text-right pl-0 pr-1 {{ $rel ? ' text-info':'' }}">
+		<td class="width-30px text-right pl-0 pr-1">
 			@if($rel)
 				<?php $numRelevant++; ?>
-				*{{ $j }}.
-			@else
-				{{ $j }}.
 			@endif
+			{{ $j }}.
 		</td>
 		<td class="px-2">
 			<div class=" <?= $point->is_removed ? 'strike-through' : '' ?> grow-till-300px">
 				<?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
-				<?php
-				if($point->lastChildReview) {
-					$review = json_decode($point->lastChildReview->data);
-					if(isset($review->value) && isset($review->experience)) {
-						?>
-						<span class="text-dark text-sm ml-1">({{$review->value}})</span>
-						<?php
-					}
-				}
-				?>
+			</div>
+		</td>
+		<td class="px-2">
+			<div class="grow-till-300px">
+				@if(@$review && isset($review->value))
+					{{trim(strip_tags($review->value))}}
+				@endif
 			</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->experience): ?>
-					<span class="pr-2">{!! $review->data->experience !!}</span>
-				<?php endif; ?>
+				@if(@$review && isset($review->experience))
+					{{trim(strip_tags($review->experience))}}
+				@endif
 				<span class="text-nowrap">
 					<?php if ($point->is_removed): ?>
 				@if($point->removal_reason_category === 'DURING_VISIT')
@@ -59,7 +59,7 @@ $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">* Addeded 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>
 				<?php endif;?>