فهرست منبع

Meds UI updates (wizard & omega summary)

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

+ 1 - 1
config/app.php

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

+ 3 - 3
resources/views/app/patient/medications-center.blade.php

@@ -89,7 +89,7 @@ if(!@$summaryView) {
                                 @if(!@$summaryView)
                                     <div moe huge relative>
                                         <a start show href="#" title="Edit">
-                                            <?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?>
+                                            <b><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></b>
                                             <?php
                                             if($medication->last_child_review_data) {
                                                 $review = json_decode($medication->last_child_review_data);
@@ -195,7 +195,7 @@ if(!@$summaryView) {
                                 </div>
                                 @if(!@$summaryView)
                                 <div class="d-inline-flex flex-column ml-1">
-                                    <a class="px-1 view-review-log"
+                                    <a class="px-1 view-review-log text-secondary on-hover-opaque"
                                        native target="_blank"
                                        open-in-stag-popup
                                        popup-style="stag-popup-md"
@@ -233,7 +233,7 @@ if(!@$summaryView) {
                                 </div>
                                 @if(!@$summaryView)
                                 <div class="d-inline-flex flex-column ml-1">
-                                    <a class="px-1 view-review-log"
+                                    <a class="px-1 view-review-log text-secondary on-hover-opaque"
                                        native target="_blank"
                                        open-in-stag-popup
                                        popup-style="stag-popup-md"

+ 2 - 2
resources/views/app/patient/segment-templates/_child_plan/medication/edit-plan-optimized.php

@@ -1,5 +1,5 @@
 <div visit-moe large class="d-inline">
-    <a start show href="#" class="px-1 text-center d-block" title="<?= $currentChildPlan ? 'Edit Plan' : 'Add Plan'?>">
+    <a start show href="#" class="px-1 text-center d-block text-secondary on-hover-opaque" title="<?= $currentChildPlan ? 'Edit Plan' : 'Add Plan'?>">
         <i class="fa <?= $currentChildPlan ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1 w-100" left>
@@ -26,7 +26,7 @@
 <?php if($currentChildPlan): ?>
     <div visit-moe relative class="d-inline">
         <a start show href="#" class="px-1 text-center d-block" title="Delete Plan">
-            <i class="fa fa-trash-alt text-danger on-hover-opaque"></i>
+            <i class="fa fa-trash-alt text-secondary on-hover-opaque"></i>
         </a>
         <form url="/api/visitPoint/destroyCurrentChildPlan" class="mcp-theme-1" right>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">

+ 2 - 2
resources/views/app/patient/segment-templates/_child_plan/medication/last-plan-optimized.php

@@ -4,7 +4,7 @@
         <div>
             <div class="inline-html-container">
                 <?php if(@$parsedPlan->value): ?>
-                    <div><span class="text-sm">Freq: </span><?= trim(strip_tags($parsedPlan->value)) ?></div>
+                    <div><b class="text-sm">Freq:</b> <?= trim(strip_tags($parsedPlan->value)) ?></div>
                 <?php endif; ?>
             </div>
         </div>
@@ -17,7 +17,7 @@
             <?php else: ?>
                 <?php if(!@$summaryView): ?>
                     <div class="d-inline position-relative on-click-menu">
-                        <span class="text-sm text-primary c-pointer">
+                        <span class="text-sm text-secondary c-pointer">
                             <?= relative_friendly_date($point->last_child_plan_effective_date) ?>
                             <?php if($point->last_child_plan_creator): ?>
                                 by <?= $point->last_child_plan_creator ?>

+ 2 - 2
resources/views/app/patient/segment-templates/_child_review/medication/edit-review-optimized.php

@@ -1,5 +1,5 @@
 <div visit-moe large class="d-inline">
-    <a start show href="#" class="px-1 text-center d-block" title="<?= $currentChildReview ? 'Edit Subjective' : 'Add Subjective'?>">
+    <a start show href="#" class="px-1 text-center d-block text-secondary on-hover-opaque" title="<?= $currentChildReview ? 'Edit Subjective' : 'Add Subjective'?>">
         <i class="fa <?= $currentChildReview ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1 w-100" left>
@@ -33,7 +33,7 @@
 <?php if($currentChildReview): ?>
     <div visit-moe relative class="d-inline">
         <a start show href="#" class="px-1 text-center d-block" title="Undo Changes">
-            <i class="fa fa-trash-alt text-danger on-hover-opaque"></i>
+            <i class="fa fa-trash-alt text-secondary on-hover-opaque"></i>
         </a>
         <form url="/api/visitPoint/destroyCurrentChildReview" class="mcp-theme-1" right>
             <input type="hidden" name="uid" value="<?= $point->uid ?>">

+ 8 - 10
resources/views/app/patient/segment-templates/_child_review/medication/last-review-optimized.php

@@ -1,15 +1,13 @@
 <?php if ($point->last_child_review_point_id && $point->last_child_review_data): ?>
     <?php $parsedReview = json_decode($point->last_child_review_data); ?>
     <div class="<?= $point->last_child_review_point_scoped_note_id === $note->id ? 'bg-warning-mellow p-2 rounded' : '' ?>">
-        <div>
-            <div class="inline-html-container">
-                <?php if(@$parsedReview->value): ?>
-                    <div><span class="text-sm">Freq: </span><?= trim(strip_tags($parsedReview->value)) ?></div>
-                <?php endif; ?>
-                <?php if(@$parsedReview->experience): ?>
-                    <div><span class="text-sm">Experience: </span><?= $parsedReview->experience ?></div>
-                <?php endif; ?>
-            </div>
+        <div class="inline-html-container">
+            <?php if(@$parsedReview->value): ?>
+                <div><b class="text-sm">Freq:</b> <?= trim(strip_tags($parsedReview->value)) ?></div>
+            <?php endif; ?>
+            <?php if(@$parsedReview->experience): ?>
+                <div><b class="text-sm">Experience:</b> <?= $parsedReview->experience ?></div>
+            <?php endif; ?>
         </div>
         <span class="screen-only">
         <?php if ($point->last_child_review_point_scoped_note_id === $patient->core_note_id): ?>
@@ -20,7 +18,7 @@
             <?php else: ?>
                 <?php if(!@$summaryView): ?>
                     <div class="d-inline position-relative on-click-menu">
-                        <span class="text-sm text-primary c-pointer">
+                        <span class="text-sm text-secondary c-pointer">
                             <?= relative_friendly_date($point->last_child_review_effective_date) ?>
                             <?php if($point->last_child_review_creator): ?>
                                 by <?= $point->last_child_review_creator ?>

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

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

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

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

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

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

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

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

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

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

+ 2 - 2
resources/views/app/patient/wizard-partials/common-fields-edit-optimized.blade.php

@@ -157,7 +157,7 @@
                     <input type="text"
                            data-name="value"
                            data-container-name="childReviewData"
-                           value="{{@($currentChildReview->data->value)}}"
+                           value="{{@($currentChildReview->data->value) ? trim(strip_tags($currentChildReview->data->value)) : ''}}"
                            class="form-control form-control-sm min-width-unset">
                 </div>
                 <div class="mb-2 col-md-6 pr-0 pb-2">
@@ -197,7 +197,7 @@
                     <input type="text"
                            data-name="value"
                            data-container-name="childPlanData"
-                           value="{{@($currentChildPlan->data->value)}}"
+                           value="{{@($currentChildPlan->data->value) ? trim(strip_tags($currentChildPlan->data->value)) : ''}}"
                            class="form-control form-control-sm min-width-unset">
                 </div>
             @else