Remove core plan/review concept + subjective text change + subj/plan column order fix

public/css/style.css

@@ -45,7 +45,7 @@
     color: #d8a714!important;
 }
 .bg-warning-mellow {
-    background-color: #ffc10777 !important;
+    background-color: #ffc10755 !important;
 }
 .text-link {
     color: rgb(13, 89, 175) !important;
@@ -436,12 +436,10 @@ body>nav.navbar {
     min-height: 100px;
 }
 body [note-rte][data-field-name="reviewValue"],
-body [note-rte][data-field-name="corePlanValue"],
 body [note-rte][data-field-name="planValue"] {
     border: 1px solid #ced4da !important;
 }
 body [note-rte][data-field-name="reviewValue"] .ql-editor[contenteditable],
-body [note-rte][data-field-name="corePlanValue"] .ql-editor[contenteditable],
 body [note-rte][data-field-name="planValue"] .ql-editor[contenteditable] {
     min-height: 28px !important;
     padding: .25rem .5rem !important;

resources/views/app/patient/allergies-center.blade.php

@@ -21,7 +21,7 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary w-25">Review</th>
+                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-25">Plan</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
@@ -63,7 +63,7 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
                                href="/point/review-log/<?= $allergy->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/careteam-center.blade.php

@@ -21,7 +21,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary w-25">Review</th>
+                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-25">Plan</th>
                 <th class="border-bottom-0 text-secondary">Details</th>
                 <th class="border-bottom-0 text-secondary">Contact</th>
@@ -63,7 +63,7 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
                                href="/point/review-log/<?= $careTeamMember->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/goals-center.blade.php

@@ -21,8 +21,8 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Goal</th>
-                <th class="border-bottom-0 text-secondary w-25">Review</th>
-                <th class="border-bottom-0 text-secondary w-25">Directions/Plan</th>
+                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-25">Plan</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
@@ -63,7 +63,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
+                               title="Subjective log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
                                href="/point/review-log/<?= $goal->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>
@@ -142,7 +142,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
 
                             @endif
 
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'goal', 'point' => $goal, 'planLabel' => 'Directions/Plan'])
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'goal', 'point' => $goal])
 
                             <div class="mt-3 pt-2 d-flex align-items-center border-top">
                                 <button type="submit" class="btn-save-goal btn btn-sm btn-primary mr-2">Save</button>
@@ -180,7 +180,7 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                             </div>
 
                             <?php $point = null; ?>
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'goal', 'planLabel' => 'Directions/Plan'])
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'goal'])
 
                         </div>
                         <div class="col-3 border-left">

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

@@ -22,8 +22,8 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary w-25">Directions/Plan</th>
-                <th class="border-bottom-0 text-secondary w-25">Review</th>
+                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-25">Plan</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
@@ -55,7 +55,8 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
                                 <?php
-                                include resource_path('views/app/patient/segment-templates/_child_plan/last-plan.php');
+                                $point = $medication;
+                                include resource_path('views/app/patient/segment-templates/_child_review/last-review.php');
                                 ?>
                             </div>
                             <div class="d-inline-flex flex-nowrap">
@@ -63,16 +64,10 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Plan log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
-                                   href="/point/plan-log/<?= $medication->uid ?>?popupmode=1">
+                                   title="Subjective log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
+                                   href="/point/review-log/<?= $medication->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>
-                                <?php
-                                /*$segment = $note->getSegmentByInternalName('plan_medications');
-                                if($segment) {
-                                    include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan.php');
-                                }*/
-                                ?>
                             </div>
                         </div>
                     </td>
@@ -80,8 +75,7 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
                                 <?php
-                                $point = $medication;
-                                include resource_path('views/app/patient/segment-templates/_child_review/last-review.php');
+                                include resource_path('views/app/patient/segment-templates/_child_plan/last-plan.php');
                                 ?>
                             </div>
                             <div class="d-inline-flex flex-nowrap">
@@ -89,10 +83,16 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
-                                   href="/point/review-log/<?= $medication->uid ?>?popupmode=1">
+                                   title="Plan log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
+                                   href="/point/plan-log/<?= $medication->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>
+                                <?php
+                                /*$segment = $note->getSegmentByInternalName('plan_medications');
+                                if($segment) {
+                                    include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan.php');
+                                }*/
+                                ?>
                             </div>
                         </div>
                     </td>
