Wizards - add/edit - review (left), plan (right) UI update

public/css/style.css

@@ -231,6 +231,9 @@ body>nav.navbar {
 [moe][wide] form, [moe][wide] [url] {
     width: 550px;
 }
+[moe][huge] form, [moe][huge] [url] {
+    width: 750px;
+}
 [moe][bottom] form {
     bottom: 100%;
 }

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

@@ -168,7 +168,7 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                     </div>
                 </td>
                 <td>
-                    <div moe wide relative>
+                    <div moe huge relative>
                         <a start show href="#" title="Edit">Edit</a>
                         <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-allergy" right>
                             <input type="hidden" name="uid" value="<?= $allergy->uid ?>">
@@ -231,7 +231,7 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                     <input type="hidden" name="isRemovedDueToEntryError" value="0">
 
                     <div class="row">
-                        <div class="col-7">
+                        <div class="col-8">
                             <p class="mb-2"><b>Add Allergy</b></p>
                             <div class="mb-2">
                                 <label class="text-sm mb-0">Name</label>
@@ -245,7 +245,7 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                             @include('app.patient.wizard-partials.common-fields', ['label' => 'allergy', 'addVerbPT' => 'Diagnosed'])
 
                         </div>
-                        <div class="col-5 border-left">
+                        <div class="col-4 border-left">
                             <div class="fdb-allergy-vigilance max-height-400px overflow-auto">
 
                             </div>

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

@@ -167,7 +167,7 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                     </div>
                 </td>
                 <td>
-                    <div moe wide relative>
+                    <div moe huge relative>
                         <a start show href="#" title="Edit">Edit</a>
                         <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-goal" right>
                             <input type="hidden" name="uid" value="<?= $goal->uid ?>">
@@ -297,7 +297,7 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                     <p class="mb-2"><b>Add Goal</b></p>
 
                     <div class="row">
-                        <div class="col-7">
+                        <div class="col-9">
                             <div class="row mb-2">
                                 <div class="col-12">
 
@@ -385,7 +385,7 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                             @include('app.patient.wizard-partials.common-fields', ['label' => 'goal'])
 
                         </div>
-                        <div class="col-5 border-left">
+                        <div class="col-3 border-left">
 
                         </div>
                     </div>

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

@@ -168,7 +168,7 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                     </div>
                 </td>
                 <td>
-                    <div moe wide relative>
+                    <div moe huge relative>
                         <a start show href="#" title="Edit">Edit</a>
                         <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-medication" right>
                             <input type="hidden" name="uid" value="<?= $medication->uid ?>">
@@ -237,7 +237,7 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                     <input type="hidden" name="isRemovedDueToEntryError" value="0">
 
                     <div class="row">
-                        <div class="col-7">
+                        <div class="col-8">
                             <p class="mb-2"><b>Add Medication</b></p>
                             <div class="mb-2">
                                 <label class="mb-0">Name</label>
@@ -254,7 +254,7 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                             @include('app.patient.wizard-partials.common-fields', ['label' => 'medication', 'addVerbPT' => 'Prescribed'])
 
                         </div>
-                        <div class="col-5 border-left">
+                        <div class="col-4 border-left">
                             <div class="fdb-rx-vigilance max-height-400px overflow-auto">
 
                             </div>

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

@@ -185,7 +185,7 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                     </div>
                 </td>
                 <td>
-                    <div moe wide relative>
+                    <div moe huge relative>
                         <a start show href="#" title="Edit">Edit</a>
                         <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-problem" right>
                             <input type="hidden" name="uid" value="<?= $problem->uid ?>">
@@ -259,7 +259,7 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                     <input type="hidden" name="isRemovedDueToEntryError" value="0">
 
                     <div class="row">
-                        <div class="col-7">
+                        <div class="col-8">
                             <p class="mb-2"><b>Add Problem</b></p>
                             <div class="row mb-2">
                                 <div class="col-8 pr-0">
@@ -287,7 +287,7 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                             @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'reviewLabel' => 'HPI', 'addVerbPT' => 'Diagnosed'])
 
                         </div>
