Wiz - move "edit" to after name column

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

@@ -39,12 +39,12 @@ 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">Edit</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>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -68,6 +68,53 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe huge relative>
+                        <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 font-weight-bold">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>
                     <div class="d-flex align-items-start">
                         <div class="flex-grow-1">
@@ -138,53 +185,6 @@ list($allergies, $counts) = Point::getPointsOfCategoryExtended($patient, 'ALLERG
                         <div class="mt-1 text-sm text-secondary"><?= !!@($allergy->removal_reason_memo) ? @($allergy->removal_reason_memo) : '-' ?></div>
                     @endif
                 </td>
-                <td>
-                    <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 ?>">
-                            <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 font-weight-bold">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/careteam-center.blade.php

@@ -21,12 +21,12 @@ 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">Edit</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>
                 <th class="border-bottom-0 text-secondary">Ended</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -50,6 +50,80 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe huge relative>
+                        <a start show href="#" title="Edit">Edit</a>
+                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-care-team-member">
+                            <input type="hidden" name="uid" value="<?= $careTeamMember->uid ?>">
+                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+                            <p class="mb-2"><b>Update Care Team Member</b></p>
+
+                            <input type="hidden" name="data" value='{{json_encode($careTeamMember->data)}}'>
+
+                            @if($careTeamMember->added_in_note_id === $note->id)
+
+                                <div class="row mb-2">
+                                    <div class="col-6 pr-0">
+                                        <label class="text-sm mb-1 font-weight-bold">Name</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="name"
+                                               value="{{@$careTeamMember->data->name}}">
+                                    </div>
+                                    <div class="col-6">
+                                        <label class="text-sm mb-1 font-weight-bold">Specialty</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="specialty"
+                                               value="{{@$careTeamMember->data->specialty}}">
+                                    </div>
+                                </div>
+
+                                <div class="row mb-2">
+                                    <div class="col-6 pr-0">
+                                        <label class="text-sm mb-1 font-weight-bold">Organization</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="organization"
+                                               value="{{@$careTeamMember->data->organization}}">
+                                    </div>
+                                    <div class="col-3 pr-0">
+                                        <label class="text-sm mb-1 font-weight-bold">Phone</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="phone"
+                                               value="{{@$careTeamMember->data->phone}}">
+                                    </div>
+                                    <div class="col-3">
+                                        <label class="text-sm mb-1 font-weight-bold">Fax</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="fax"
+                                               value="{{@$careTeamMember->data->fax}}">
+                                    </div>
+                                </div>
+
+                            @else
+
+                                <div class="mb-2 bg-light p-2 border">
+                                    <p class="mb-1 font-weight-bold">
+                                        {{ @$careTeamMember->data->name }}
+                                        {{ @$careTeamMember->data->specialty }}
+                                        {{ @$careTeamMember->data->organization }}
+                                    </p>
+                                    @if($patient->core_note_id !== $note->id)
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the care team member was added prior to this visit.</div>
+                                    @else
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the care team member was added on a previous visit.</div>
+                                    @endif
+                                </div>
+
+                            @endif
+
+                            @include('app.patient.wizard-partials.common-fields', ['label' => 'care-team-member', 'point' => $careTeamMember])
+
+                            <div class="mt-3 pt-2 d-flex align-items-center border-top">
+                                <button type="submit" class="btn-save-care-team-member 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>
                     <div class="d-flex align-items-start">
                         <div class="flex-grow-1">
@@ -128,80 +202,6 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                         <div class="mt-1 text-sm text-secondary">By: <?= !!@($careTeamMember->removal_reason_memo) ? @($careTeamMember->removal_reason_memo) : '-' ?></div>
                     @endif
                 </td>
-                <td>
-                    <div moe huge relative>
-                        <a start show href="#" title="Edit">Edit</a>
-                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-care-team-member" right>
-                            <input type="hidden" name="uid" value="<?= $careTeamMember->uid ?>">
-                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                            <p class="mb-2"><b>Update Care Team Member</b></p>
-
-                            <input type="hidden" name="data" value='{{json_encode($careTeamMember->data)}}'>
-
-                            @if($careTeamMember->added_in_note_id === $note->id)
-
-                                <div class="row mb-2">
-                                    <div class="col-6 pr-0">
-                                        <label class="text-sm mb-1 font-weight-bold">Name</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="name"
-                                               value="{{@$careTeamMember->data->name}}">
-                                    </div>
-                                    <div class="col-6">
-                                        <label class="text-sm mb-1 font-weight-bold">Specialty</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="specialty"
-                                               value="{{@$careTeamMember->data->specialty}}">
-                                    </div>
-                                </div>
-
-                                <div class="row mb-2">
-                                    <div class="col-6 pr-0">
-                                        <label class="text-sm mb-1 font-weight-bold">Organization</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="organization"
-                                               value="{{@$careTeamMember->data->organization}}">
-                                    </div>
-                                    <div class="col-3 pr-0">
-                                        <label class="text-sm mb-1 font-weight-bold">Phone</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="phone"
-                                               value="{{@$careTeamMember->data->phone}}">
-                                    </div>
-                                    <div class="col-3">
-                                        <label class="text-sm mb-1 font-weight-bold">Fax</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="fax"
-                                               value="{{@$careTeamMember->data->fax}}">
-                                    </div>
-                                </div>
-
-                            @else
-
-                                <div class="mb-2 bg-light p-2 border">
-                                    <p class="mb-1 font-weight-bold">
-                                        {{ @$careTeamMember->data->name }}
-                                        {{ @$careTeamMember->data->specialty }}
-                                        {{ @$careTeamMember->data->organization }}
-                                    </p>
-                                    @if($patient->core_note_id !== $note->id)
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the care team member was added prior to this visit.</div>
-                                    @else
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the care team member was added on a previous visit.</div>
-                                    @endif
-                                </div>
-
-                            @endif
-
-                            @include('app.patient.wizard-partials.common-fields', ['label' => 'care-team-member', 'point' => $careTeamMember])
-
-                            <div class="mt-3 pt-2 d-flex align-items-center border-top">
-                                <button type="submit" class="btn-save-care-team-member 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

@@ -21,12 +21,12 @@ 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">Edit</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>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -50,6 +50,49 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe huge relative>
+                        <a start show href="#" title="Edit">Edit</a>
+                        <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-goal">
+                            <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>
+
+                            <input type="hidden" name="data" value='{{json_encode($goal->data)}}'>
+
+                            @if($goal->added_in_note_id === $note->id)
+
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 font-weight-bold">Goal</label>
+                                    <input type="text" class="form-control form-control-sm min-width-unset"
+                                           data-name="goal"
+                                           value="{{@$goal->data->goal}}">
+                                </div>
+
+                            @else
+
+                                <div class="mb-2 bg-light p-2 border">
+                                    <p class="mb-1 font-weight-bold">
+                                        {{ @$goal->data->goal }}
+                                    </p>
+                                    @if($patient->core_note_id !== $note->id)
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the goal was added prior to this visit.</div>
+                                    @else
+                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the goal was added on a previous visit.</div>
+                                    @endif
+                                </div>
+
+                            @endif
+
+                            @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>
+                                <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </td>
                 <td>
                     <div class="d-flex align-items-start">
                         <div class="flex-grow-1">
@@ -120,49 +163,6 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                         <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->removal_reason_memo) ? @($goal->removal_reason_memo) : '-' ?></div>
                     @endif
                 </td>
