Centers - add-single -> first tab & default

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

@@ -281,13 +281,10 @@ if(!@$summaryView) {
         <div class="d-flex align-items-center">
             <div class="mt-1 w-100 border p-3 bg-aliceblue border-info rounded">
                 <div class="d-flex align-items-baseline mb-3" tab-links="">
-                    <a class="tab-link-active" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
-                    <a class="" href="#" tab-link="add-single">Add Single</a>
+                    <a class="tab-link-active" href="#" tab-link="add-single">Add Single</a>
+                    <a class="" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
                 </div>
-                <div class="cm-tab" tab-key="add-multiple-pre-existing">
-                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'allergy', 'adder' => 'Diagnosed By'])
-                </div>
-                <div class="cm-tab d-none" tab-key="add-single">
+                <div class="cm-tab" tab-key="add-single">
                     <div class="row">
                         <div class="col-8">
                             <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-allergy" novalidate>
@@ -345,6 +342,9 @@ if(!@$summaryView) {
                         </div>
                     </div>
                 </div>
+                <div class="cm-tab d-none" tab-key="add-multiple-pre-existing">
+                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'allergy', 'adder' => 'Diagnosed By'])
+                </div>
             </div>
         </div>
         @endif

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

@@ -273,13 +273,10 @@ if(!@$careTeamMembers || !@$counts) {
             <div class="mt-1 w-100 border p-3 bg-aliceblue border-info rounded">
 
                 <div class="d-flex align-items-baseline mb-3" tab-links="">
-                    <a class="tab-link-active" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
-                    <a class="" href="#" tab-link="add-single">Add Single</a>
+                    <a class="tab-link-active" href="#" tab-link="add-single">Add Single</a>
+                    <a class="" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
                 </div>
-                <div class="cm-tab" tab-key="add-multiple-pre-existing">
-                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'care team member', 'category' => 'CARE_TEAM_MEMBER', 'adder' => 'Added By'])
-                </div>
-                <div class="cm-tab d-none" tab-key="add-single">
+                <div class="cm-tab" tab-key="add-single">
                 <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-care-team-member" novalidate>
                     <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
                     <input type="hidden" name="category" value="CARE_TEAM_MEMBER">
@@ -361,6 +358,9 @@ if(!@$careTeamMembers || !@$counts) {
                     </div>
                 </form>
                 </div>
+                <div class="cm-tab d-none" tab-key="add-multiple-pre-existing">
+                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'care team member', 'category' => 'CARE_TEAM_MEMBER', 'adder' => 'Added By'])
+                </div>
             </div>
         </div>
         @endif

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

@@ -207,13 +207,10 @@ if(!@$goals || !@$counts) {
             <div class="mt-1 w-100 border p-3 bg-aliceblue border-info rounded">
 
                 <div class="d-flex align-items-baseline mb-3" tab-links="">
-                    <a class="tab-link-active" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
-                    <a class="" href="#" tab-link="add-single">Add Single</a>
+                    <a class="tab-link-active" href="#" tab-link="add-single">Add Single</a>
+                    <a class="" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
                 </div>
-                <div class="cm-tab" tab-key="add-multiple-pre-existing">
-                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'goal', 'adder' => 'Added By'])
-                </div>
-                <div class="cm-tab d-none" tab-key="add-single">
+                <div class="cm-tab" tab-key="add-single">
 
                 <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-goal" novalidate>
                     <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
@@ -253,6 +250,9 @@ if(!@$goals || !@$counts) {
                 </form>
 
                 </div>
+                <div class="cm-tab d-none" tab-key="add-multiple-pre-existing">
+                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'goal', 'adder' => 'Added By'])
+                </div>
             </div>
         </div>
         @endif

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

@@ -284,13 +284,10 @@ if(!@$summaryView) {
         <div class="d-flex align-items-center">
             <div class="mt-1 w-100 border p-3 bg-aliceblue border-info rounded">
                 <div class="d-flex align-items-baseline mb-3" tab-links="">
-                    <a class="tab-link-active" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
-                    <a class="" href="#" tab-link="add-single">Add Single</a>
+                    <a class="tab-link-active" href="#" tab-link="add-single">Add Single</a>
+                    <a class="" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
                 </div>
-                <div class="cm-tab" tab-key="add-multiple-pre-existing">
-                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'medication', 'adder' => 'Prescriber'])
-                </div>
-                <div class="cm-tab d-none" tab-key="add-single">
+                <div class="cm-tab" tab-key="add-single">
                     <div class="row">
                         <div class="col-8">
                             <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-medication" novalidate>
