Wizard UI updates

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

@@ -60,7 +60,6 @@ if(!@$summaryView) {
                     <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-50px">Edit</th> @endif
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-30px"></th> @endif
@@ -89,7 +88,58 @@ if(!@$summaryView) {
                     <div class="d-flex align-items-baseline">
                         @include('app.patient.wizard-partials.state-icon', ['point' => $allergy])
                         <div>
-                            <b><?= !!@($allergy->data->name) ? @($allergy->data->name) : '-' ?></b>
+                            @if(!@$summaryView)
+                                <div>
+                                    <div moe huge relative>
+                                        <a start show href="#" title="Edit"><?= !!@($allergy->data->name) ? @($allergy->data->name) : '-' ?></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', 'apTerm' => 'assessment/plan'])
+
+                                            <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>
+                                </div>
+                            @else
+                                <?= !!@($allergy->data->name) ? @($allergy->data->name) : '-' ?>
+                            @endif
+
                             @include('app.patient.wizard-partials.state-badge', ['point' => $allergy, 'addedVerb' => 'Diagnosed'])
                         </div>
                         @if(!@$summaryView)
@@ -117,55 +167,6 @@ if(!@$summaryView) {
                         @endif
                     </div>
                 </td>
-                @if(!@$summaryView)
-                <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', 'apTerm' => 'assessment/plan'])
-
-                            <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>
-                @endif
                 <td>
                     <?php
                     $segment = $note->getSegmentByInternalName('intake_allergies');

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

@@ -22,7 +22,6 @@ 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/Details</th>
-                @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-50px">Edit</th> @endif
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 <th class="border-bottom-0 text-secondary">Contact</th>
@@ -49,112 +48,117 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                     <div class="d-flex align-items-baseline">
                         @include('app.patient.wizard-partials.state-icon', ['point' => $careTeamMember])
                         <div>
-                            <b class="text-nowrap"><?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?></b>
-                            <?= !!@($careTeamMember->data->specialty) ? '<br>' . @($careTeamMember->data->specialty) : '' ?>
-                            <?= !!@($careTeamMember->data->organization) ? '<br>' . @($careTeamMember->data->organization) : '' ?>
-                            @include('app.patient.wizard-partials.state-badge', ['point' => $careTeamMember])
-                        </div>
-                    </div>
-                </td>
-                @if(!@$summaryView)
-                <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"
-                                               data-option-list="specialty"
-                                               value="{{@$careTeamMember->data->specialty}}">
-                                        <div class="data-option-list">
-                                            <div>Allergy and immunology</div>
-                                            <div>Anesthesiology</div>
-                                            <div>Dermatology</div>
-                                            <div>Diagnostic radiology</div>
-                                            <div>Emergency medicine</div>
-                                            <div>Family medicine</div>
-                                            <div>Internal medicine</div>
-                                            <div>Medical genetics</div>
-                                            <div>Neurology</div>
-                                            <div>Nuclear medicine</div>
-                                            <div>Obstetrics and gynecology</div>
-                                            <div>Ophthalmology</div>
-                                            <div>Pathology</div>
-                                            <div>Pediatrics</div>
-                                            <div>Physical medicine and rehabilitation</div>
-                                            <div>Preventive medicine</div>
-                                            <div>Psychiatry</div>
-                                            <div>Radiation oncology</div>
-                                            <div>Surgery</div>
-                                            <div>Urology</div>
-                                        </div>
-                                    </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}}">
+                            @if(!@$summaryView)
+                                <div>
+                                    <div moe huge relative>
+                                        <a start show href="#" title="Edit">
+                                            <?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?>
+                                            <?= !!@($careTeamMember->data->specialty) ? '<br>' . @($careTeamMember->data->specialty) : '' ?>
+                                            <?= !!@($careTeamMember->data->organization) ? '<br>' . @($careTeamMember->data->organization) : '' ?>
+                                        </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"
+                                                               data-option-list="specialty"
+                                                               value="{{@$careTeamMember->data->specialty}}">
+                                                        <div class="data-option-list">
+                                                            <div>Allergy and immunology</div>
+                                                            <div>Anesthesiology</div>
+                                                            <div>Dermatology</div>
+                                                            <div>Diagnostic radiology</div>
+                                                            <div>Emergency medicine</div>
+                                                            <div>Family medicine</div>
+                                                            <div>Internal medicine</div>
+                                                            <div>Medical genetics</div>
+                                                            <div>Neurology</div>
+                                                            <div>Nuclear medicine</div>
+                                                            <div>Obstetrics and gynecology</div>
+                                                            <div>Ophthalmology</div>
+                                                            <div>Pathology</div>
+                                                            <div>Pediatrics</div>
+                                                            <div>Physical medicine and rehabilitation</div>
+                                                            <div>Preventive medicine</div>
+                                                            <div>Psychiatry</div>
+                                                            <div>Radiation oncology</div>
+                                                            <div>Surgery</div>
+                                                            <div>Urology</div>
+                                                        </div>
+                                                    </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>
                                 </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>
-
+                                <?= !!@($careTeamMember->data->name) ? @($careTeamMember->data->name) : '-' ?>
+                                <?= !!@($careTeamMember->data->specialty) ? '<br>' . @($careTeamMember->data->specialty) : '' ?>
+                                <?= !!@($careTeamMember->data->organization) ? '<br>' . @($careTeamMember->data->organization) : '' ?>
                             @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>
+                            @include('app.patient.wizard-partials.state-badge', ['point' => $careTeamMember])
+                        </div>
                     </div>
                 </td>
-                @endif
                 <td>
                     <?php
                     $segment = $note->getSegmentByInternalName('intake_care_team');

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

@@ -22,7 +22,6 @@ 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>
-                @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-50px">Edit</th> @endif
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-30px"></th> @endif
@@ -48,56 +47,58 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                     <div class="d-flex align-items-baseline">
                         @include('app.patient.wizard-partials.state-icon', ['point' => $goal])
                         <div>
-                            <b><?= !!@($goal->data->goal) ? @($goal->data->goal) : '-' ?></b>
-                            @include('app.patient.wizard-partials.state-badge', ['point' => $goal, 'addedVerb' => 'Prescribed'])
-                        </div>
-                    </div>
-                </td>
-                @if(!@$summaryView)
-                <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}}">
+                            @if(!@$summaryView)
+                            <div>
+                                <div moe huge relative>
+                                    <a start show href="#" title="Edit"><?= !!@($goal->data->goal) ? @($goal->data->goal) : '-' ?></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>
-
+                            </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>
-
+                                <?= !!@($goal->data->goal) ? @($goal->data->goal) : '-' ?>
                             @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>