-                <td>
-                    <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 ?>">
-                            <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                            <p class="mb-2"><b>Update Goal</b></p>
-
-                            <input type="hidden" name="data" value='{{json_encode($goal->data)}}'>
-
-                            @if($goal->added_in_note_id === $note->id)
-
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 font-weight-bold">Goal</label>
-                                    <input type="text" class="form-control form-control-sm min-width-unset"
-                                           data-name="goal"
-                                           value="{{@$goal->data->goal}}">
-                                </div>
-
-                            @else
-
-                                <div class="mb-2 bg-light p-2 border">
-                                    <p class="mb-1 font-weight-bold">
-                                        {{ @$goal->data->goal }}
-                                    </p>
-                                    @if($patient->core_note_id !== $note->id)
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the goal was added prior to this visit.</div>
-                                    @else
-                                        <div class="text-secondary text-sm">Clinical details cannot be modified since the goal was added on a previous visit.</div>
-                                    @endif
-                                </div>
-
-                            @endif
-
-                            @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>
-                                <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/medications-center.blade.php

@@ -34,12 +34,12 @@ 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">Edit</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>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -63,6 +63,56 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                             </div>
                         </div>
                     </td>
+                    <td>
+                        <div moe huge relative>
+                            <a start show href="#" title="Edit">Edit</a>
+                            <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-medication">
+                                <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>
+
+                                <input type="hidden" name="data" value='{{json_encode($medication->data)}}'>
+
+                                @if($medication->added_in_note_id === $note->id)
+
+                                    <input type="hidden" data-name="medId" value="{{@$medication->data->medId}}">
+                                    <input type="hidden" data-name="routedMedId" value="{{@$medication->data->routedMedId}}">
+                                    <input type="hidden" data-name="routedDosageFormMedId" value="{{@$medication->data->routedDosageFormMedId}}">
+                                    <input type="hidden" data-name="gcnSeqno" value="{{@$medication->data->gcnSeqno}}">
+
+                                    <div class="mb-2">
+                                        <label class="text-sm mb-1 font-weight-bold">Drug</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset prescription-medication"
+                                               data-name="name"
+                                               value="{{@$medication->data->name}}"
+                                               stag-suggest
+                                               stag-suggest-ep="/fdb-med-suggest-v2/json">
+                                    </div>
+
+                                @else
+
+                                    <div class="mb-2 bg-light p-2 border">
+                                        <p class="mb-1 font-weight-bold">
+                                            {{ @$medication->data->name }}
+                                        </p>
+                                        @if($patient->core_note_id !== $note->id)
+                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the medication was added prior to this visit.</div>
+                                        @else
+                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the medication was added on a previous visit.</div>
+                                        @endif
+                                    </div>
+
+                                @endif
+
+                                @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>
+                                    <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </td>
                     <td>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -133,56 +183,6 @@ list($medications, $counts) = Point::getPointsOfCategoryExtended($patient, 'MEDI
                             <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->removal_reason_memo) ? @($medication->removal_reason_memo) : '-' ?></div>
                         @endif
                     </td>