@@ -371,6 +368,9 @@ if(!@$summaryView) {
                         </div>
                     </div>
                 </div>
+                <div class="cm-tab d-none" tab-key="add-multiple-pre-existing">
+                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'medication', 'adder' => 'Prescriber'])
+                </div>
             </div>
         </div>
         @endif

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

@@ -316,102 +316,101 @@ if(!@$summaryView) {
         <div class="d-flex align-items-center">
             <div class="mt-1 w-100 border p-3 bg-aliceblue border-info rounded">
 
-                    <div class="d-flex align-items-baseline mb-3" tab-links="">
-                        <a class="tab-link-active" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
-                        <a class="" href="#" tab-link="add-single">Add Single</a>
-                    </div>
-                    <div class="cm-tab" tab-key="add-multiple-pre-existing">
-                        @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'problem', 'adder' => 'Diagnosed By'])
-                    </div>
-                    <div class="cm-tab d-none" tab-key="add-single">
-                        <div class="row">
-                            <div class="col-8">
-                                <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-problem" novalidate>
-                                    <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
-                                    <input type="hidden" name="category" value="PROBLEM">
-                                    <input type="hidden" name="data">
-
-                                    <input type="hidden" data-name="dxid">
-                                    <input type="hidden" data-name="icd-type">
-
-                                    <input type="hidden" name="isRemovedDueToEntryError" value="0">
-
-                                    <div class="d-flex align-items-baseline mb-2">
-                                        <b>Add Problem</b>
-                                        @if(count($favorites))
-                                            <div class="d-inline position-relative on-click-menu ml-4">
-                                                    <span class="text-primary c-pointer">
-                                                        <i class="fa fa-bookmark text-info mr-1"></i> Common Problems <i class="ml-1 fa fa-caret-down"></i>
-                                                    </span>
-                                                <div menu right class="bg-white border">
-                                                    @foreach($favorites as $favorite)
-                                                        <a native target="_blank" href="#"
-                                                           data-name="{{@($favorite->data->name)}}"
-                                                           data-dxid="{{@($favorite->data->dxid)}}"
-                                                           data-icd="{{@($favorite->data->icd)}}"
-                                                           data-icd-type="{{@($favorite->data->{'icd-type'})}}"
-                                                           class="px-2 py-1 d-block text-nowrap text-sm favorite-item">
-                                                            {{$favorite->data->name}}
-                                                        </a>
-                                                    @endforeach
-                                                </div>
+                <div class="d-flex align-items-baseline mb-3" tab-links="">
+                    <a class="tab-link-active" href="#" tab-link="add-single">Add Single</a>
+                    <a class="" href="#" tab-link="add-multiple-pre-existing">Add Multiple Pre-existing</a>
+                </div>
+                <div class="cm-tab" tab-key="add-single">
+                    <div class="row">
+                        <div class="col-8">
+                            <form action="/api/visitPoint/addTopLevel" class="mcp-theme-1 w-100" id="frm-add-problem" novalidate>
+                                <input type="hidden" name="noteUid" value="<?= $note->uid ?>">
+                                <input type="hidden" name="category" value="PROBLEM">
+                                <input type="hidden" name="data">
+
+                                <input type="hidden" data-name="dxid">
+                                <input type="hidden" data-name="icd-type">
+
+                                <input type="hidden" name="isRemovedDueToEntryError" value="0">
+
+                                <div class="d-flex align-items-baseline mb-2">
+                                    <b>Add Problem</b>
+                                    @if(count($favorites))
+                                        <div class="d-inline position-relative on-click-menu ml-4">
+                                                <span class="text-primary c-pointer">
+                                                    <i class="fa fa-bookmark text-info mr-1"></i> Common Problems <i class="ml-1 fa fa-caret-down"></i>
+                                                </span>
+                                            <div menu right class="bg-white border">
+                                                @foreach($favorites as $favorite)
+                                                    <a native target="_blank" href="#"
+                                                       data-name="{{@($favorite->data->name)}}"
+                                                       data-dxid="{{@($favorite->data->dxid)}}"
+                                                       data-icd="{{@($favorite->data->icd)}}"
+                                                       data-icd-type="{{@($favorite->data->{'icd-type'})}}"
+                                                       class="px-2 py-1 d-block text-nowrap text-sm favorite-item">
+                                                        {{$favorite->data->name}}
+                                                    </a>
+                                                @endforeach
                                             </div>