+                            @include('app.patient.wizard-partials.state-badge', ['point' => $goal, 'addedVerb' => 'Prescribed'])
+                        </div>
                     </div>
                 </td>
-                @endif
                 <td>
                     <?php
                     $segment = $note->getSegmentByInternalName('intake_goals');

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

@@ -51,7 +51,6 @@ if(!@$summaryView) {
                     <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-50px">Edit</th> @endif
                 <th class="border-bottom-0 text-secondary w-30">Subjective</th>
                 <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-30px"></th> @endif
@@ -80,7 +79,58 @@ if(!@$summaryView) {
                         <div class="d-flex align-items-baseline">
                             @include('app.patient.wizard-partials.state-icon', ['point' => $medication])
                             <div>
-                                <b><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></b>
+                                @if(!@$summaryView)
+                                    <div moe huge relative>
+                                        <a start show href="#" title="Edit"><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></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>
+                                @else
+                                    <?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?>
+                                @endif
                                 @include('app.patient.wizard-partials.state-badge', ['point' => $medication, 'addedVerb' => 'Prescribed', 'removedVerb' => 'Discontinued'])
                             </div>
                             @if(!@$summaryView)
@@ -109,58 +159,6 @@ if(!@$summaryView) {
                             @endif
                         </div>
                     </td>
-                    @if(!@$summaryView)
-                    <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>
-                    @endif
                     <td>
                         <?php
                         $segment = $note->getSegmentByInternalName('intake_medications');

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

@@ -70,7 +70,6 @@ if(!@$summaryView) {
                     <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-50px">Edit</th> @endif
                 <th class="border-bottom-0 text-secondary w-30">Subjective/HPI</th>
                 <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 @if(!@$summaryView) <th class="border-bottom-0 text-secondary width-30px"></th> @endif
@@ -99,10 +98,74 @@ if(!@$summaryView) {
                     <div class="d-flex align-items-baseline">
                         @include('app.patient.wizard-partials.state-icon', ['point' => $problem])
                         <div>
-                            <div>
-                                <b><?= !!@($problem->data->name) ? @($problem->data->name) : '-' ?></b>
+                            @if(!@$summaryView)
+                                <div>
+                                    <div moe huge relative>
+                                        <a start show href="#" title="Edit">
+                                            <?= !!@($problem->data->name) ? @($problem->data->name) : '-' ?>
+                                            <?= !!@($problem->data->icd) ? '/&nbsp;' . @($problem->data->icd) : '' ?>
+                                        </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', 'apTerm' => 'assessment/plan'])
+
+                                            <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>
+                                </div>
+                            @else
+                                <?= !!@($problem->data->name) ? @($problem->data->name) : '-' ?>
                                 <?= !!@($problem->data->icd) ? '/&nbsp;' . @($problem->data->icd) : '' ?>
-                            </div>
+                            @endif
+
                             @include('app.patient.wizard-partials.state-badge', ['point' => $problem, 'addedVerb' => 'Diagnosed'])
                         </div>
                         @if(!@$summaryView)
@@ -133,67 +196,6 @@ if(!@$summaryView) {
                         @endif
                     </div>
                 </td>
-                @if(!@$summaryView)
-                <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', 'apTerm' => 'assessment/plan'])
-
-                            <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>
-                @endif
                 <td>
                     <?php
                     $segment = $note->getSegmentByInternalName('intake_problems');