-                    <td>
-                        <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 ?>">
-                                <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                                <p class="mb-2"><b>Update Medication</b></p>
-
-                                <input type="hidden" name="data" value='{{json_encode($medication->data)}}'>
-
-                                @if($medication->added_in_note_id === $note->id)
-
-                                    <input type="hidden" data-name="medId" value="{{@$medication->data->medId}}">
-                                    <input type="hidden" data-name="routedMedId" value="{{@$medication->data->routedMedId}}">
-                                    <input type="hidden" data-name="routedDosageFormMedId" value="{{@$medication->data->routedDosageFormMedId}}">
-                                    <input type="hidden" data-name="gcnSeqno" value="{{@$medication->data->gcnSeqno}}">
-
-                                    <div class="mb-2">
-                                        <label class="text-sm mb-1 font-weight-bold">Drug</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset prescription-medication"
-                                               data-name="name"
-                                               value="{{@$medication->data->name}}"
-                                               stag-suggest
-                                               stag-suggest-ep="/fdb-med-suggest-v2/json">
-                                    </div>
-
-                                @else
-
-                                    <div class="mb-2 bg-light p-2 border">
-                                        <p class="mb-1 font-weight-bold">
-                                        {{ @$medication->data->name }}
-                                        </p>
-                                        @if($patient->core_note_id !== $note->id)
-                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the medication was added prior to this visit.</div>
-                                        @else
-                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the medication was added on a previous visit.</div>
-                                        @endif
-                                    </div>
-
-                                @endif
-
-                                @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>
-                                    <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/problems-center.blade.php

@@ -35,12 +35,12 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                 <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">Edit</th>
                 <th class="border-bottom-0 text-secondary w-25">Subjective/HPI</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>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -72,6 +72,65 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                         </div>
                     </div>
                 </td>
+                <td>
+                    <div moe huge relative>
+                        <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="row mb-2">
+                                    <div class="col-8 pr-0">
+                                        <label class="text-sm mb-0 font-weight-bold">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-v2/json"
+                                               stag-suggest-text-only>
+                                    </div>
+                                    <div class="col-4">
+                                        <label class="text-sm mb-0 font-weight-bold">ICD</label>
+                                        <input type="text"
+                                               data-name="icd"
+                                               class="form-control form-control-sm"
+                                               value="{{@$problem->data->icd}}"
+                                               readonly>
+                                    </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, 'addVerbPT' => 'Diagnosed', 'reviewLabel' => 'Subjective/HPI'])
+
+                            <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>
                     <div class="d-flex align-items-start">
                         <div class="flex-grow-1">
@@ -142,65 +201,6 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                         <div class="mt-1 text-sm text-secondary"><?= !!@($problem->removal_reason_memo) ? @($problem->removal_reason_memo) : '-' ?></div>
                     @endif
                 </td>
-                <td>
-                    <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 ?>">
-                            <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="row mb-2">
-                                    <div class="col-8 pr-0">
-                                        <label class="text-sm mb-0 font-weight-bold">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-v2/json"
-                                               stag-suggest-text-only>
-                                    </div>
-                                    <div class="col-4">
-                                        <label class="text-sm mb-0 font-weight-bold">ICD</label>
-                                        <input type="text"
-                                               data-name="icd"
-                                               class="form-control form-control-sm"
-                                               value="{{@$problem->data->icd}}"
-                                               readonly>
-                                    </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, 'addVerbPT' => 'Diagnosed', 'reviewLabel' => 'Subjective/HPI'])
-
-                            <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>

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

