Wizards - move "edit" column to the end

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

@@ -23,11 +23,11 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
                 <th class="border-bottom-0 text-secondary w-25">Review</th>
                 <th class="border-bottom-0 text-secondary w-25">Plan</th>
+                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -104,53 +104,6 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                         <b>YES</b>
                     @endif
                 </td>
-                <td>
-                    <div moe wide>
-                        <a start show href="#" title="Edit">Edit</a>
-                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-allergy">
-                            <input type="hidden" name="uid" value="<?= $allergy->uid ?>">
-                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                            <p class="mb-2"><b>Update Allergy</b></p>
-
-                            <input type="hidden" name="data" value='{{json_encode($allergy->data)}}'>
-
-                            @if($allergy->added_in_note_id === $note->id)
-
-                                <input type="hidden" data-name="damConceptId" value="{{@$allergy->data->damConceptId}}">
-                                <input type="hidden" data-name="damConceptIdType" value="{{@$allergy->data->damConceptIdType}}">
-
-                                <div class="mb-2">
-                                    <label class="text-sm mb-0">Name</label>
-                                    <input type="text" data-name="name" class="form-control form-control-sm"
-                                           value="{{@$allergy->data->name}}"
-                                           stag-suggest
-                                           stag-suggest-ep="/fdb-allergy-suggest/json">
-                                </div>
-
-                            @else
-
-                                <div class="mb-2 bg-light p-2 border">
-                                    <p class="mb-1 font-weight-bold">
-                                        {{ @$allergy->data->name }}
-                                    </p>
-                                    @if($patient->core_note_id !== $note->id)
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the allergy was added prior to this visit.</div>
-                                    @else
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the allergy was added on a previous visit.</div>
-                                    @endif
-                                </div>
-
-                            @endif
-
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'allergy', 'point' => $allergy, 'addVerbPT' => 'Diagnosed'])
-
-                            <div class="mt-3 pt-2 d-flex align-items-center border-top">
-                                <button type="submit" class="btn-save-allergy btn btn-sm btn-primary mr-2">Save</button>
-                                <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                </td>
                 <td>
                     <?= !!@($allergy->data->start_date) ? friendly_date($allergy->data->start_date) : '-' ?>
                     @if(!!@($allergy->data->prescriber))
@@ -214,6 +167,53 @@ $allergies = Point::getPointsOfCategoryExtended($patient, 'ALLERGY', $note);
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe wide 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 ?>">
+                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+                            <p class="mb-2"><b>Update Allergy</b></p>
+
+                            <input type="hidden" name="data" value='{{json_encode($allergy->data)}}'>
+
+                            @if($allergy->added_in_note_id === $note->id)
+
+                                <input type="hidden" data-name="damConceptId" value="{{@$allergy->data->damConceptId}}">
+                                <input type="hidden" data-name="damConceptIdType" value="{{@$allergy->data->damConceptIdType}}">
+
+                                <div class="mb-2">
+                                    <label class="text-sm mb-0">Name</label>
+                                    <input type="text" data-name="name" class="form-control form-control-sm"
+                                           value="{{@$allergy->data->name}}"
+                                           stag-suggest
+                                           stag-suggest-ep="/fdb-allergy-suggest/json">
+                                </div>
+
+                            @else
+
+                                <div class="mb-2 bg-light p-2 border">
+                                    <p class="mb-1 font-weight-bold">
+                                        {{ @$allergy->data->name }}
+                                    </p>
+                                    @if($patient->core_note_id !== $note->id)
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the allergy was added prior to this visit.</div>
+                                    @else
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the allergy was added on a previous visit.</div>
+                                    @endif
+                                </div>
+
+                            @endif
+
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'allergy', 'point' => $allergy, 'addVerbPT' => 'Diagnosed'])
+
+                            <div class="mt-3 pt-2 d-flex align-items-center border-top">
+                                <button type="submit" class="btn-save-allergy btn btn-sm btn-primary mr-2">Save</button>
+                                <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </td>
             </tr>
             <?php endforeach; ?>
         </table>

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