@@ -156,7 +156,7 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
 
                                 @endif
 
-                                @include('app.patient.wizard-partials.common-fields', ['label' => 'medication', 'point' => $medication, 'addVerbPT' => 'Prescribed', 'planLabel' => 'Directions/Plan'])
+                                @include('app.patient.wizard-partials.common-fields', ['label' => 'medication', 'point' => $medication, 'addVerbPT' => 'Prescribed'])
 
                                 <div class="mt-3 pt-2 d-flex align-items-center border-top">
                                     <button type="submit" class="btn-save-medication btn btn-sm btn-primary mr-2">Save</button>
@@ -199,7 +199,7 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                         </div>
 
                         <?php $point = null; ?>
-                        @include('app.patient.wizard-partials.common-fields', ['label' => 'medication', 'addVerbPT' => 'Prescribed', 'planLabel' => 'Directions/Plan'])
+                        @include('app.patient.wizard-partials.common-fields', ['label' => 'medication', 'addVerbPT' => 'Prescribed'])
 
                     </div>
                     <div class="col-4 border-left">

resources/views/app/patient/medications-reconcile.blade.php

@@ -28,7 +28,7 @@ $medications = $points;
         <thead>
         <tr>
             <th class="border-bottom-0">Medication</th>
-            <th class="border-bottom-0">Review</th>
+            <th class="border-bottom-0">Subjective</th>
         </tr>
         </thead>
         @foreach($medications as $medication)

resources/views/app/patient/problems-center.blade.php

@@ -85,7 +85,7 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
                                href="/point/review-log/<?= $problem->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>
@@ -211,7 +211,7 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
 
                             @endif
 
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'point' => $problem, 'reviewLabel' => 'HPI', 'addVerbPT' => 'Diagnosed'])
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'point' => $problem, 'addVerbPT' => 'Diagnosed'])
 
                             <div class="mt-3 pt-2 d-flex align-items-center border-top">
                                 <button type="submit" class="btn-save-problem btn btn-sm btn-primary mr-2">Save</button>
@@ -262,7 +262,7 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                             </div>
 
                             <?php $point = null; ?>
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'reviewLabel' => 'HPI', 'addVerbPT' => 'Diagnosed'])
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'addVerbPT' => 'Diagnosed'])
 
                         </div>
                         <div class="col-4 border-left">

resources/views/app/patient/segment-templates/_child_review/edit-review.php

@@ -41,12 +41,12 @@ else {
             <div class="d-none disallow-if-value-same-as"><?= str_compact($previousValue) ?></div>
         <?php endif; ?>
 
-        <p class="mb-2"><b>Review</b></p>
+        <p class="mb-2"><b>Subjective</b></p>
 
         <?php if($previousValue): ?>
             <div class="mb-2">
                 <div class="d-flex align-items-baseline mb-1">
-                    <span class="text-sm text-secondary">Previous Review / <?= friendlier_date($previousChildReview->created_at) ?>) (click to copy)</span>
+                    <span class="text-sm text-secondary">Previous Subjective / <?= friendlier_date($previousChildReview->created_at) ?>) (click to copy)</span>
                 </div>
                 <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
             </div>

resources/views/app/patient/segment-templates/intake_allergies/edit.blade.php

@@ -19,7 +19,7 @@ $allergies = Point::getIntakePointsOfCategory($patient, 'ALLERGY', $note);
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Allergy</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -95,7 +95,7 @@ $allergies = Point::getIntakePointsOfCategory($patient, 'ALLERGY', $note);
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
+                                   title="Subjective log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
                                    href="/point/review-log/<?= $allergy->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>

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

@@ -39,11 +39,11 @@ $numRelevant = 0;
             <?php $review = $allergy->childReviewAddedInNote($note); ?>
             <?php if(!!$review): ?>
                 <div class="pl-3 mt-1">
-                    <div class="text-secondary font-weight-bold">Review</div>
+                    <div class="text-secondary font-weight-bold">Subjective</div>
                     <div>{!! $review->data->value !!}</div>
                 </div>
             <?php elseif($rel): ?>
-                <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+                <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

resources/views/app/patient/segment-templates/intake_care_team/edit.blade.php