@@ -22,12 +22,12 @@ 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">Edit</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>
-                <th class="border-bottom-0 text-secondary">Edit</th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -51,6 +51,56 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                             </div>
                         </div>
                     </td>
+                    <td>
+                        <div moe huge relative>
+                            <a start show href="#" title="Edit">Edit</a>
+                            <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-supplement">
+                                <input type="hidden" name="uid" value="<?= $supplement->uid ?>">
+                                <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+                                <p class="mb-2"><b>Update Supplement</b></p>
+
+                                <input type="hidden" name="data" value='{{json_encode($supplement->data)}}'>
+
+                                @if($supplement->added_in_note_id === $note->id)
+
+                                    <input type="hidden" data-name="medId" value="{{@$supplement->data->medId}}">
+                                    <input type="hidden" data-name="routedMedId" value="{{@$supplement->data->routedMedId}}">
+                                    <input type="hidden" data-name="routedDosageFormMedId" value="{{@$supplement->data->routedDosageFormMedId}}">
+                                    <input type="hidden" data-name="gcnSeqno" value="{{@$supplement->data->gcnSeqno}}">
+
+                                    <div class="mb-2">
+                                        <label class="text-sm mb-1 font-weight-bold">Drug</label>
+                                        <input type="text" class="form-control form-control-sm min-width-unset"
+                                               data-name="name"
+                                               value="{{@$supplement->data->name}}"
+                                               stag-suggest
+                                               stag-suggest-ep="/fdb-med-suggest-v2/json">
+                                    </div>
+
+                                @else
+
+                                    <div class="mb-2 bg-light p-2 border">
+                                        <p class="mb-1 font-weight-bold">
+                                            {{ @$supplement->data->name }}
+                                        </p>
+                                        @if($patient->core_note_id !== $note->id)
+                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the supplement was added prior to this visit.</div>
+                                        @else
+                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the supplement was added on a previous visit.</div>
+                                        @endif
+                                    </div>
+
+                                @endif
+
+                                @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>
+                                    <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </td>
                     <td>
                         <div class="d-flex align-items-start">
                             <div class="flex-grow-1">
@@ -115,56 +165,6 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                             <div class="mt-1 text-sm text-secondary">By: <?= !!@($supplement->removal_reason_memo) ? @($supplement->removal_reason_memo) : '-' ?></div>
                         @endif
                     </td>
-                    <td>
-                        <div moe huge relative>
-                            <a start show href="#" title="Edit">Edit</a>
-                            <form url="/api/visitPoint/updateTopLevel" class="mcp-theme-1 frm-edit-supplement" right>
-                                <input type="hidden" name="uid" value="<?= $supplement->uid ?>">
-                                <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                                <p class="mb-2"><b>Update Supplement</b></p>
-
-                                <input type="hidden" name="data" value='{{json_encode($supplement->data)}}'>
-
-                                @if($supplement->added_in_note_id === $note->id)
-
-                                    <input type="hidden" data-name="medId" value="{{@$supplement->data->medId}}">
-                                    <input type="hidden" data-name="routedMedId" value="{{@$supplement->data->routedMedId}}">
-                                    <input type="hidden" data-name="routedDosageFormMedId" value="{{@$supplement->data->routedDosageFormMedId}}">
-                                    <input type="hidden" data-name="gcnSeqno" value="{{@$supplement->data->gcnSeqno}}">
-
-                                    <div class="mb-2">
-                                        <label class="text-sm mb-1 font-weight-bold">Drug</label>
-                                        <input type="text" class="form-control form-control-sm min-width-unset"
-                                               data-name="name"
-                                               value="{{@$supplement->data->name}}"
-                                               stag-suggest
-                                               stag-suggest-ep="/fdb-med-suggest-v2/json">
-                                    </div>
-
-                                @else
-
-                                    <div class="mb-2 bg-light p-2 border">
-                                        <p class="mb-1 font-weight-bold">
-                                        {{ @$supplement->data->name }}
-                                        </p>
-                                        @if($patient->core_note_id !== $note->id)
-                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the supplement was added prior to this visit.</div>
-                                        @else
-                                            <div class="text-secondary text-sm">Clinical details cannot be modified since the supplement was added on a previous visit.</div>
-                                        @endif
-                                    </div>
-
-                                @endif
-
-                                @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>
-                                    <button cancel class="btn btn-sm bg-light btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    </td>
                 </tr>
             <?php endforeach; ?>
     </table>