-                        <div class="col-5 border-left">
+                        <div class="col-4 border-left">
                             <div class="fdb-dx-vigilance max-height-400px overflow-auto">
 
                             </div>

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

@@ -121,98 +121,99 @@
     <div if-active-or-not-active class="d-none">
 
     @if($patient->core_note_id !== $note->id)
-        <?php
-        $currentValue = '';
-        $previousValue = '';
-        $previousChildReview = null;
-        if (@$point) {
-            if ($point->lastChildReview && $point->last_child_review_point_scoped_note_id === $note->id) {
-                $parsedReview = json_decode($point->lastChildReview->data);
-                if (@$parsedReview->value) {
-                    $currentValue = $parsedReview->value;
-                    $previousChildReview = \App\Models\Point::where('id', '<', $point->lastChildReview->id)
-                        ->where('category', 'REVIEW')
-                        ->where('parent_point_id', $point->id)
-                        ->orderBy('id', 'DESC')
-                        ->first();
-                    if ($previousChildReview && $previousChildReview->data) {
-                        $parsedReview = json_decode($previousChildReview->data);
-                        $previousValue = $parsedReview->value;
-                    }
-                }
-            } else {
-                $previousChildReview = \App\Models\Point::where('parent_point_id', $point->id)
-                    ->where('category', 'REVIEW')
-                    ->orderBy('id', 'DESC')
-                    ->first();
-                if ($previousChildReview && $previousChildReview->data) {
-                    $parsedReview = json_decode($previousChildReview->data);
-                    if (@$parsedReview->value) {
-                        $previousValue = $parsedReview->value;
+        <div class="row mb-2">
+            <div class="col-6 pr-0">
+                <?php
+                $currentValue = '';
+                $previousValue = '';
+                $previousChildReview = null;
+                if (@$point) {
+                    if ($point->lastChildReview && $point->last_child_review_point_scoped_note_id === $note->id) {
+                        $parsedReview = json_decode($point->lastChildReview->data);
+                        if (@$parsedReview->value) {
+                            $currentValue = $parsedReview->value;
+                            $previousChildReview = \App\Models\Point::where('id', '<', $point->lastChildReview->id)
+                                ->where('category', 'REVIEW')
+                                ->where('parent_point_id', $point->id)
+                                ->orderBy('id', 'DESC')
+                                ->first();
+                            if ($previousChildReview && $previousChildReview->data) {
+                                $parsedReview = json_decode($previousChildReview->data);
+                                $previousValue = $parsedReview->value;
+                            }
+                        }
+                    } else {
+                        $previousChildReview = \App\Models\Point::where('parent_point_id', $point->id)
+                            ->where('category', 'REVIEW')
+                            ->orderBy('id', 'DESC')
+                            ->first();
+                        if ($previousChildReview && $previousChildReview->data) {
+                            $parsedReview = json_decode($previousChildReview->data);
+                            if (@$parsedReview->value) {
+                                $previousValue = $parsedReview->value;
+                            }
+                        }
                     }
                 }
-            }
-        }
-        ?>
-        <div class="mb-2">
-            <label class="text-sm mb-1">{{@$reviewLabel ? $reviewLabel : 'Review'}}</label>
-            <?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>
+                ?>
+                <label class="text-sm mb-1">{{@$reviewLabel ? $reviewLabel : 'Review'}}</label>
+                <div note-rte
+                     class="form-group mb-2 border-left border-right rte-holder bg-white"
+                     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>
+                    </div>
+                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
-                <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                <div class="d-none disallow-if-review-same-as" compare-width="reviewValue"><?= str_compact($previousValue) ?></div>
+                <?php endif; ?>
             </div>
-            <div class="d-none disallow-if-review-same-as" compare-width="reviewValue"><?= str_compact($previousValue) ?></div>
-            <?php endif; ?>
-            <div note-rte
-                 class="form-group mb-2 border-left border-right rte-holder bg-white"
-                 data-field-name="reviewValue"><?= $currentValue ?></div>
-        </div>
-
-        <?php
-        $currentValue = '';
-        $previousValue = '';
-        $previousChildPlan = null;
-        if (@$point) {
-            if ($point->lastChildPlan && $point->last_child_plan_point_scoped_note_id === $note->id) {
-                $parsedPlan = json_decode($point->lastChildPlan->data);
-                $currentValue = $parsedPlan->value;
-                $previousChildPlan = \App\Models\Point::where('id', '<', $point->lastChildPlan->id)
-                    ->where('category', 'PLAN')
-                    ->where('parent_point_id', $point->id)
-                    ->orderBy('id', 'DESC')
-                    ->first();
-                if ($previousChildPlan && $previousChildPlan->data) {
-                    $parsedPlan = json_decode($previousChildPlan->data);
-                    $previousValue = $parsedPlan->value;
-                }
-            } else {
-                $previousChildPlan = \App\Models\Point::where('parent_point_id', $point->id)
-                    ->where('category', 'PLAN')
-                    ->orderBy('id', 'DESC')
-                    ->first();
-                if ($previousChildPlan && $previousChildPlan->data) {
-                    $parsedPlan = json_decode($previousChildPlan->data);
-                    $previousValue = $parsedPlan->value;
+            <div class="col-6">
+                <?php
+                $currentValue = '';
+                $previousValue = '';
+                $previousChildPlan = null;
+                if (@$point) {
+                    if ($point->lastChildPlan && $point->last_child_plan_point_scoped_note_id === $note->id) {
+                        $parsedPlan = json_decode($point->lastChildPlan->data);
+                        $currentValue = $parsedPlan->value;
+                        $previousChildPlan = \App\Models\Point::where('id', '<', $point->lastChildPlan->id)
+                            ->where('category', 'PLAN')
+                            ->where('parent_point_id', $point->id)
+                            ->orderBy('id', 'DESC')
+                            ->first();
+                        if ($previousChildPlan && $previousChildPlan->data) {
+                            $parsedPlan = json_decode($previousChildPlan->data);
+                            $previousValue = $parsedPlan->value;
+                        }
+                    } else {
+                        $previousChildPlan = \App\Models\Point::where('parent_point_id', $point->id)
+                            ->where('category', 'PLAN')
+                            ->orderBy('id', 'DESC')
+                            ->first();
+                        if ($previousChildPlan && $previousChildPlan->data) {
+                            $parsedPlan = json_decode($previousChildPlan->data);
+                            $previousValue = $parsedPlan->value;
+                        }
+                    }
                 }
-            }
-        }
-        ?>
-        <div class="mb-2">
-            <label class="text-sm mb-1">Plan</label>
-            <?php if($previousValue): ?>
-            <div class="mb-2">
-                <div class="d-flex align-items-baseline mb-1">
-                    <span class="text-sm text-secondary">Previous Plan / <?= friendlier_date($previousChildPlan->created_at) ?>) (click to copy)</span>
+                ?>
+                <label class="text-sm mb-1">Plan</label>
+                <div note-rte
+                     class="form-group mb-2 border-left border-right rte-holder bg-white"
+                     data-field-name="planValue"><?= $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 Plan / <?= friendlier_date($previousChildPlan->created_at) ?> (click to copy)</span>
+                    </div>
+                    <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
                 </div>
-                <div class="p-2 bg-light border inline-html-container click-to-copy"><?= $previousValue ?></div>
+                <div class="d-none disallow-if-plan-same-as" compare-width="planValue"><?= str_compact($previousValue) ?></div>
+                <?php endif; ?>
             </div>
-            <div class="d-none disallow-if-plan-same-as" compare-width="planValue"><?= str_compact($previousValue) ?></div>
-            <?php endif; ?>
-            <div note-rte
-                 class="form-group mb-2 border-left border-right rte-holder bg-white"
-                 data-field-name="planValue"><?= $currentValue ?></div>
         </div>
     @endif