@@ -20,7 +20,7 @@ $careTeamMembers = Point::getIntakePointsOfCategory($patient, 'CARE_TEAM_MEMBER'
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Care Team Member</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -118,7 +118,7 @@ $careTeamMembers = Point::getIntakePointsOfCategory($patient, 'CARE_TEAM_MEMBER'
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
+                                   title="Subjective log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
                                    href="/point/review-log/<?= $careTeamMember->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>

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

@@ -44,11 +44,11 @@ $numRelevant = 0;
             <?php $review = $careTeamMember->childReviewAddedInNote($note); ?>
             <?php if(!!$review): ?>
             <div class="pl-3 mt-1">
-                <div class="text-secondary font-weight-bold">Review</div>
+                <div class="text-secondary font-weight-bold">Subjective</div>
                 <div>{!! $review->data->value !!}</div>
             </div>
             <?php elseif($rel): ?>
-            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

resources/views/app/patient/segment-templates/intake_goals/edit.blade.php

@@ -21,7 +21,7 @@ $goals = Point::getIntakePointsOfCategory($patient, 'GOAL', $note);
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Category</th>
                 <th class="border-bottom-0">Goal</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -171,7 +171,7 @@ $goals = Point::getIntakePointsOfCategory($patient, 'GOAL', $note);
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($goal->data->name) ? ' for ' . @($goal->data->name) : '' ?>"
+                                   title="Subjective log<?= !!@($goal->data->name) ? ' for ' . @($goal->data->name) : '' ?>"
                                    href="/point/review-log/<?= $goal->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>

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

@@ -39,11 +39,11 @@ $numRelevant = 0;
                 <?php $review = $goal->childReviewAddedInNote($note); ?>
                 <?php if(!!$review): ?>
                 <div class="pl-3 mt-1">
-                    <div class="text-secondary font-weight-bold">Review</div>
+                    <div class="text-secondary font-weight-bold">Subjective</div>
                     <div>{!! $review->data->value !!}</div>
                 </div>
                 <?php elseif($rel): ?>
-                <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+                <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
                 <?php endif; ?>
             </div>
         <?php endforeach; ?>

resources/views/app/patient/segment-templates/intake_interventions/edit.blade.php

@@ -20,7 +20,7 @@ $interventions = Point::getIntakePointsOfCategory($patient, 'INTERVENTION', $not
             <tr class="">
                 <th class="border-bottom-0">Category</th>
                 <th class="border-bottom-0">Intervention</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -108,7 +108,7 @@ $interventions = Point::getIntakePointsOfCategory($patient, 'INTERVENTION', $not
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($intervention->data->intervention) ? ' for ' . @($intervention->data->intervention) : '' ?>"
+                               title="Subjective log<?= !!@($intervention->data->intervention) ? ' for ' . @($intervention->data->intervention) : '' ?>"
                                href="/point/review-log/<?= $intervention->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

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

@@ -41,7 +41,7 @@ foreach($interventions as $intervention) {
                 <?php $review = $intervention->childReviewAddedInNote($note); ?>
                 <?php if(!!$review): ?>
                 <div class="pl-3 mt-1">
-                    <div class="text-secondary font-weight-bold">Review</div>
+                    <div class="text-secondary font-weight-bold">Subjective</div>
                     <div>{!! $review->data->value !!}</div>
                 </div>
                 <?php endif; ?>

resources/views/app/patient/segment-templates/intake_medications/edit.blade.php

@@ -20,7 +20,7 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Medication</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -124,7 +124,7 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
+                                   title="Subjective log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
                                    href="/point/review-log/<?= $medication->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>

resources/views/app/patient/segment-templates/intake_medications/edit_old.blade.php

@@ -19,7 +19,7 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
             <thead>
             <tr class="">
                 <th class="border-bottom-0">Medication</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -57,7 +57,7 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
                                href="/point/review-log/<?= $medication->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

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

@@ -40,11 +40,11 @@ $numRelevant = 0;
             <?php $review = $medication->childReviewAddedInNote($note); ?>
             <?php if(!!$review): ?>
             <div class="pl-3 mt-1">
-                <div class="text-secondary font-weight-bold">Review</div>
+                <div class="text-secondary font-weight-bold">Subjective</div>
                 <div>{!! $review->data->value !!}</div>
             </div>
             <?php elseif($rel): ?>
-            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

resources/views/app/patient/segment-templates/intake_problems/edit.blade.php

@@ -20,7 +20,7 @@ $problems = Point::getIntakePointsOfCategory($patient, 'PROBLEM', $note);
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Problem</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -107,7 +107,7 @@ $problems = Point::getIntakePointsOfCategory($patient, 'PROBLEM', $note);
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
                                href="/point/review-log/<?= $problem->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

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

@@ -44,7 +44,7 @@ $numRelevant = 0;
                 <div>{!! $hpi->data && @($hpi->data->value) ? $hpi->data->value : '-' !!}</div>
             </div>
             <?php elseif($rel): ?>
-            <div class="relevant-without-review block-signing text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+            <div class="relevant-without-review block-signing text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

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

@@ -40,11 +40,11 @@ $numRelevant = 0;
             <?php $review = $supplement->childReviewAddedInNote($note); ?>
             <?php if(!!$review): ?>
             <div class="pl-3 mt-1">
-                <div class="text-secondary font-weight-bold">Review</div>
+                <div class="text-secondary font-weight-bold">Subjective</div>
                 <div>{!! $review->data->value !!}</div>
             </div>
             <?php elseif($rel): ?>
-            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Review missing</div>
+            <div class="relevant-without-review text-danger mt-1 text-sm" data-target-segment="<?= $segment->segmentTemplate->internal_name ?>"><i class="fa fa-exclamation-triangle mr-1"></i>Subjective missing</div>
             <?php endif; ?>
         </div>
     <?php endforeach; ?>

resources/views/app/patient/segment-templates/plan_allergies/edit.blade.php

@@ -20,7 +20,7 @@ $intakeOrVisit = 'PLAN';
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Allergy</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -96,7 +96,7 @@ $intakeOrVisit = 'PLAN';
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($allergy->data->name) ? ' for ' . @($allergy->data->name) : '' ?>"
                                href="/point/review-log/<?= $allergy->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/segment-templates/plan_care_team/edit.blade.php

@@ -20,7 +20,7 @@ $intakeOrVisit = 'PLAN';
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Care Team Member</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -118,7 +118,7 @@ $intakeOrVisit = 'PLAN';
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($careTeamMember->data->name) ? ' for ' . @($careTeamMember->data->name) : '' ?>"
                                href="/point/review-log/<?= $careTeamMember->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/segment-templates/plan_goals/edit.blade.php

@@ -21,7 +21,7 @@ $intakeOrVisit = 'PLAN';
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Category</th>
                 <th class="border-bottom-0">Goal</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -171,7 +171,7 @@ $intakeOrVisit = 'PLAN';
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($goal->data->name) ? ' for ' . @($goal->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($goal->data->name) ? ' for ' . @($goal->data->name) : '' ?>"
                                href="/point/review-log/<?= $goal->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/segment-templates/plan_interventions/edit.blade.php

@@ -21,7 +21,7 @@ $intakeOrVisit = 'PLAN';
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Category</th>
                 <th class="border-bottom-0">Intervention</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -116,7 +116,7 @@ $intakeOrVisit = 'PLAN';
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($intervention->data->intervention) ? ' for ' . @($intervention->data->intervention) : '' ?>"
+                               title="Subjective log<?= !!@($intervention->data->intervention) ? ' for ' . @($intervention->data->intervention) : '' ?>"
                                href="/point/review-log/<?= $intervention->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/segment-templates/plan_medications/edit.blade.php

@@ -20,7 +20,7 @@ $intakeOrVisit = 'PLAN';
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Medication</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -100,7 +100,7 @@ $intakeOrVisit = 'PLAN';
                                native target="_blank"
                                open-in-stag-popup
                                popup-style="stag-popup-md"
-                               title="Review log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
+                               title="Subjective log<?= !!@($medication->data->name) ? ' for ' . @($medication->data->name) : '' ?>"
                                href="/point/review-log/<?= $medication->uid ?>?popupmode=1">
                                 <i class="fa fa-history"></i>
                             </a>

resources/views/app/patient/segment-templates/plan_problems/edit.blade.php

@@ -20,7 +20,7 @@ $intakeOrVisit = 'PLAN';
             <tr class="">
                 <th class="border-bottom-0 width-100px text-info">Relevant to<br>this visit</th>
                 <th class="border-bottom-0">Problem</th>
-                <th class="border-bottom-0">Most Recent Review</th>
+                <th class="border-bottom-0">Most Recent Subjective</th>
                 <th class="border-bottom-0">Most Recent Plan</th>
             </tr>
             </thead>
@@ -106,7 +106,7 @@ $intakeOrVisit = 'PLAN';
                            native target="_blank"
                            open-in-stag-popup
                            popup-style="stag-popup-md"
-                           title="Review log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
+                           title="Subjective log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
                            href="/point/review-log/<?= $problem->uid ?>?popupmode=1">
                             <i class="fa fa-history"></i>
                         </a>

resources/views/app/patient/supplements-center.blade.php

@@ -22,8 +22,8 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary w-25">Review</th>
-                <th class="border-bottom-0 text-secondary w-25">Directions/Plan</th>
+                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-25">Plan</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
@@ -64,7 +64,7 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                                    native target="_blank"
                                    open-in-stag-popup
                                    popup-style="stag-popup-md"
-                                   title="Review log<?= !!@($supplement->data->name) ? ' for ' . @($supplement->data->name) : '' ?>"
+                                   title="Subjective log<?= !!@($supplement->data->name) ? ' for ' . @($supplement->data->name) : '' ?>"
                                    href="/point/review-log/<?= $supplement->uid ?>?popupmode=1">
                                     <i class="fa fa-history"></i>
                                 </a>
@@ -156,7 +156,7 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
 
                                 @endif
 
-                                @include('app.patient.wizard-partials.common-fields', ['label' => 'supplement', 'point' => $supplement, 'addVerbPT' => 'Prescribed', 'planLabel' => 'Directions/Plan'])
+                                @include('app.patient.wizard-partials.common-fields', ['label' => 'supplement', 'point' => $supplement, 'addVerbPT' => 'Prescribed'])
 
                                 <div class="mt-3 pt-2 d-flex align-items-center border-top">
                                     <button type="submit" class="btn-save-supplement btn btn-sm btn-primary mr-2">Save</button>
@@ -199,7 +199,7 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                         </div>
 
                         <?php $point = null; ?>
-                        @include('app.patient.wizard-partials.common-fields', ['label' => 'supplement', 'addVerbPT' => 'Prescribed', 'planLabel' => 'Directions/Plan'])
+                        @include('app.patient.wizard-partials.common-fields', ['label' => 'supplement', 'addVerbPT' => 'Prescribed'])
 
                     </div>
                     <div class="col-4 border-left">

resources/views/app/patient/supplements-reconcile.blade.php

@@ -28,7 +28,7 @@ $supplements = $points;
         <thead>
         <tr>
             <th class="border-bottom-0">Supplement</th>
-            <th class="border-bottom-0">Review</th>
+            <th class="border-bottom-0">Subjective</th>
         </tr>
         </thead>
         @foreach($supplements as $supplement)

resources/views/app/patient/wizard-partials/common-fields.blade.php

@@ -124,21 +124,6 @@
 
     @if(1 || $patient->core_note_id !== $note->id) {{-- allow review/plan from core note --}}
 
-        {{-- pre-existing plan (coreChildPlan) - show only when-adding OR when-editing-from-created-note --}}
-        <div if-active-and-pre-existing-or-not-active class="mb-2 d-none">
-            <?php
-            $currentValue = '';
-            if (@$point && $point->coreChildPlan) {
-                $parsedPlan = json_decode($point->coreChildPlan->data);
-                $currentValue = @($parsedPlan->value) ? $parsedPlan->value : '';
-            }
-            ?>
-            <label class="text-sm mb-0 font-weight-bold">Pre-existing {{@$planLabel ? $planLabel : 'Plan'}} (before this visit)</label>
-            <div note-rte
-                 class="form-group mb-2 rte-holder bg-white border rounded"
-                 data-field-name="corePlanValue"><?= $currentValue ?></div>
-        </div>
-
         @if(!@$noReview)
             <div class="mb-2">
                 <?php
@@ -176,14 +161,14 @@
                     }
                 }
             ?>
-                <label class="text-sm mb-0 font-weight-bold">{{@$reviewLabel ? $reviewLabel : 'Review'}}</label>
+                <label class="text-sm mb-0 font-weight-bold">{{@$reviewLabel ? $reviewLabel : 'Subjective'}}</label>
                 <div note-rte
                      class="form-group mb-2 rte-holder bg-white border rounded"
                      data-field-name="reviewValue"><?= $currentValue ?></div>
                 <?php if($previousValue): ?>
                 <div class="mb-2">
                     <div class="d-flex align-items-baseline mb-1">
-                        <span class="text-sm text-secondary">Previous {{@$reviewLabel ? $reviewLabel : 'Review'}} / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
+                        <span class="text-sm text-secondary">Previous {{@$reviewLabel ? $reviewLabel : 'Subjective'}} / <?= friendlier_date($previousChildReview->created_at) ?> (click to copy)</span>
                     </div>
                     <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
@@ -223,8 +208,7 @@
                     }
                 }
                 ?>
-                <label if-active-and-pre-existing-or-not-active class="d-none text-sm mb-0 font-weight-bold">Changes to {{@$planLabel ? $planLabel : 'Plan'}} during this visit (as part of my plan)</label>
-                <label if-active-and-not-pre-existing class="d-none text-sm mb-0 font-weight-bold">{{@$planLabel ? $planLabel : 'Plan'}}</label>
+                <label class="text-sm mb-0 font-weight-bold">{{@$planLabel ? $planLabel : 'Plan'}}</label>
                 <div note-rte
                      class="form-group mb-2 rte-holder bg-white border rounded"
                      data-field-name="planValue"><?= $currentValue ?></div>

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

@@ -201,14 +201,12 @@ parentSegment.find('#frm-add-{{$label}}')
 
         @if(1 || $patient->core_note_id !== $note->id)
         // store plan content
-        let corePlanContent = parsed && parsed.corePlanValue ? parsed.corePlanValue : '';
         let planContent = parsed && parsed.planValue ? parsed.planValue : '';
         let reviewContent = parsed && parsed.reviewValue ? parsed.reviewValue : '';
         // if(!$.trim($('<div/>').html(planContent).text())) {
         //     toastr.error('Directions cannot be empty');
         //     return false;
         // }
-        if(parsed.corePlanValue) delete parsed.corePlanValue;
         if(parsed.planValue) delete parsed.planValue;
         if(parsed.reviewValue) delete parsed.reviewValue;
         @endif
@@ -243,11 +241,6 @@ parentSegment.find('#frm-add-{{$label}}')
         let payload = {};
         form.serializeArray().map(x => {payload[x.name] = x.value;});
         @if(1 || $patient->core_note_id !== $note->id)
-        if(!!corePlanContent && $.trim($('<div/>').html(corePlanContent).text())) {
-            payload.corePlanData = JSON.stringify({
-                value: corePlanContent
-            })
-        }
         if(!!reviewContent && $.trim($('<div/>').html(reviewContent).text())) {
             payload.childReviewData = JSON.stringify({
                 value: reviewContent
@@ -296,7 +289,6 @@ parentSegment.find('.frm-edit-{{$label}}')
         }
 
         @if(1 || $patient->core_note_id !== $note->id)
-        let corePlanContent = parsed && parsed.corePlanValue ? parsed.corePlanValue : '';
 
         let reviewContent = parsed && parsed.reviewValue ? parsed.reviewValue : '';
 
@@ -326,7 +318,6 @@ parentSegment.find('.frm-edit-{{$label}}')
             }
         }
 
-        if(parsed.corePlanValue) delete parsed.corePlanValue;
         if(parsed.planValue) delete parsed.planValue;
         if(parsed.reviewValue) delete parsed.reviewValue;
         @endif
@@ -361,11 +352,6 @@ parentSegment.find('.frm-edit-{{$label}}')
         let payload = {};
         form.serializeArray().map(x => {payload[x.name] = x.value;});
         @if(1 || $patient->core_note_id !== $note->id)
-        if(!!corePlanContent && $.trim($('<div/>').html(corePlanContent).text())) {
-            payload.corePlanData = JSON.stringify({
-                value: corePlanContent
-            })
-        }
         if(!!reviewContent && $.trim($('<div/>').html(reviewContent).text())) {
             payload.childReviewData = JSON.stringify({
                 value: reviewContent