Просмотр исходного кода

New subjective and plan updates

Vijayakrishnan 3 лет назад
Родитель
Сommit
83a4ca2e0f

+ 9 - 0
js-dev/mc.js

@@ -586,6 +586,15 @@ window.saveVisitForm = function(_trigger, _silent = false, _close = false, _done
         if(!hasResponseError(_data)) {
             if(typeof window.updateAllSegmentsInResponse !== 'undefined') {
                 window.updateAllSegmentsInResponse(_data, true, _silent);
+
+                // if /api/visitPoint/upsertChildReview - refresh subjective_general_v2
+                // if /api/visitPoint/upsertChildPlan - refresh plan_free_text_v2
+                if(form.attr('url') === '/api/visitPoint/upsertChildReview') {
+                    $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                }
+                else if(form.attr('url') === '/api/visitPoint/upsertChildPlan') {
+                    $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
+                }
             }
             if(typeof window.refreshRHSSidebar !== 'undefined') {
                 window.refreshRHSSidebar();

+ 3 - 0
public/css/style.css

@@ -2395,6 +2395,9 @@ body.in-iframe .main-row > .sidebar {
 .visit-segment .mcp-theme-1 .ql-editor[contenteditable] {
     min-height: 200px;
 }
+.visit-segment .mcp-theme-1 [short] .ql-editor[contenteditable] {
+    min-height: 100px !important;
+}
 .visit-segment tr .vitals-copy-trigger {
     position: absolute;
     top: 0;

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/allergies.blade.php

@@ -32,7 +32,7 @@ $plural = 'Allergies';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>
             <td class="px-2 width-300px">

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/care_team.blade.php

@@ -30,7 +30,7 @@ $plural = 'Care team members';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($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) . '' : '' ?>

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/edit.blade.php

@@ -15,7 +15,7 @@ if (!!@$point->data) {
         <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
         <input type="hidden" name="category" value="<?= $category ?>">
         <input type="hidden" name="data">
-        <div note-rte
+        <div note-rte short
              class="form-group mb-2 border-left border-right rte-holder"
              data-field-name="free_text"
         ><?= $parsed && @$parsed->free_text ? $parsed->free_text : '' ?></div>

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/goals.blade.php

@@ -30,7 +30,7 @@ $plural = 'Goals';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
+                    <?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?>
                 </div>
             </td>
             <td class="px-2 width-300px">

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/medications.blade.php

@@ -31,7 +31,7 @@ $plural = 'Medications';
                 @endif
             </td>
             <td class="px-2 width-300px">
-                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>

+ 1 - 1
resources/views/app/patient/segment-templates/plan_free_text_v2/problems.blade.php

@@ -30,7 +30,7 @@ $plural = 'Problems';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>
             <td class="px-2 width-300px">

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/allergies.blade.php

@@ -33,7 +33,7 @@ $plural = 'Allergies';
                 @endif
             </td>
             <td class="px-2 width-300px">
-                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                     
                 </div>

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/care_team.blade.php

@@ -25,7 +25,7 @@ $plural = 'Care team members';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->name) ? @($point->data->name) : '-' ?></b>
+                    <?= !!@($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) . '' : '' ?>

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/edit.blade.php

@@ -15,7 +15,7 @@ if (!!@$point->data) {
         <input type="hidden" name="segmentUid" value="<?= $segment->uid ?>">
         <input type="hidden" name="category" value="<?= $category ?>">
         <input type="hidden" name="data">
-        <div note-rte
+        <div note-rte short
              class="form-group mb-2 border-left border-right rte-holder"
              data-field-name="free_text"
         ><?= $parsed && @$parsed->free_text ? $parsed->free_text : '' ?></div>

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/goals.blade.php

@@ -25,7 +25,7 @@ $plural = 'Goals';
             </td>
             <td class="px-2 width-300px">
                 <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
-                    <b><?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?></b>
+                    <?= !!@($point->data->goal) ? @($point->data->goal) : '-' ?>
                 </div>
             </td>
             <td class="px-2 width-300px">

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/medications.blade.php

@@ -25,7 +25,7 @@ $plural = 'Medications';
 			@endif
 		</td>
 		<td class="px-2 width-300px">
-			<div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+			<div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
 				<?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
 			</div>
 		</td>

+ 1 - 1
resources/views/app/patient/segment-templates/subjective_general_v2/problems.blade.php

@@ -24,7 +24,7 @@ $plural = 'Problems';
                 @endif
             </td>
             <td class="px-2 width-300px">
-                <div class="font-weight-bold <?= $point->is_removed ? 'strike-through' : '' ?>">
+                <div class="<?= $point->is_removed ? 'strike-through' : '' ?>">
                     <?= !!@($point->data->name) ? @($point->data->name) : '-' ?>
                 </div>
             </td>

+ 12 - 0
resources/views/app/patient/wizard-partials/common-script.blade.php

@@ -323,6 +323,8 @@ parentSegment.find('#frm-add-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
                 if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
 
                 // only for canvas-migrate
@@ -449,6 +451,8 @@ parentSegment.find('.frm-edit-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
                 if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
             }
         }, 'json');
@@ -466,6 +470,8 @@ parentSegment.find('.frm-upsert-review-plan-{{$label}}')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
                 refreshDynamicStagPopup();
             }
         }).then(() => {
@@ -617,6 +623,8 @@ parentSegment.find('.toggle-relevance')
                     $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                     $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                    $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                    $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
                     if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
                 }
             }, 'json');
@@ -630,6 +638,8 @@ parentSegment.find('.toggle-relevance')
                         $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                         $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                        $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                        $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
                         if(typeof refreshRHSSidebar !== 'undefined') refreshRHSSidebar();
                     }
                 }, 'json');
@@ -666,6 +676,8 @@ parentSegment.find('.tracker-input')
                 $('.visit-segment[data-segment-template-name="intake_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="plan_{{$segment_part}}"]').find('.refresh-segment').trigger('click');
                 $('.visit-segment[data-segment-template-name="{{$segment_part}}"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="subjective_general_v2"]').find('.refresh-segment').trigger('click');
+                $('.visit-segment[data-segment-template-name="plan_free_text_v2"]').find('.refresh-segment').trigger('click');
             }
         }, 'json');
     });