@@ -23,11 +23,11 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                 <th class="border-bottom-0 text-secondary">Goal</th>
                 <th class="border-bottom-0 text-secondary">Category</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
                 <th class="border-bottom-0 text-secondary w-25">Review</th>
                 <th class="border-bottom-0 text-secondary w-25">Plan</th>
+                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -108,9 +108,72 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                     @endif
                 </td>
                 <td>
-                    <div moe wide>
+                    <?= !!@($goal->data->start_date) ? friendly_date($goal->data->start_date) : '-' ?>
+                    @if(!!@($goal->data->prescriber))
+                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->data->prescriber) ? @($goal->data->prescriber) : '-' ?></div>
+                    @endif
+                </td>
+                <td>
+                    <?= !!@($goal->removal_effective_date) ? friendly_date($goal->removal_effective_date) : '-' ?>
+                    @if(!!@($goal->removal_reason_memo))
+                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->removal_reason_memo) ? @($goal->removal_reason_memo) : '-' ?></div>
+                    @endif
+                </td>
+                <td>
+                    <div class="d-flex align-items-start">
+                        <div class="flex-grow-1">
+                            <?php
+                            $point = $goal;
+                            include resource_path('views/app/patient/segment-templates/_child_review/last-review.php');
+                            ?>
+                        </div>
+                        <div class="d-inline-flex flex-nowrap">
+                            <a class="pl-2 view-review-log"
+                               native target="_blank"
+                               open-in-stag-popup
+                               popup-style="stag-popup-md"
+                               title="Review log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
+                               href="/point/review-log/<?= $goal->uid ?>?popupmode=1">
+                                <i class="fa fa-history"></i>
+                            </a>
+                            <?php
+                            /*$segment = $note->getSegmentByInternalName('intake_goals');
+                            if($segment) {
+                                include resource_path('views/app/patient/segment-templates/_child_review/edit-review.php');
+                            }*/
+                            ?>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <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');
+                            ?>
+                        </div>
+                        <div class="d-inline-flex flex-nowrap">
+                            <a class="pl-2 view-review-log"
+                               native target="_blank"
+                               open-in-stag-popup
+                               popup-style="stag-popup-md"
+                               title="Plan log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
+                               href="/point/plan-log/<?= $goal->uid ?>?popupmode=1">
+                                <i class="fa fa-history"></i>
+                            </a>
+                            <?php
+                            /*$segment = $note->getSegmentByInternalName('plan_goals');
+                            if($segment) {
+                                include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan.php');
+                            }*/
+                            ?>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div moe wide relative>
                         <a start show href="#" title="Edit">Edit</a>
-                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-goal">
+                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-goal" right>
                             <input type="hidden" name="uid" value="<?= $goal->uid ?>">
                             <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
                             <p class="mb-2"><b>Update Goal</b></p>
@@ -222,69 +285,6 @@ $goals = Point::getPointsOfCategoryExtended($patient, 'GOAL', $note);
                         </form>
                     </div>
                 </td>
