Client dashboard - show last review and plan - rx/dx/aller/ct

config/app.php

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

public/css/style.css

@@ -1345,7 +1345,7 @@ body .node input[type="number"] {
     cursor: ns-resize;
 }
 .stag-popup.resizable .stag-popup-content {
-    overflow: auto !important;
+    /*overflow: auto !important;*/   /* trouble */
 }
 
 /* slide-in stag-popups */
@@ -3602,6 +3602,10 @@ table.v-top th {
 .note-container .segments-list p:empty {
     display: none;
 }
+.inline-html-container p>br:first-child:last-child,
+.inline-html-container p:empty {
+    display: none;
+}
 .mcp-theme-1 .mb-0-pagination .pagination {
     margin-bottom: 0 !important;
 }

resources/views/app/patient/point-based-partials/allergies.blade.php

@@ -29,7 +29,22 @@ $allergies = \App\Models\Point::getPointsOfCategory($patient, "ALLERGY");
         @foreach($allergies as $allergy)
             <div class="mb-1">
                 <b><?= !!@($allergy->data->name) ? @($allergy->data->name) : '-' ?></b>
-                <?= !!@($allergy->data->description) ? '/&nbsp;' . @($allergy->data->description) : '' ?>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $allergy;
+                    $note = $point->note;
+                    $childHeading = 'Subjective';
+                    include resource_path('views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php');
+                    ?>
+                </div>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $allergy;
+                    $note = $point->note;
+                    $childHeading = 'Plan';
+                    include resource_path('views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php');
+                    ?>
+                </div>
             </div>
         @endforeach
         @if(!count($allergies))

resources/views/app/patient/point-based-partials/care-team.blade.php

@@ -31,6 +31,22 @@ $careTeamMembers = \App\Models\Point::getPointsOfCategory($patient, "CARE_TEAM_M
                 <b><?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?></b>
                 <?= !!@($careTeamMember->data->specialty) ? '/&nbsp;' . @($careTeamMember->data->specialty) . '<br>' : '' ?>
                 <?= !!@($careTeamMember->data->organization) ? '/&nbsp;' . @($careTeamMember->data->organization) . '<br>' : '' ?>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $careTeamMember;
+                    $note = $point->note;
+                    $childHeading = 'Subjective';
+                    include resource_path('views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php');
+                    ?>
+                </div>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $careTeamMember;
+                    $note = $point->note;
+                    $childHeading = 'Plan';
+                    include resource_path('views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php');
+                    ?>
+                </div>
             </div>
         @endforeach
         @if(!count($careTeamMembers))

resources/views/app/patient/point-based-partials/dx.blade.php

@@ -30,7 +30,22 @@ $problems = \App\Models\Point::getPointsOfCategory($patient, "PROBLEM");
             <div class="mb-1">
                 <b><?= !!@($problem->data->name) ? @($problem->data->name) : '-' ?></b>
                 <?= !!@($problem->data->icd) ? '/&nbsp;' . @($problem->data->icd) : '' ?>
-                <?= !!@($problem->data->description) ? '/&nbsp;' . @($problem->data->description) : '' ?>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $problem;
+                    $note = $point->note;
+                    $childHeading = 'Subjective';
+                    include resource_path('views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php');
+                    ?>
+                </div>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $problem;
+                    $note = $point->note;
+                    $childHeading = 'Plan';
+                    include resource_path('views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php');
+                    ?>
+                </div>
             </div>
         @endforeach
         @if(!count($problems))

resources/views/app/patient/point-based-partials/rx.blade.php

@@ -29,6 +29,22 @@ $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
         @foreach($medications as $medication)
             <div class="mb-1">
                 <b><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></b>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $medication;
+                    $note = $point->note;
+                    $childHeading = 'Subjective';
+                    include resource_path('views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php');
+                    ?>
+                </div>
+                <div class="ml-3 mt-1">
+                    <?php
+                    $point = $medication;
+                    $note = $point->note;
+                    $childHeading = 'Plan';
+                    include resource_path('views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php');
+                    ?>
+                </div>
             </div>
         @endforeach
         @if(!count($medications))

resources/views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php

@@ -1,6 +1,9 @@
 <?php if ($point->last_child_plan_point_id && $point->last_child_plan_data): ?>
     <?php $parsedPlan = json_decode($point->last_child_plan_data); ?>
     <span class="screen-only">
+    <?php if(@$childHeading): ?>
+        <span class="on-hover-opaque font-weight-bold mr-2 c-pointer upsert-rp-trigger font-underline"><?= $childHeading ?></span>
+    <?php endif; ?>
     <?php if ($point->last_child_plan_point_scoped_note_id === $patient->core_note_id): ?>
         <span class="text-sm text-secondary">(updated on the patient's chart)</span>
     <?php else: ?>
@@ -13,6 +16,8 @@
                         <?= relative_friendly_date($point->last_child_plan_effective_date) ?>
                         <?php if($point->last_child_plan_creator): ?>
                             by <?= $point->last_child_plan_creator ?>
+                        <?php elseif($point->last_child_plan_creator_pro_first_name || $point->last_child_plan_creator_pro_last_name): ?>
+                            by <?= implode(' ', [$point->last_child_plan_creator_pro_first_name, $point->last_child_plan_creator_pro_last_name]); ?>
                         <?php endif; ?>
                     </span>
                     <div menu right class="bg-white border">

resources/views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php

@@ -1,6 +1,9 @@
 <?php if ($point->last_child_review_point_id && $point->last_child_review_data): ?>
     <?php $parsedReview = json_decode($point->last_child_review_data); ?>
     <span class="screen-only">
+        <?php if(@$childHeading): ?>
+            <span class="on-hover-opaque font-weight-bold mr-2 c-pointer upsert-rp-trigger font-underline"><?= $childHeading ?></span>
+        <?php endif; ?>
         <?php if ($point->last_child_review_point_scoped_note_id === $patient->core_note_id): ?>
             <span class="text-sm text-secondary">(updated on the patient's chart)</span>
         <?php else: ?>
@@ -13,6 +16,8 @@
                             <?= relative_friendly_date($point->last_child_review_effective_date) ?>
                             <?php if($point->last_child_review_creator): ?>
                                 by <?= $point->last_child_review_creator ?>
+                            <?php elseif($point->last_child_review_creator_pro_first_name || $point->last_child_review_creator_pro_last_name): ?>
+                                by <?= implode(' ', [$point->last_child_review_creator_pro_first_name, $point->last_child_review_creator_pro_last_name]); ?>
                             <?php endif; ?>
                         </span>
                         <div menu right class="bg-white border">