-                                        @endif
-                                    </div>
-                                    <div class="row mb-2">
-                                        <div class="col-8 pr-0">
-                                            <label class="text-sm mb-0 font-weight-bold">Name</label>
-                                            <input type="text"
-                                                   data-name="name"
-                                                   class="form-control form-control-sm"
-                                                   stag-suggest
-                                                   stag-suggest-bottom-left
-                                                   stag-suggest-ep="/fdb-dx-suggest-v2/json"
-                                                   stag-suggest-text-only
-                                                   value="{{trim(request()->input('dx')) ? trim(request()->input('dx')) : ''}}"
-                                                   required>
                                         </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 min-width-unset">
-                                        </div>
-                                    </div>
-
-                                    <?php $point = null; ?>
-                                    @include('app.patient.wizard-partials.common-fields-optimized', ['label' => 'problem', 'addVerbPT' => 'Added', 'reviewLabel' => 'Subjective/HPI', 'apTerm' => 'assessment/plan'])
-
-                                    <div class="d-flex align-items-center">
-                                        <button type="submit" class="btn btn-sm btn-primary mr-2">Save Problem</button>
-                                        <button type="button" class="btn btn-sm btn-default border-secondary bg-white border mr-2" onclick="return closeStagPopup()">Close</button>
+                                    @endif
+                                </div>
+                                <div class="row mb-2">
+                                    <div class="col-8 pr-0">
+                                        <label class="text-sm mb-0 font-weight-bold">Name</label>
+                                        <input type="text"
+                                               data-name="name"
+                                               class="form-control form-control-sm"
+                                               stag-suggest
+                                               stag-suggest-bottom-left
+                                               stag-suggest-ep="/fdb-dx-suggest-v2/json"
+                                               stag-suggest-text-only
+                                               value="{{trim(request()->input('dx')) ? trim(request()->input('dx')) : ''}}"
+                                               required>
                                     </div>
-                                </form>
-                            </div>
-                            <div class="col-4 border-left">
-
-                                <?php
-                                $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
-                                ?>
-                                @if(count($medications))
-                                    <h6 class="my-0 font-weight-bold text-secondary mb-2">Active Medications</h6>
-                                    <div class="bg-light border px-2 pt-2 pb-1 mb-0">
-                                        @foreach($medications as $medication)
-                                            <div class="mb-1">
-                                                <b><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></b>
-                                            </div>
-                                        @endforeach
+                                    <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 min-width-unset">
                                     </div>
-                                    <hr class="my-3 m-neg-3">
-                                @endif
+                                </div>
 
-                                <div class="fdb-dx-vigilance max-height-400px overflow-auto">
+                                <?php $point = null; ?>
+                                @include('app.patient.wizard-partials.common-fields-optimized', ['label' => 'problem', 'addVerbPT' => 'Added', 'reviewLabel' => 'Subjective/HPI', 'apTerm' => 'assessment/plan'])
 
+                                <div class="d-flex align-items-center">
+                                    <button type="submit" class="btn btn-sm btn-primary mr-2">Save Problem</button>
+                                    <button type="button" class="btn btn-sm btn-default border-secondary bg-white border mr-2" onclick="return closeStagPopup()">Close</button>
                                 </div>
+                            </form>
+                        </div>
+                        <div class="col-4 border-left">
+
+                            <?php
+                            $medications = \App\Models\Point::getPointsOfCategory($patient, "MEDICATION");
+                            ?>
+                            @if(count($medications))
+                                <h6 class="my-0 font-weight-bold text-secondary mb-2">Active Medications</h6>
+                                <div class="bg-light border px-2 pt-2 pb-1 mb-0">
+                                    @foreach($medications as $medication)
+                                        <div class="mb-1">
+                                            <b><?= !!@($medication->data->name) ? @($medication->data->name) : '-' ?></b>
+                                        </div>
+                                    @endforeach
+                                </div>
+                                <hr class="my-3 m-neg-3">
+                            @endif
+
+                            <div class="fdb-dx-vigilance max-height-400px overflow-auto">
+
                             </div>
                         </div>
                     </div>
                 </div>
+                <div class="cm-tab d-none" tab-key="add-multiple-pre-existing">
+                    @include('app.patient.wizard-partials.add-multiple-pre-existing', ['label' => 'problem', 'adder' => 'Diagnosed By'])
+                </div>
             </div>
         </div>
         @endif