-                <td>
-                    <?= !!@($goal->data->start_date) ? friendly_date($goal->data->start_date) : '-' ?>
-                    @if(!!@($goal->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->data->prescriber) ? @($goal->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($goal->removal_effective_date) ? friendly_date($goal->removal_effective_date) : '-' ?>
-                    @if(!!@($goal->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->removal_reason_memo) ? @($goal->removal_reason_memo) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <div class="d-flex align-items-start">
-                        <div class="flex-grow-1">
-                            <?php
-                            $point = $goal;
-                            include resource_path('views/app/patient/segment-templates/_child_review/last-review.php');
-                            ?>
-                        </div>
-                        <div class="d-inline-flex flex-nowrap">
-                            <a class="pl-2 view-review-log"
-                               native target="_blank"
-                               open-in-stag-popup
-                               popup-style="stag-popup-md"
-                               title="Review log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
-                               href="/point/review-log/<?= $goal->uid ?>?popupmode=1">
-                                <i class="fa fa-history"></i>
-                            </a>
-                            <?php
-                            /*$segment = $note->getSegmentByInternalName('intake_goals');
-                            if($segment) {
-                                include resource_path('views/app/patient/segment-templates/_child_review/edit-review.php');
-                            }*/
-                            ?>
-                        </div>
-                    </div>
-                </td>
-                <td>
-                    <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');
-                            ?>
-                        </div>
-                        <div class="d-inline-flex flex-nowrap">
-                            <a class="pl-2 view-review-log"
-                               native target="_blank"
-                               open-in-stag-popup
-                               popup-style="stag-popup-md"
-                               title="Plan log<?= !!@($goal->data->goal) ? ' for ' . @($goal->data->goal) : '' ?>"
-                               href="/point/plan-log/<?= $goal->uid ?>?popupmode=1">
-                                <i class="fa fa-history"></i>
-                            </a>
-                            <?php
-                            /*$segment = $note->getSegmentByInternalName('plan_goals');
-                            if($segment) {
-                                include resource_path('views/app/patient/segment-templates/_child_plan/edit-plan.php');
-                            }*/
-                            ?>
-                        </div>
-                    </div>
-                </td>
             </tr>
             <?php endforeach; ?>
         </table>

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

@@ -24,10 +24,10 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                 <th class="border-bottom-0 text-secondary">Name</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">Edit</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
                 <th class="border-bottom-0 text-secondary w-25">Review</th>
+                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -130,9 +130,47 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                     @endif
                 </td>
                 <td>
-                    <div moe wide>
+                    <?= !!@($medication->data->start_date) ? friendly_date($medication->data->start_date) : '-' ?>
+                    @if(!!@($medication->data->prescriber))
+                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->data->prescriber) ? @($medication->data->prescriber) : '-' ?></div>
+                    @endif
+                </td>
+                <td>
+                    <?= !!@($medication->removal_effective_date) ? friendly_date($medication->removal_effective_date) : '-' ?>
+                    @if(!!@($medication->removal_reason_memo))
+                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->removal_reason_memo) ? @($medication->removal_reason_memo) : '-' ?></div>
+                    @endif
+                </td>
+                <td>
+                    <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');
+                            ?>
+                        </div>
+                        <div class="d-inline-flex flex-nowrap">
+                            <a class="pl-2 view-review-log"
+                               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">
+                                <i class="fa fa-history"></i>
+                            </a>
+                            <?php
+                            /*$segment = $note->getSegmentByInternalName('intake_medications');
+                            if($segment) {
+                                include resource_path('views/app/patient/segment-templates/_child_review/edit-review.php');
+                            }*/
+                            ?>
+                        </div>
+                    </div>
+                </td>
+                <td>
+                    <div moe wide relative>
                         <a start show href="#" title="Edit">Edit</a>
-                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-medication">
+                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-medication" right>
                             <input type="hidden" name="uid" value="<?= $medication->uid ?>">
                             <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
                             <p class="mb-2"><b>Update Medication</b></p>
@@ -179,44 +217,6 @@ $medications = Point::getPointsOfCategoryExtended($patient, 'MEDICATION', $note)
                         </form>
                     </div>
                 </td>
-                <td>
-                    <?= !!@($medication->data->start_date) ? friendly_date($medication->data->start_date) : '-' ?>
-                    @if(!!@($medication->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->data->prescriber) ? @($medication->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($medication->removal_effective_date) ? friendly_date($medication->removal_effective_date) : '-' ?>
-                    @if(!!@($medication->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->removal_reason_memo) ? @($medication->removal_reason_memo) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <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');
-                            ?>
-                        </div>
-                        <div class="d-inline-flex flex-nowrap">
-                            <a class="pl-2 view-review-log"
-                               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">
-                                <i class="fa fa-history"></i>
-                            </a>
-                            <?php
-                            /*$segment = $note->getSegmentByInternalName('intake_medications');
-                            if($segment) {
-                                include resource_path('views/app/patient/segment-templates/_child_review/edit-review.php');
-                            }*/
-                            ?>
-                        </div>
-                    </div>
-                </td>
             </tr>
             <?php endforeach; ?>
         </table>

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

@@ -35,11 +35,11 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
                 <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
                 <th class="border-bottom-0 text-secondary">Started</th>
                 <th class="border-bottom-0 text-secondary">Ended</th>
                 <th class="border-bottom-0 text-secondary w-25">HPI</th>
                 <th class="border-bottom-0 text-secondary w-25">Plan</th>
+                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -116,64 +116,6 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                         <b>YES</b>
                     @endif
                 </td>
-                <td>
-                    <div moe wide>
-                        <a start show href="#" title="Edit">Edit</a>
-                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-problem">
-                            <input type="hidden" name="uid" value="<?= $problem->uid ?>">
-                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                            <p class="mb-2"><b>Update Problem</b></p>
-
-                            <input type="hidden" name="data" value='{{json_encode($problem->data)}}'>
-
-                            @if($problem->added_in_note_id === $note->id)
-
-                                <input type="hidden" data-name="dxid" value="{{@$problem->data->dxid}}">
-                                <input type="hidden" data-name="icd-type" value="{{@$problem->data->{'icd-type'} }}">
-
-                                <div class="mb-2">
-                                    <label class="text-sm text-secondary mb-1">Problem</label>
-                                    <input type="text" class="form-control form-control-sm min-width-unset"
-                                           data-name="name"
-                                           value="{{@$problem->data->name}}"
-                                           stag-suggest
-                                           stag-suggest-ep="/fdb-dx-suggest/json">
-                                </div>
-
-                                <div class="mb-2">
-                                    <label class="text-sm text-secondary mb-0">ICD</label>
-                                    <input type="text"
-                                           data-name="icd"
-                                           data-option-list
-                                           class="form-control form-control-sm"
-                                           value="{{@$problem->data->icd}}">
-                                    <div class="data-option-list"></div>
-                                </div>
-
-                            @else
-
-                                <div class="mb-2 bg-light p-2 border">
-                                    <p class="mb-1 font-weight-bold">
-                                        {{ @$problem->data->name }}
-                                    </p>
-                                    @if($patient->core_note_id !== $note->id)
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the problem was added prior to this visit.</div>
-                                    @else
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the problem was added on a previous visit.</div>
-                                    @endif
-                                </div>
-
-                            @endif
-
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'point' => $problem, 'reviewLabel' => 'HPI', '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>
-                                <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                </td>
                 <td>
                     <?= !!@($problem->data->start_date) ? friendly_date($problem->data->start_date) : '-' ?>
                     @if(!!@($problem->data->prescriber))
@@ -237,6 +179,64 @@ $ccSegment = $note->getSegmentByInternalName('chief_complaint');
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe wide 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 ?>">
+                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+                            <p class="mb-2"><b>Update Problem</b></p>
+
+                            <input type="hidden" name="data" value='{{json_encode($problem->data)}}'>
+
+                            @if($problem->added_in_note_id === $note->id)
+
+                                <input type="hidden" data-name="dxid" value="{{@$problem->data->dxid}}">
+                                <input type="hidden" data-name="icd-type" value="{{@$problem->data->{'icd-type'} }}">
+
+                                <div class="mb-2">
+                                    <label class="text-sm text-secondary mb-1">Problem</label>
+                                    <input type="text" class="form-control form-control-sm min-width-unset"
+                                           data-name="name"
+                                           value="{{@$problem->data->name}}"
+                                           stag-suggest
+                                           stag-suggest-ep="/fdb-dx-suggest/json">
+                                </div>
+
+                                <div class="mb-2">
+                                    <label class="text-sm text-secondary mb-0">ICD</label>
+                                    <input type="text"
+                                           data-name="icd"
+                                           data-option-list
+                                           class="form-control form-control-sm"
+                                           value="{{@$problem->data->icd}}">
+                                    <div class="data-option-list"></div>
+                                </div>
+
+                            @else
+
+                                <div class="mb-2 bg-light p-2 border">
+                                    <p class="mb-1 font-weight-bold">
+                                        {{ @$problem->data->name }}
+                                    </p>
+                                    @if($patient->core_note_id !== $note->id)
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the problem was added prior to this visit.</div>
+                                    @else
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the problem was added on a previous visit.</div>
+                                    @endif
+                                </div>
+
+                            @endif
+
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'problem', 'point' => $problem, 'reviewLabel' => 'HPI', '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>
+                                <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </td>
             </tr>
             <?php endforeach; ?>
         </table>