Probs wiz - new layout updates

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

@@ -216,7 +216,7 @@ if(!@$summaryView) {
                                         </div>
                                     </div>
                                 @endif
-                                <div class="ml-3 d-inline-flex align-items-baseline"> <!-- meta info -->
+                                <div class="ml-3 d-inline-flex align-items-baseline text-dark"> <!-- meta info -->
                                     @if(!!@$problem->data->start_date)
                                         <div class="text-sm text-nowrap small text-left mr-2">Started <?= !!@($problem->data->start_date) ? friendly_date($problem->data->start_date) : '-' ?></div>
                                     @endif
@@ -236,29 +236,29 @@ if(!@$summaryView) {
                                     <div if-read-mode>
                                         <div class="">
                                             <div class="flex-grow-1">
-                                                <span class="on-hover-opaque font-weight-bold mr-2">Subj.</span>
+                                                <span class="on-hover-opaque font-weight-bold mr-2 c-pointer upsert-rp-trigger font-underline">Subj</span>
+                                                @if(!@$summaryView)
+                                                    <div class="d-inline-flex align-items-baseline">
+                                                        <?php
+                                                        if($segment) {
+                                                            include resource_path('views/app/patient/segment-templates/_child_review/edit-review-optimized-flat.php');
+                                                        }
+                                                        ?>
+                                                        <a class="mr-2 view-review-log text-sm on-hover-opaque text-dark"
+                                                           native target="_blank"
+                                                           open-in-stag-popup
+                                                           popup-style="stag-popup-md"
+                                                           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>
+                                                    </div>
+                                                @endif
                                                 <?php
                                                 $point = $problem;
                                                 include resource_path('views/app/patient/segment-templates/_child_review/last-review-optimized-flat.php');
                                                 ?>
                                             </div>
-                                            @if(!@$summaryView)
-                                                <div class="d-flex align-items-baseline ml-3">
-                                                    <?php
-                                                    if($segment) {
-                                                        include resource_path('views/app/patient/segment-templates/_child_review/edit-review-optimized-flat.php');
-                                                    }
-                                                    ?>
-                                                    <a class="mr-2 view-review-log text-sm"
-                                                       native target="_blank"
-                                                       open-in-stag-popup
-                                                       popup-style="stag-popup-md"
-                                                       title="Subjective log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
-                                                       href="/point/review-log/<?= $problem->uid ?>?popupmode=1">
-                                                        Log
-                                                    </a>
-                                                </div>
-                                            @endif
                                         </div>
                                     </div>
                                     <div if-edit-mode>
@@ -273,28 +273,28 @@ if(!@$summaryView) {
                                     <div if-read-mode>
                                         <div class="">
                                             <div class="flex-grow-1">
-                                                <span class="on-hover-opaque font-weight-bold mr-2">Plan</span>
+                                                <span class="on-hover-opaque font-weight-bold mr-2 c-pointer upsert-rp-trigger font-underline">Plan</span>
+                                                @if(!@$summaryView)
+                                                    <div class="d-inline-flex align-items-baseline">
+                                                        <?php
+                                                        if($segment) {
+                                                            include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan-optimized-flat.php');
+                                                        }
+                                                        ?>
+                                                        <a class="mr-2 view-review-log text-sm on-hover-opaque text-dark"
+                                                           native target="_blank"
+                                                           open-in-stag-popup
+                                                           popup-style="stag-popup-md"
+                                                           title="Plan log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
+                                                           href="/point/plan-log/<?= $problem->uid ?>?popupmode=1">
+                                                            <i class="fa fa-history"></i>
+                                                        </a>
+                                                    </div>
+                                                @endif
                                                 <?php
                                                 include resource_path('views/app/patient/segment-templates/_child_plan/last-plan-optimized-flat.php');
                                                 ?>
                                             </div>
-                                            @if(!@$summaryView)
-                                                <div class="d-flex align-items-baseline ml-3">
-                                                    <?php
-                                                    if($segment) {
-                                                        include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan-optimized-flat.php');
-                                                    }
-                                                    ?>
-                                                    <a class="mr-2 view-review-log text-sm"
-                                                       native target="_blank"
-                                                       open-in-stag-popup
-                                                       popup-style="stag-popup-md"
-                                                       title="Plan log<?= !!@($problem->data->name) ? ' for ' . @($problem->data->name) : '' ?>"
-                                                       href="/point/plan-log/<?= $problem->uid ?>?popupmode=1">
-                                                        Log
-                                                    </a>
-                                                </div>
-                                            @endif
                                         </div>
                                     </div>
                                     <div if-edit-mode>

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

@@ -27,8 +27,8 @@ else {
 }
 ?>
 <div visit-moe large class="d-inline">
-    <a start show href="#" class="mr-2 text-sm text-center" title="<?= !empty($currentValue) ? 'Edit Plan' : 'Add Plan'?>">
-        <?= !empty($currentValue) ? 'Edit' : 'Add'?>
+    <a start show href="#" class="text-sm text-center on-hover-opaque text-dark" title="<?= !empty($currentValue) ? 'Edit Plan' : 'Add Plan'?>">
+        <i class="d-none fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <form url="/api/visitPoint/upsertChildPlan" class="mcp-theme-1">
         <input type="hidden" name="uid" value="<?= $point->uid ?>">
@@ -59,8 +59,8 @@ else {
 </div>
 <?php if(!empty($currentValue)): ?>
     <div visit-moe relative class="d-inline">
-        <a start show href="#" class="mr-2 text-sm text-center" title="Delete Plan">
-            Undo
+        <a start show href="#" class="mr-2 text-sm text-center on-hover-opaque" title="Delete Plan">
+            <i class="fa fa-trash-alt text-dark"></i>
         </a>
         <form url="/api/visitPoint/destroyCurrentChildPlan" class="mcp-theme-1">
             <input type="hidden" name="uid" value="<?= $point->uid ?>">

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

@@ -31,8 +31,8 @@ else {
 }
 ?>
 <div visit-moe large relative class="d-inline">
-    <a start show href="#" class="mr-2 text-sm text-center" title="<?= !empty($currentValue) ? 'Edit Subjective' : 'Add Subjective'?>">
-        <?= !empty($currentValue) ? 'Edit' : 'Add'?>
+    <a start show href="#" class="text-sm text-center text-dark on-hover-opaque" title="<?= !empty($currentValue) ? 'Edit Subjective' : 'Add Subjective'?>">
+        <i class="d-none fa <?= !empty($currentValue) ? 'fa-pencil-alt' : 'fa-plus-square'?>"></i>
     </a>
     <form url="/api/visitPoint/upsertChildReview" class="mcp-theme-1">
         <input type="hidden" name="uid" value="<?= $point->uid ?>">
@@ -63,8 +63,8 @@ else {
 </div>
 <?php if(!empty($currentValue)): ?>
     <div visit-moe relative class="d-inline">
-        <a start show href="#" class="mr-2 text-sm text-center" title="Undo Changes">
-            Undo
+        <a start show href="#" class="mr-2 text-sm text-center on-hover-opaque" title="Undo Changes">
+            <i class="fa fa-trash-alt text-dark"></i>
         </a>
         <form url="/api/visitPoint/destroyCurrentChildReview" class="mcp-theme-1">
             <input type="hidden" name="uid" value="<?= $point->uid ?>">

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

@@ -984,3 +984,14 @@ parentSegment
                 .trigger('click');
         return false;
     });
+
+parentSegment
+    .off('click.upsert-rp-trigger', '.point-table [if-read-mode] .upsert-rp-trigger')
+    .on('click.upsert-rp-trigger', '.point-table [if-read-mode] .upsert-rp-trigger', function() {
+        let trigger = $(this).closest('[if-read-mode]')
+            .find('form[url="/api/visitPoint/upsertChildReview"], form[url="/api/visitPoint/upsertChildPlan"]')
+            .first().closest('[moe], [visit-moe]')
+            .find('a[start][show]')
+            .trigger('click');
+        return false;
+    });