Forráskód Böngészése

Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into master

Josh 4 éve
szülő
commit
933de172ee

+ 2 - 1
app/Http/Controllers/HomeController.php

@@ -373,7 +373,8 @@ class HomeController extends Controller
         if (empty($term)) return '';
         $clientQuery= Client::where(function ($q) use ($term) {
             $q->where('name_first', 'ILIKE', '%' . $term . '%')
-                ->orWhere('name_last', 'ILIKE', '%' . $term . '%');
+                ->orWhere('name_last', 'ILIKE', '%' . $term . '%')
+                ->orWhere('cell_number', 'ILIKE', '%' . $term . '%');
         });
 
         if($pro->pro_type != 'ADMIN'){

+ 31 - 3
public/css/style.css

@@ -215,6 +215,9 @@ body>nav.navbar {
 [moe][large] form {
     width: 450px;
 }
+[moe][bottom] form {
+    bottom: 100%;
+}
 .moe-disabled[moe] {
     cursor: not-allowed;
 }
@@ -475,7 +478,6 @@ input.search_field, textarea.search_field {
 .suggestions-outer {
     top: calc(100% + 2px);
     background: #fff;
-    width: calc(100% - 1rem);
     border-radius: 3px;
     border: 1px solid #ccc;
     z-index: 9999;
@@ -483,12 +485,13 @@ input.search_field, textarea.search_field {
 .suggestions-outer {
     top: calc(100% + 2px);
     background: #fff;
-    width: calc(100% - 1rem);
     border-radius: 3px;
     border: 1px solid #ccc;
     z-index: 9999;
     max-height: 220px;
     overflow-y: auto;
+    min-width: calc(100% - 0.5rem);
+    right: 0.5rem;
 }
 .suggestions-outer .suggest-item, .suggestions-outer .no-suggest-items {
     padding: 0.25rem 0.5rem;
@@ -1095,6 +1098,16 @@ table.table-edit-sheet tbody tr td>select {
     min-width: unset !important;
     border-bottom: 1px solid #dee2e6;
 }
+table.table-edit-sheet tbody tr td input[type="text"],
+table.table-edit-sheet tbody tr td select,
+table.table-edit-sheet tbody tr td textarea {
+    box-shadow: none !important;
+    border-radius: 0 !important;
+    border: 0;
+    background: #fefefe;
+    min-width: unset !important;
+    border-bottom: 1px solid #dee2e6;
+}
 table.table-edit-sheet tbody tr td>input:focus,
 table.table-edit-sheet tbody tr td>select:focus {
     background: #fff;
@@ -1110,7 +1123,7 @@ table.table-edit-sheet .ql-container {
     border-bottom: 0 !important;
 }
 table.table-edit-sheet .ql-editor[contenteditable] {
-    min-height: 60px;
+    min-height: 90px;
 }
 .w-35 {
     width: 35%;
@@ -1149,3 +1162,18 @@ input[data-option-list]:focus+.data-option-list {
 .measurement-item:not(:last-child) {
     border-bottom: 1px solid #e7e7e7;
 }
+.assessment-detail-template>span {
+    margin: 0 !important;
+    padding: 0 !important;
+    border: 0 !important;
+    margin-left: -0.5rem !important;
+    position: static !important;
+}
+.assessment-detail-template>span>a {
+    display: none;
+}
+button.add-shortcut,
+button.note-templates-trigger-assessment {
+    outline: none !important;
+    box-shadow: none !important;
+}

+ 5 - 1
resources/views/app/patient-suggest.blade.php

@@ -3,6 +3,10 @@
 @endif
 <?php $activeSet = false; ?>
 @foreach($clients as $client)
-    <a class="d-block suggest-item {{ $activeSet ? '' : 'active'  }}" href="" data-target-uid="{{$client->uid}}">{{$client->displayName()}}</a>
+    <a class="d-block suggest-item text-nowrap {{ $activeSet ? '' : 'active'  }}"
+       href="" data-target-uid="{{$client->uid}}">
+        {{$client->displayName()}}
+        {!! $client->cell_number ? '<span class="text-sm text-secondary ml-1">(' . $client->cell_number . ')</span>' : '' !!}
+    </a>
     <?php $activeSet = true; ?>
 @endforeach

+ 34 - 20
resources/views/app/patient/action-items-erx-single.blade.php

@@ -34,10 +34,6 @@
                                 <span class="width-100px text-secondary text-sm">Strength</span>
                                 <span class="font-weight-bold">@{{ item.strength ? item.strength : '-' }}</span>
                             </div>
-                            <div class="d-flex align-items-start flex-nowrap mb-2">
-                                <span class="width-100px text-secondary text-sm">Amount</span>
-                                <span class="font-weight-bold">@{{ item.amount ? item.amount : '-' }}</span>
-                            </div>
                             <div class="d-flex align-items-start flex-nowrap mb-2">
                                 <span class="width-100px text-secondary text-sm">Route</span>
                                 <span class="font-weight-bold">@{{ item.route ? item.route : '-' }}</span>
@@ -47,7 +43,7 @@
                                 <span class="font-weight-bold">@{{ item.frequency ? item.frequency : '-' }}</span>
                             </div>
                             <div class="d-flex align-items-start flex-nowrap mb-2">
-                                <span class="width-100px text-secondary text-sm">Dispense</span>
+                                <span class="width-100px text-secondary text-sm">Dispense Amount</span>
                                 <span class="font-weight-bold">@{{ item.dispense ? item.dispense : '-' }}</span>
                             </div>
                             <div class="d-flex align-items-start flex-nowrap mb-2">
@@ -93,8 +89,13 @@
                     </div>
                     <div class="row mb-2">
                         <div class="col-6">
-                            <label class="text-sm text-secondary mb-1">Amount</label>
-                            <input type="text" v-model="popupItem.amount" class="form-control form-control-sm">
+                            <label class="text-sm text-secondary mb-1">Frequency</label>
+                            <input type="text" v-model="popupItem.frequency" class="form-control form-control-sm"
+                                   data-option-list="frequency-options">
+                            <div id="frequency-options" class="data-option-list">
+                                <div>Once a day</div>
+                                <div>Twice a day</div>
+                            </div>
                         </div>
                         <div class="col-6">
                             <label class="text-sm text-secondary mb-1">Route</label>
@@ -116,18 +117,7 @@
                     </div>
                     <div class="row mb-2">
                         <div class="col-6">
-                            <label class="text-sm text-secondary mb-1">Frequency</label>
-                            <input type="text" v-model="popupItem.frequency" class="form-control form-control-sm"
-                                   data-option-list="frequency-options">
-                            <div id="frequency-options" class="data-option-list">
-                                <div>Once a day</div>
-                                <div>Twice a day</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row mb-2">
-                        <div class="col-6">
-                            <label class="text-sm text-secondary mb-1">Dispense</label>
+                            <label class="text-sm text-secondary mb-1">Dispense Amount</label>
                             <input required type="number" v-model="popupItem.dispense" class="form-control form-control-sm">
                         </div>
                         <div class="col-6">
@@ -138,7 +128,7 @@
                     <div class="row mb-2">
                         <div class="col-12">
                             <label class="text-sm text-secondary mb-1">Purpose</label>
-                            <input required type="text" v-model="popupItem.purpose" class="form-control form-control-sm">
+                            <input required type="text" data-field="icd" v-model="popupItem.purpose" class="form-control form-control-sm">
                         </div>
                     </div>
                     <hr class="mt-3 mb-2">
@@ -340,6 +330,29 @@
                                     $(strengthElem).attr('ac-initialized', 1);
                                 });
                             },
+                            initICDAutoSuggest: function() {
+                                let self = this;
+                                $('#erxSingleApp input[type="text"][data-field="icd"]:not([ac-initialized])').each(function() {
+                                    var elem = this,
+                                        dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
+                                        vueIndex = $(this).attr('data-index');
+                                    $(elem).attr('id', dynID);
+                                    new window.Def.Autocompleter.Search(dynID,
+                                        'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
+                                            tableFormat: true,
+                                            valueCols: [0],
+                                            colHeaders: ['Code', 'Name'],
+                                        }
+                                    );
+                                    window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
+                                        let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
+                                        debugger
+                                        self.popupItem.purpose = acData[0].code + ' - ' + acData[0].data.name;
+                                        return false;
+                                    });
+                                    $(elem).attr('ac-initialized', 1);
+                                });
+                            },
                             inWords: function (num) {
                                 try {
                                     num = +num;
@@ -373,6 +386,7 @@
                         },
                         mounted: function () {
                             this.initRxAutoSuggest();
+                            this.initICDAutoSuggest();
                             initFastLoad($('#erxSingleApp'));
                         }
                     })

+ 31 - 7
resources/views/app/patient/canvas-sections/dx/form.blade.php

@@ -96,9 +96,9 @@ $formID = rand(0, 100000);
                     </div>
                 </div>
             </th>
-            <th class="px-2 text-secondary border-bottom-0 min-width-140px">ICD</th>
-            <th class="px-2 text-secondary border-bottom-0 w-25">Detail</th>
-            <th class="px-2 text-secondary border-bottom-0 w-25">Plan</th>
+            {{--<th class="px-2 text-secondary border-bottom-0 min-width-140px">ICD</th>
+            <th class="px-2 text-secondary border-bottom-0 w-25">Detail</th>--}}
+            <th class="px-2 text-secondary border-bottom-0 w-75">Plan</th>
             <th class="px-2 text-secondary border-bottom-0"></th>
         </tr>
         </thead>
@@ -116,8 +116,19 @@ $formID = rand(0, 100000);
                 <input type="text" :data-index="index"
                        class="form-control form-control-sm font-weight-bold font-size-14"
                        data-field="title" placeholder="Title" v-model="item.title" autofocus required>
+                <div class="d-flex">
+                    <input type="text" :data-index="index"
+                           class="form-control form-control-sm canvas-dx-title"
+                           data-field="icd" placeholder="ICD" v-model="item.icd">
+                    <select v-model="item.coa" class="form-control form-control-sm pl-1 border-left" required>
+                        <option value="">-- select --</option>
+                        <option value="Chronic" selected>Chronic</option>
+                        <option value="Acute">Acute</option>
+                    </select>
+                </div>
+                <textarea type="text" class="form-control form-control-sm" v-model="item.detail" placeholder="Detail"></textarea>
             </td>
-            <td>
+            {{--<td>
                 <input type="text" :data-index="index"
                        class="form-control form-control-sm canvas-dx-title"
                        data-field="icd" placeholder="ICD" v-model="item.icd">
@@ -130,7 +141,7 @@ $formID = rand(0, 100000);
             <td><textarea type="text" class="form-control form-control-sm"
                           dx-rte :data-index="index" data-field="detail"
                           v-model="item.detail"></textarea>
-            </td>
+            </td>--}}
             <td><textarea type="text" class="form-control form-control-sm"
                           dx-rte :data-index="index" data-field="plan"
                           v-model="item.plan"></textarea>
@@ -163,6 +174,11 @@ $formID = rand(0, 100000);
     >+ New Entry</button>
     </div>
 
+    <div class="assessment-detail-template">
+        <?php $sectionInternalName = 'plan'; ?>
+        @include('app/patient/note/_templates-index')
+    </div>
+
 </div>
 <script>
     (function() {
@@ -276,8 +292,6 @@ $formID = rand(0, 100000);
 
                             let vueField = $(this).attr('data-field'), vueIndex = +$(this).attr('data-index');
 
-                            $(this).remove();
-
                             var qe = new Quill('[data-editor-id="' + editorID + '"]', {
                                 theme: 'snow',
                                 modules: stagQuillConfig
@@ -291,6 +305,14 @@ $formID = rand(0, 100000);
                                 'text-sm add-shortcut" data-editor-id="' + editorID + '">+ Shortcut</button>');
                             toolbar.append(newSCButton);
 
+                            // add button for templates
+                            var templatesButton = $('<button type="button" tabindex="-1" ' +
+                                'class="position-relative note-templates-trigger-assessment btn bg-white btn-sm btn-default text-primary w-auto px-2 border py-0 ml-1 ' +
+                                'text-sm show-templates">Templates</button>');
+                            templatesButton.attr('data-editor-id', editorID);
+                            toolbar.append(templatesButton);
+                            // $(this).closest('tr').find('.assessment-detail-template').appendTo(templatesButton);
+
                             qe.on('text-change', function() {
                                 // ti.val(qe.root.innerHTML);
                                 self.items[vueIndex][vueField] = qe.root.innerHTML;
@@ -301,6 +323,8 @@ $formID = rand(0, 100000);
                                 .attr('data-editor-id', editorID)
                                 .attr('with-shortcuts', 1);
 
+                            $(this).remove();
+
                         });
                     },
                     initICDAutoSuggest: function() {

+ 35 - 3
resources/views/app/patient/note/dashboard_script.blade.php

@@ -79,6 +79,29 @@
                         return false;
                     });
 
+                $(document)
+                    .off('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment')
+                    .on('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment', function() {
+                        $('.note-templates-underlay').show();
+                        let container = $(this).closest('.note-section').find('.note-template-container');
+                        container.find('.note-template-children').hide();
+                        container.find('.note-template-item.selected').removeClass('selected');
+                        container.find('.note-template-item[prefix]').removeAttr('prefix');
+                        container.find('input[type="checkbox"]').prop('checked', false);
+                        container.find('.note-template-output-text').empty();
+                        container.attr('data-editor-id', $(this).attr('data-editor-id'));
+                        container.show();
+                        container.css({
+                            left: ($(this).position().left - 140) + 'px',
+                            top: ($(this).position().top + 22) + 'px',
+                        });
+                        loadTemplateSet(container.find('.note-template-set-chooser'));
+                        loadExamTemplateSet(container.find('.note-exam-template-set-chooser'),
+                            container.find('.note-exam-exam-chooser').val(),
+                            container.find('.note-exam-template-set-chooser').val());
+                        return false;
+                    });
+
                 $(document)
                     .off('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger')
                     .on('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger', function() {
@@ -127,12 +150,21 @@
                 $(document)
                     .off('mousedown.note-templates-apply', '.note-template-apply-trigger')
                     .on('mousedown.note-templates-apply', '.note-template-apply-trigger', function() {
+                        let templateContainer = $('.note-template-container:visible').first();
                         let result = $('.note-template-output-text:visible').first().html();
                         $('.note-templates-underlay').hide();
                         $('.note-template-container').hide();
-                        let editor  = $('.ql-editor[contenteditable]:visible').first();
-                        result = $.trim(editor.text() !== '' ? editor.html() : '') + result;
-                        editor.html(result).focus();
+                        let editor = null;
+                        if($(this).closest('.assessment-detail-template').length) {
+                            editor  = $('.ql-editor[data-editor-id="' + templateContainer.attr('data-editor-id') + '"]:visible').first();
+                        }
+                        else {
+                            editor  = $('.ql-editor[contenteditable]:visible').first();
+                        }
+                        if(editor && editor.length) {
+                            result = $.trim(editor.text() !== '' ? editor.html() : '') + result;
+                            editor.html(result).focus();
+                        }
                         return false;
                     });
 

+ 32 - 19
resources/views/app/patient/partials/erx.blade.php

@@ -30,10 +30,6 @@
                             <span class="mx-2 text-secondary">•</span>
                             <span>@{{item.strength}}</span>
                         </span>
-                        <span class="d-inline-flex align-items-center" v-if="item.amount">
-                            <span class="mx-2 text-secondary">•</span>
-                            <span>@{{item.amount}}</span>
-                        </span>
                         <span class="d-inline-flex align-items-center" v-if="item.route">
                             <span class="mx-2 text-secondary">•</span>
                             <span>@{{item.route}}</span>
@@ -96,8 +92,13 @@
             </div>
             <div class="row mb-2">
                 <div class="col-6">
-                    <label class="text-sm text-secondary mb-1">Amount</label>
-                    <input type="text" v-model="popupItem.amount" class="form-control form-control-sm">
+                    <label class="text-sm text-secondary mb-1">Frequency</label>
+                    <input type="text" v-model="popupItem.frequency" class="form-control form-control-sm"
+                           data-option-list="frequency-options">
+                    <div id="frequency-options" class="data-option-list">
+                        <div>Once a day</div>
+                        <div>Twice a day</div>
+                    </div>
                 </div>
                 <div class="col-6">
                     <label class="text-sm text-secondary mb-1">Route</label>
@@ -119,18 +120,7 @@
             </div>
             <div class="row mb-2">
                 <div class="col-6">
-                    <label class="text-sm text-secondary mb-1">Frequency</label>
-                    <input type="text" v-model="popupItem.frequency" class="form-control form-control-sm"
-                           data-option-list="frequency-options">
-                    <div id="frequency-options" class="data-option-list">
-                        <div>Once a day</div>
-                        <div>Twice a day</div>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-2">
-                <div class="col-6">
-                    <label class="text-sm text-secondary mb-1">Dispense</label>
+                    <label class="text-sm text-secondary mb-1">Dispense Amount</label>
                     <input required type="number" v-model="popupItem.dispense" class="form-control form-control-sm">
                 </div>
                 <div class="col-6">
@@ -141,7 +131,7 @@
             <div class="row mb-2">
                 <div class="col-12">
                     <label class="text-sm text-secondary mb-1">Purpose</label>
-                    <input required type="text" v-model="popupItem.purpose" class="form-control form-control-sm">
+                    <input required type="text" data-field="icd" v-model="popupItem.purpose" class="form-control form-control-sm">
                 </div>
             </div>
             <hr class="mt-3 mb-2">
@@ -353,6 +343,28 @@
                             $(strengthElem).attr('ac-initialized', 1);
                         });
                     },
+                    initICDAutoSuggest: function() {
+                        let self = this;
+                        $('#erxApp input[type="text"][data-field="icd"]:not([ac-initialized])').each(function() {
+                            var elem = this,
+                                dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
+                                vueIndex = $(this).attr('data-index');
+                            $(elem).attr('id', dynID);
+                            new window.Def.Autocompleter.Search(dynID,
+                                'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {
+                                    tableFormat: true,
+                                    valueCols: [0],
+                                    colHeaders: ['Code', 'Name'],
+                                }
+                            );
+                            window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
+                                let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
+                                self.popupItem.purpose = acData[0].code + ' - ' + acData[0].data.name;
+                                return false;
+                            });
+                            $(elem).attr('ac-initialized', 1);
+                        });
+                    },
                     inWords: function (num) {
                         try {
                             num = +num;
@@ -386,6 +398,7 @@
                 },
                 mounted: function () {
                     this.initRxAutoSuggest();
+                    this.initICDAutoSuggest();
                     initFastLoad($('#erxApp'));
                 }
             })

+ 384 - 204
resources/views/app/patient/settings.blade.php

@@ -4,183 +4,280 @@
 
     <div id="client-settings-container">
 
-    <div class="d-flex align-items-center mb-2">
-        <div class="font-weight-bold">Home Address</div>
-        <span class="text-secondary mx-2">|</span>
-        <div moe wide>
-            <a start show><i class="fa fa-edit"></i> Edit Address</a>
-            <form url="/api/client/editAddress" class="mcp-theme-1" onbeforesubmit="setSettingsMailingAddress">
-                <input type="hidden" name="uid" value="{{$patient->uid}}">
+        <div class="d-flex align-items-center mb-2">
+            <div class="font-weight-bold">Home Address</div>
+            <span class="text-secondary mx-2">|</span>
+            <div moe wide>
+                <a start show><i class="fa fa-edit"></i> Edit Address</a>
+                <form url="/api/client/editAddress" class="mcp-theme-1" onbeforesubmit="setSettingsMailingAddress">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
 
-                <p class="mb-2 font-weight-bold">Home Address</p>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="homeAddressLine1" placeholder="Address Line 1" value="{{ $patient->home_address_line1 }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="homeAddressLine2" placeholder="Address Line 2" value="{{ $patient->home_address_line2 }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="homeAddressCity" placeholder="City" value="{{ $patient->home_address_city }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="homeAddressState" placeholder="State" value="{{ $patient->home_address_state }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="homeAddressZip" placeholder="ZIP" value="{{ $patient->home_address_zip }}">
-                </div>
+                    <p class="mb-2 font-weight-bold">Home Address</p>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="homeAddressLine1"
+                               placeholder="Address Line 1" value="{{ $patient->home_address_line1 }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="homeAddressLine2"
+                               placeholder="Address Line 2" value="{{ $patient->home_address_line2 }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="homeAddressCity"
+                               placeholder="City" value="{{ $patient->home_address_city }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="homeAddressState"
+                               placeholder="State" value="{{ $patient->home_address_state }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="homeAddressZip" placeholder="ZIP"
+                               value="{{ $patient->home_address_zip }}">
+                    </div>
 
-                <p class="mb-2 mt-3 font-weight-bold">Mailing Address</p>
-                <label class="d-flex align-items-center">
-                    @php
-                        $isSame = ($patient->home_address_line1 == $patient->mailing_address_line1 &&
-                                    $patient->home_address_line2 == $patient->mailing_address_line2 &&
-                                    $patient->home_address_city == $patient->mailing_address_city &&
-                                    $patient->home_address_state == $patient->mailing_address_state &&
-                                    $patient->home_address_zip == $patient->mailing_address_zip);
-                    @endphp
-                    <input type="checkbox" id="settingsSameAsHome" onchange="copyHomeToMailingAndReadOnly(this.checked)" {{ $isSame ? 'checked' : '' }}>
-                    <span class="ml-2">Same as home address</span>
-                </label>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine1" placeholder="Address Line 1" value="{{ $patient->mailing_address_line1 }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="mailingAddressLine2" placeholder="Address Line 2" value="{{ $patient->mailing_address_line2 }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="mailingAddressCity" placeholder="City" value="{{ $patient->mailing_address_city }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="mailingAddressState" placeholder="State" value="{{ $patient->mailing_address_state }}">
-                </div>
-                <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="mailingAddressZip" placeholder="ZIP" value="{{ $patient->mailing_address_zip }}">
-                </div>
-                <div class="mb-2">
-                    <textarea type="text" class="form-control form-control-sm" name="mailingAddressMemo" placeholder="Memo">{{ $patient->mailing_address_memo }}</textarea>
-                </div>
+                    <p class="mb-2 mt-3 font-weight-bold">Mailing Address</p>
+                    <label class="d-flex align-items-center">
+                        @php
+                            $isSame = ($patient->home_address_line1 == $patient->mailing_address_line1 &&
+                                        $patient->home_address_line2 == $patient->mailing_address_line2 &&
+                                        $patient->home_address_city == $patient->mailing_address_city &&
+                                        $patient->home_address_state == $patient->mailing_address_state &&
+                                        $patient->home_address_zip == $patient->mailing_address_zip);
+                        @endphp
+                        <input type="checkbox" id="settingsSameAsHome"
+                               onchange="copyHomeToMailingAndReadOnly(this.checked)" {{ $isSame ? 'checked' : '' }}>
+                        <span class="ml-2">Same as home address</span>
+                    </label>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="mailingAddressLine1"
+                               placeholder="Address Line 1" value="{{ $patient->mailing_address_line1 }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="mailingAddressLine2"
+                               placeholder="Address Line 2" value="{{ $patient->mailing_address_line2 }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="mailingAddressCity"
+                               placeholder="City" value="{{ $patient->mailing_address_city }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="mailingAddressState"
+                               placeholder="State" value="{{ $patient->mailing_address_state }}">
+                    </div>
+                    <div class="mb-2">
+                        <input type="text" class="form-control form-control-sm" name="mailingAddressZip"
+                               placeholder="ZIP" value="{{ $patient->mailing_address_zip }}">
+                    </div>
+                    <div class="mb-2">
+                        <textarea type="text" class="form-control form-control-sm" name="mailingAddressMemo"
+                                  placeholder="Memo">{{ $patient->mailing_address_memo }}</textarea>
+                    </div>
 
-                <div>
-                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                </div>
-            </form>
-        </div>
-    </div>
-    <div class="pl-3">
-        <div class="mb-1">
-            Address Line 1: <b>{{ $patient->home_address_line1 }}</b>
-        </div>
-        <div class="mb-1">
-            Address Line 2: <b>{{ $patient->home_address_line2 }}</b>
-        </div>
-        <div class="mb-1">
-            City: <b>{{ $patient->home_address_city }}</b>
-        </div>
-        <div class="mb-1">
-            State: <b>{{ $patient->home_address_state }}</b>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
-        <div class="mb-1">
-            ZIP: <b>{{ $patient->home_address_zip }}</b>
+        <div class="pl-3">
+            <div class="mb-1">
+                Address Line 1: <b>{{ $patient->home_address_line1 }}</b>
+            </div>
+            <div class="mb-1">
+                Address Line 2: <b>{{ $patient->home_address_line2 }}</b>
+            </div>
+            <div class="mb-1">
+                City: <b>{{ $patient->home_address_city }}</b>
+            </div>
+            <div class="mb-1">
+                State: <b>{{ $patient->home_address_state }}</b>
+            </div>
+            <div class="mb-1">
+                ZIP: <b>{{ $patient->home_address_zip }}</b>
+            </div>
         </div>
-    </div>
 
-    <div class="font-weight-bold mb-2 mt-3">Mailing Address</div>
-    <div class="pl-3">
-        <div class="mb-1">
-            Address Line 1: <b>{{ $patient->mailing_address_line1 }}</b>
-        </div>
-        <div class="mb-1">
-            Address Line 2: <b>{{ $patient->mailing_address_line2 }}</b>
-        </div>
-        <div class="mb-1">
-            City: <b>{{ $patient->mailing_address_city }}</b>
-        </div>
-        <div class="mb-1">
-            State: <b>{{ $patient->mailing_address_state }}</b>
+        <div class="font-weight-bold mb-2 mt-3">Mailing Address</div>
+        <div class="pl-3">
+            <div class="mb-1">
+                Address Line 1: <b>{{ $patient->mailing_address_line1 }}</b>
+            </div>
+            <div class="mb-1">
+                Address Line 2: <b>{{ $patient->mailing_address_line2 }}</b>
+            </div>
+            <div class="mb-1">
+                City: <b>{{ $patient->mailing_address_city }}</b>
+            </div>
+            <div class="mb-1">
+                State: <b>{{ $patient->mailing_address_state }}</b>
+            </div>
+            <div class="mb-1">
+                ZIP: <b>{{ $patient->mailing_address_zip }}</b>
+            </div>
+            <div class="mb-1">
+                Special Instructions: <b>{{ $patient->mailing_address_memo }}</b>
+            </div>
         </div>
-        <div class="mb-1">
-            ZIP: <b>{{ $patient->mailing_address_zip }}</b>
+
+        <hr class="m-negator my-3">
+
+        <div class="d-flex align-items-center mb-2 mt-3">
+            <div class="font-weight-bold">Contact Info</div>
+            <span class="text-secondary mx-2">|</span>
+            <div moe wide>
+                <a start show><i class="fa fa-edit"></i> Edit Contact Info</a>
+                <form url="/api/client/putContactInfo" class="mcp-theme-1">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <div class="mb-2">
+                        <label class="mb-1 text-secondary text-sm">Home Phone Number</label>
+                        <input type="tel" class="form-control form-control-sm" name="homeNumber"
+                               placeholder="Home Phone Number" value="{{ $patient->phone_home }}">
+                    </div>
+                    <div class="mb-2">
+                        <label class="mb-1 text-secondary text-sm">Cell Number</label>
+                        <input type="tel" class="form-control form-control-sm" name="cellNumber"
+                               placeholder="Cell Number" value="{{ $patient->cell_number }}">
+                    </div>
+                    <div class="mb-2">
+                        <label class="mb-1 text-secondary text-sm">Cell Number Memo</label>
+                        <input type="text" class="form-control form-control-sm" name="cellNumberMemo"
+                               placeholder="Cell Number Memo" value="{{ $patient->cell_number_memo }}">
+                    </div>
+                    <div class="mb-2">
+                        <label class="mb-1 text-secondary text-sm">Email Address</label>
+                        <input type="text" class="form-control form-control-sm" name="email" placeholder="Email Address"
+                               value="{{ $patient->email_address }}">
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
         </div>
-        <div class="mb-1">
-            Special Instructions: <b>{{ $patient->mailing_address_memo }}</b>
+        <div class="pl-3">
+            <div class="mb-1">
+                Home Phone: <b>{{ $patient->phone_home }}</b>
+            </div>
+            <div class="mb-1">
+                Cell Phone: <b>{{ $patient->cell_number }}</b> <span
+                    class="text-sm text-secondary ml-2">{{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}</span>
+            </div>
+            <div class="mb-1">
+                Email: <b>{{ $patient->email_address }}</b>
+            </div>
         </div>
-    </div>
 
-    <hr class="m-negator my-3">
+        <hr class="m-negator my-3">
+        <span>MCP: <b>{{ $patient->mcp ? $patient->mcp->displayName() : '-' }}</b></span>
+        @if($pro->pro_type == 'ADMIN')
+            <div moe class="ml-2">
+                <a start show><i class="fa fa-edit"></i></a>
+                <form url="/api/client/putMcp" class="mcp-theme-1">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <div class="mb-2">
+                        <label class="text-secondary text-sm">MCP Pro</label>
+                        <select name="mcpProUid" class="form-control form-control-sm">
+                            <option value=""> --select--</option>
+                            @foreach($pros as $iPro)
+                                <option
+                                    value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
+        @endif
 
-    <div class="d-flex align-items-center mb-2 mt-3">
-        <div class="font-weight-bold">Contact Info</div>
-        <span class="text-secondary mx-2">|</span>
-        <div moe wide>
-            <a start show><i class="fa fa-edit"></i> Edit Contact Info</a>
-            <form url="/api/client/putContactInfo" class="mcp-theme-1">
+        <hr class="m-negator my-3">
+        <span>Physician: <b>{{ $patient->pcp ? $patient->pcp->displayName() : '-' }}</b></span>
+        @if($pro->pro_type == 'ADMIN')
+            <div moe class="ml-2">
+                <a start show><i class="fa fa-edit"></i></a>
+                <form url="/api/client/putPhysicianPro" class="mcp-theme-1">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <div class="mb-2">
+                        <label class="text-secondary text-sm">Physician Pro</label>
+                        <select name="physicianProUid" class="form-control form-control-sm">
+                            <option value=""> --select--</option>
+                            @foreach($pros as $iPro)
+                                <option
+                                    value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
+        @endif
+
+        <hr class="m-negator my-3">
+        <span>MCP Onboarding Visit: <b>{{ $patient->has_mcp_done_onboarding_visit }}</b></span>
+        <span moe class="ml-2">
+            <a start show><i class="fa fa-edit"></i></a>
+            <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
                 <input type="hidden" name="uid" value="{{$patient->uid}}">
                 <div class="mb-2">
-                    <input type="tel" class="form-control form-control-sm" name="homeNumber" placeholder="Home Phone Number" value="{{ $patient->phone_home }}">
+                    <select name="hasMcpDoneOnboardingVisit"
+                            class="form-control form-control-sm"
+                            onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+                        <option value="">-- Select Status --</option>
+                        <option
+                            value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+                        <option
+                            value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+                        <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                    </select>
                 </div>
                 <div class="mb-2">
-                    <input type="tel" class="form-control form-control-sm" name="cellNumber" placeholder="Cell Phone Number" value="{{ $patient->cell_number }}">
+                    <input type="date" class="if-visit-done form-control form-control-sm" disabled
+                           name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
                 </div>
                 <div class="mb-2">
-                    <input type="text" class="form-control form-control-sm" name="email" placeholder="Email" value="{{ $patient->email_address }}">
+                    <select name="mcpOnboardingVisitNoteUid" disabled
+                            class="form-control form-control-sm if-visit-done"
+                            onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
+                        <option value="">-- Visit Note --</option>
+                        @foreach ($notes as $note)
+                            @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
+                                <option
+                                    {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }}
+                                    value="{{$note->uid}}">{{$note->title}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
+                            @endif
+                        @endforeach
+                        {{--<option value="-- create --">-- Create Note --</option>--}}
+                    </select>
+                </div>
+                <div class="mb-2 if-note-outside-system">
+                    <textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem"
+                              placeholder="Visit note outside the system reason" spellcheck="false"
+                              data-gramm="false"></textarea>
                 </div>
                 <div>
                     <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
                     <button cancel class="btn btn-sm btn-default border">Cancel</button>
                 </div>
             </form>
-        </div>
-    </div>
-    <div class="pl-3">
-        <div class="mb-1">
-            Home Phone: <b>{{ $patient->phone_home }}</b>
-        </div>
-        <div class="mb-1">
-            Cell Phone: <b>{{ $patient->cell_number }}</b>
-        </div>
-        <div class="mb-1">
-            Email: <b>{{ $patient->email_address }}</b>
-        </div>
-    </div>
+        </span>
 
-    <hr class="m-negator my-3">
-    <span>MCP: <b>{{ $patient->mcp ? $patient->mcp->displayName() : '-' }}</b></span>
-    @if($pro->pro_type == 'ADMIN')
-    <div moe class="ml-2">
-        <a start show><i class="fa fa-edit"></i></a>
-        <form url="/api/client/putMcp" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-                <label class="text-secondary text-sm">MCP Pro</label>
-                <select name="mcpProUid" class="form-control form-control-sm">
-                    <option value=""> --select-- </option>
-                    @foreach($pros as $iPro)
-                        <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                    @endforeach
-                </select>
-            </div>
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-            </div>
-        </form>
-    </div>
-    @endif
-
-    <hr class="m-negator my-3">
-    <span>Physician: <b>{{ $patient->pcp ? $patient->pcp->displayName() : '-' }}</b></span>
-    @if($pro->pro_type == 'ADMIN')
-        <div moe class="ml-2">
+        <hr class="m-negator my-3">
+        <span>Initiative: <b>{{$patient->initiative ? $patient->initiative : 'N/A'}}</b></span>
+        <span moe class="ml-2">
             <a start show><i class="fa fa-edit"></i></a>
-            <form url="/api/client/putPhysicianPro" class="mcp-theme-1">
+            <form url="/api/client/updateInitiative" class="mcp-theme-1">
                 <input type="hidden" name="uid" value="{{$patient->uid}}">
                 <div class="mb-2">
-                    <label class="text-secondary text-sm">Physician Pro</label>
-                    <select name="physicianProUid" class="form-control form-control-sm">
-                        <option value=""> --select-- </option>
-                        @foreach($pros as $iPro)
-                            <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                    <select name="initiative" class="form-control">
+                        <option value="">-- select --</option>
+                        @foreach($intiatives as $initiative)
+                            <option value="{{$initiative}}">{{$initiative}}</option>
                         @endforeach
                     </select>
                 </div>
@@ -189,68 +286,70 @@
                     <button cancel class="btn btn-sm btn-default border">Cancel</button>
                 </div>
             </form>
+        </span>
+
+        <hr class="m-negator my-3">
+        <div id="preferredPharmacyApp">
+            <span>Preferred Pharmacy: <b>@{{ pharmacy() }}</b></span>
+            <span moe bottom relative large class="ml-2">
+                <a start show><i class="fa fa-edit"></i></a>
+                <form url="/api/client/updatePreferredPharmacyDetail" class="mcp-theme-1">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <input type="hidden" name="preferredPharmacyDetail" v-model="json">
+                    <div class="row mb-2">
+                        <div class="col-12">
+                            <label class="text-sm text-secondary mb-1">Business Name</label>
+                            <input type="text" v-model="payload.pharmacyName" class="form-control form-control-sm">
+                        </div>
+                    </div>
+                    <div class="row mb-2">
+                        <div class="col-6">
+                            <label class="text-sm text-secondary mb-1">City</label>
+                            <input type="text" v-model="payload.pharmacyCity" class="form-control form-control-sm">
+                        </div>
+                        <div class="col-6">
+                            <label class="text-sm text-secondary mb-1">State</label>
+                            <input type="text" v-model="payload.pharmacyState" class="form-control form-control-sm">
+                        </div>
+                    </div>
+                    <div class="row mb-2">
+                        <div class="col-12">
+                            <label class="text-sm text-secondary mb-1">Address Memo</label>
+                            <input type="text" v-model="payload.pharmacyAddressMemo" class="form-control form-control-sm">
+                        </div>
+                    </div>
+                    <div class="row mb-2">
+                        <div class="col-6">
+                            <label class="text-sm text-secondary mb-1">Phone</label>
+                            <input type="text" v-model="payload.pharmacyPhone" class="form-control form-control-sm">
+                        </div>
+                        <div class="col-6">
+                            <label class="text-sm text-secondary mb-1">Fax</label>
+                            <input type="text" v-model="payload.pharmacyFax" class="form-control form-control-sm">
+                        </div>
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </span>
         </div>
-    @endif
 
-    <hr class="m-negator my-3">
-    <span>MCP Onboarding Visit: <b>{{ $patient->has_mcp_done_onboarding_visit }}</b></span>
-    <span moe class="ml-2">
-        <a start show><i class="fa fa-edit"></i></a>
-        <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2">
-                <select name="hasMcpDoneOnboardingVisit"
-                        class="form-control form-control-sm"
-                        onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
-                    <option value="">-- Select Status --</option>
-                    <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
-                    <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
-                    <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                </select>
-            </div>
-            <div class="mb-2">
-                <input type="date" class="if-visit-done form-control form-control-sm" disabled
-                       name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
-            </div>
-            <div class="mb-2">
-                <select name="mcpOnboardingVisitNoteUid" disabled
-                        class="form-control form-control-sm if-visit-done"
-                        onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
-                    <option value="">-- Visit Note --</option>
-                    @foreach ($notes as $note)
-                        @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
-                            <option
-                                {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }}
-                                value="{{$note->uid}}">{{$note->title}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
-                        @endif
-                    @endforeach
-                    {{--<option value="-- create --">-- Create Note --</option>--}}
-                </select>
-            </div>
-            <div class="mb-2 if-note-outside-system">
-                <textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
-            </div>
-            <div>
-                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-            </div>
-        </form>
-    </span>
     </div>
 
     <script>
-        window.setSettingsMailingAddress = function() {
+        window.setSettingsMailingAddress = function () {
             copyHomeToMailingAndReadOnly($('#settingsSameAsHome').is(':checked'));
         }
-        window.copyHomeToMailingAndReadOnly = function(_same) {
-            if(_same) {
+        window.copyHomeToMailingAndReadOnly = function (_same) {
+            if (_same) {
                 $('[name="mailingAddressLine1"]').val($('[name="homeAddressLine1"]').val()).prop('readonly', true);
                 $('[name="mailingAddressLine2"]').val($('[name="homeAddressLine2"]').val()).prop('readonly', true);
                 $('[name="mailingAddressCity"]').val($('[name="homeAddressCity"]').val()).prop('readonly', true);
                 $('[name="mailingAddressState"]').val($('[name="homeAddressState"]').val()).prop('readonly', true);
                 $('[name="mailingAddressZip"]').val($('[name="homeAddressZip"]').val()).prop('readonly', true);
-            }
-            else {
+            } else {
                 $('[name="mailingAddressLine1"]').prop('readonly', false);
                 $('[name="mailingAddressLine2"]').prop('readonly', false);
                 $('[name="mailingAddressCity"]').prop('readonly', false);
@@ -260,10 +359,91 @@
             }
         }
         @if($isSame)
-            function init() {
-                copyHomeToMailingAndReadOnly(true);
-            }
-            addMCInitializer('copy-mailing-address', init, '#client-settings-container');
+        function init() {
+            copyHomeToMailingAndReadOnly(true);
+        }
+
+        addMCInitializer('copy-mailing-address', init, '#client-settings-container');
         @endif
     </script>
+
+    <script>
+        <?php
+        $display = '-';
+        if (!empty($patient->preferred_pharmacy_detail)) {
+            $parsed = json_decode($patient->preferred_pharmacy_detail);
+            $parts = array_filter([
+                $parsed->pharmacyName,
+                $parsed->pharmacyCity,
+                $parsed->pharmacyState,
+                $parsed->pharmacyAddressMemo,
+                $parsed->pharmacyPhone,
+                $parsed->pharmacyFax,
+            ], function ($_item) {
+                return !!$_item;
+            });
+            $display = implode(", ", $parts);
+        }
+        ?>
+        window.preferredPharmacyApp = new Vue({
+            el: '#preferredPharmacyApp',
+            delimiters: ['@{{', '}}'],
+            data: {
+                payload: {
+                    pharmacyName: '{{ @$parsed->pharmacyName }}',
+                    pharmacyCity: '{{ @$parsed->pharmacyCity }}',
+                    pharmacyState: '{{ @$parsed->pharmacyState }}',
+                    pharmacyAddressMemo: '{{ @$parsed->pharmacyAddressMemo }}',
+                    pharmacyPhone: '{{ @$parsed->pharmacyPhone }}',
+                    pharmacyFax: '{{ @$parsed->pharmacyFax }}'
+                },
+                loaded: {
+                    pharmacyName: '{{ @$parsed->pharmacyName }}',
+                    pharmacyCity: '{{ @$parsed->pharmacyCity }}',
+                    pharmacyState: '{{ @$parsed->pharmacyState }}',
+                    pharmacyAddressMemo: '{{ @$parsed->pharmacyAddressMemo }}',
+                    pharmacyPhone: '{{ @$parsed->pharmacyPhone }}',
+                    pharmacyFax: '{{ @$parsed->pharmacyFax }}'
+                },
+                json: '',
+            },
+            watch: {
+                payload: {
+                    handler: function(val, oldVal) {
+                        this.json = JSON.stringify({
+                            pharmacyName: this.payload.pharmacyName,
+                            pharmacyCity: this.payload.pharmacyCity,
+                            pharmacyState: this.payload.pharmacyState,
+                            pharmacyAddressMemo: this.payload.pharmacyAddressMemo,
+                            pharmacyPhone: this.payload.pharmacyPhone,
+                            pharmacyFax: this.payload.pharmacyFax
+                        });
+                    },
+                    deep: true
+                },
+            },
+            methods: {
+                pharmacy: function() {
+                    return [
+                        this.loaded.pharmacyName,
+                        this.loaded.pharmacyCity,
+                        this.loaded.pharmacyState,
+                        this.loaded.pharmacyAddressMemo,
+                        this.loaded.pharmacyPhone,
+                        this.loaded.pharmacyFax,
+                    ].filter(Boolean).join(', ');
+                }
+            },
+            mounted: function() {
+                this.json = JSON.stringify({
+                    pharmacyName: this.payload.pharmacyName,
+                    pharmacyCity: this.payload.pharmacyCity,
+                    pharmacyState: this.payload.pharmacyState,
+                    pharmacyAddressMemo: this.payload.pharmacyAddressMemo,
+                    pharmacyPhone: this.payload.pharmacyPhone,
+                    pharmacyFax: this.payload.pharmacyFax
+                });
+            }
+        })
+    </script>
 @endsection

+ 468 - 420
resources/views/layouts/patient.blade.php

@@ -17,10 +17,14 @@
                             <a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
                         </li>
-                            <li class="nav-item">
-                                <a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
-                                   href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
-                            </li>
+                        <li class="nav-item">
+                            <a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
+                               href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}"
+                               href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
@@ -29,10 +33,6 @@
                             <a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
                         </li>
-                        {{--<li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
-                        </li>--}}
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
@@ -45,36 +45,36 @@
                             <a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
                         </li>
-                            <li class="nav-item">
-                                <a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
-                                   native onclick="return false">
-                                    <span class="text-dark">ERx/Orders</span>
-                                    {{--<i class="fa if-collapsed fa-chevron-down text-secondary ml-auto mr-1"></i>
-                                    <i class="fa if-not-collapsed fa-chevron-up text-secondary ml-auto mr-1"></i>--}}
-                                </a>
-                                <ul class="m-0 p-0 nav-child-list">
-                                    <li class="nav-item">
-                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
-                                           href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
-                                           href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
-                                           href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
-                                    </li>
-                                    <li class="nav-item">
-                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
-                                           href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
-                                    </li>
-                                    {{--<li class="nav-item">
-                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-other') === 0 ? 'active' : '' }}"
-                                           href="{{ route('patients.view.action-items-other', ['patient' => $patient]) }}">Other</a>
-                                    </li>--}}
-                                </ul>
-                            </li>
+                        <li class="nav-item">
+                            <a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
+                               native onclick="return false">
+                                <span class="text-dark">ERx/Orders</span>
+                                {{--<i class="fa if-collapsed fa-chevron-down text-secondary ml-auto mr-1"></i>
+                                <i class="fa if-not-collapsed fa-chevron-up text-secondary ml-auto mr-1"></i>--}}
+                            </a>
+                            <ul class="m-0 p-0 nav-child-list">
+                                <li class="nav-item">
+                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
+                                       href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
+                                       href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
+                                       href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
+                                       href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
+                                </li>
+                                {{--<li class="nav-item">
+                                    <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-other') === 0 ? 'active' : '' }}"
+                                       href="{{ route('patients.view.action-items-other', ['patient' => $patient]) }}">Other</a>
+                                </li>--}}
+                            </ul>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
@@ -85,7 +85,8 @@
                         </li>
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and Focus Areas</a>
+                               href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
+                                Focus Areas</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}"
@@ -169,146 +170,164 @@
                 <div class="card mt-3">
                     <div class="card-header py-1">
                         <?php
-                            $thumbnail = $patient->profile_picture_base64;
-                            $initials = !$thumbnail ? substr($patient->name_first, 0, 1).substr($patient->name_last, 0, 1) : '';
-                            $online = $patient->is_online ? 'online' : '';
-                            $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
+                        $thumbnail = $patient->profile_picture_base64;
+                        $initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
+                        $online = $patient->is_online ? 'online' : '';
+                        $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
 
-                            $confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
-                            $confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
+                        $confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
+                        $confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
 
-                            $location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
-                            $location = empty($location) ? '-' : $location;
+                        $location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
+                        $location = empty($location) ? '-' : $location;
 
-                            $mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
-                            $cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
+                        $mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
+                        $cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
 
-                            $memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
-                            if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
-                            else if ($memberSince > 1) $memberSince .= ' days ago';
-                            else if ($memberSince === 1) $memberSince = 'yesterday';
-                            else if ($memberSince === 0) $memberSince = 'today';
+                        $memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
+                        if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
+                        else if ($memberSince > 1) $memberSince .= ' days ago';
+                        else if ($memberSince === 1) $memberSince = 'yesterday';
+                        else if ($memberSince === 0) $memberSince = 'today';
                         ?>
 
                         <div class=z>
                             <div class=header>
-                            @if($patient->is_duplicate)
-                                <div class="alert alert-secondary border-dark mcp-theme-1">
-                                    <span class="text-dark">This chart is a duplicate of&nbsp;</span>
-                                    <a class="font-weight-bold" href="/patients/view/{{ $patient->duplicateOf->uid }}">
-                                        {{ $patient->duplicateOf->displayName() }}
-                                    </a>
-                                </div>
-                            @endif
-                            <div class=hbox>
-                                <div class="mr-1 patient-presence-indicator thumbnail {{$online}}"
-                                     data-patient-uid="{{$patient->uid}}"
-                                     style="background-image:<?=$thumbnail?>"><?=$initials?></div>
-                                {{--<div>
-                                    <div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
-                                        <i class="fa fa-microphone"></i>
-                                    </div>
-                                    <div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
-                                        <i class="fa fa-video"></i>
-                                    </div>
-                                </div>--}}
-                                <section>
-                                    <div class=hbox>
-                                        <h4>{{$patientName}}</h4>
-                                        <i class=chart>[#{{$patient->chart_number}}]</i>
+                                @if($patient->is_duplicate)
+                                    <div class="alert alert-secondary border-dark mcp-theme-1">
+                                        <span class="text-dark">This chart is a duplicate of&nbsp;</span>
+                                        <a class="font-weight-bold"
+                                           href="/patients/view/{{ $patient->duplicateOf->uid }}">
+                                            {{ $patient->duplicateOf->displayName() }}
+                                        </a>
                                     </div>
-                                    <div class=separators>
-                                        <div>{{friendly_date_time($patient->dob, false)}} ({{$patient->age_in_years}} y.o {{$patient->sex}})</div>
-                                        <div>
-                                            @if($patient->was_medicare_validation_successful && $patient->is_part_b_primary == 'YES')
-                                                Covered <span style="color:green"><i class="fa fa-check-circle"></i> </span>
-                                            @elseif($patient->was_medicare_validation_successful)
-                                                <span>
+                                @endif
+                                <div class=hbox>
+                                    <div class="mr-1 patient-presence-indicator thumbnail {{$online}}"
+                                         data-patient-uid="{{$patient->uid}}"
+                                         style="background-image:<?=$thumbnail?>"><?=$initials?></div>
+                                    {{--<div>
+                                        <div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
+                                            <i class="fa fa-microphone"></i>
+                                        </div>
+                                        <div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
+                                            <i class="fa fa-video"></i>
+                                        </div>
+                                    </div>--}}
+                                    <section>
+                                        <div class=hbox>
+                                            <h4>{{$patientName}}</h4>
+                                            <i class=chart>[#{{$patient->chart_number}}]</i>
+                                        </div>
+                                        <div class=separators>
+                                            <div>{{friendly_date_time($patient->dob, false)}}({{$patient->age_in_years}}
+                                                y.o {{$patient->sex}})
+                                            </div>
+                                            <div>
+                                                @if($patient->was_medicare_validation_successful && $patient->is_part_b_primary == 'YES')
+                                                    Covered <span style="color:green"><i class="fa fa-check-circle"></i> </span>
+                                                @elseif($patient->was_medicare_validation_successful)
+                                                    <span>
                                                     @if($patient->is_part_b_primary == 'YES')
-                                                        Medicare Part B
-                                                    @else
-                                                        Not Medicare Part B <i class="fa fa-times"></i>
-                                                        @if($patient->is_medicare_advantage == 'YES')
-                                                            , Medicare Advantage,
-                                                            {{$patient->medicare_advantage_plan}}
-                                                        @endif
-                                                    @endif
-                                                </span>
-                                            @else
-                                                <div moe>
-                                                    <a href="" start show>
-                                                        @if($patient->mcn)
-                                                            {{$patient->mcn}} Invalid MCN <i class="fa fa-times"></i>
+                                                            Medicare Part B
                                                         @else
-                                                            No Info Provided
+                                                            Not Medicare Part B <i class="fa fa-times"></i>
+                                                            @if($patient->is_medicare_advantage == 'YES')
+                                                                , Medicare Advantage,
+                                                                {{$patient->medicare_advantage_plan}}
+                                                            @endif
                                                         @endif
-                                                    </a>
-                                                    <form url="/api/client/putMedicareInfo" class="mcp-theme-1">
-                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="nameFirst"
-                                                                   value="{{$patient->name_first}}"
-                                                                   placeholder="First Name">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="nameLast"
-                                                                   value="{{$patient->name_last}}"
-                                                                   placeholder="Last Name">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="date" class="form-control form-control-sm" name="dob"
-                                                                   value="{{$patient->dob}}"
-                                                                   placeholder="Date of Birth">
-                                                        </div>
-                                                        <div class="mb-2">
-                                                            <input type="text" class="form-control form-control-sm" name="mcn"
-                                                                   value="{{$patient->mcn}}"
-                                                                   placeholder="Medicare Number">
-                                                        </div>
-                                                        <div>
-                                                            <button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-                                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            @endif
+                                                </span>
+                                                @else
+                                                    <div moe>
+                                                        <a href="" start show>
+                                                            @if($patient->mcn)
+                                                                {{$patient->mcn}} Invalid MCN <i
+                                                                    class="fa fa-times"></i>
+                                                            @else
+                                                                No Info Provided
+                                                            @endif
+                                                        </a>
+                                                        <form url="/api/client/putMedicareInfo" class="mcp-theme-1">
+                                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                            <div class="mb-2">
+                                                                <input type="text" class="form-control form-control-sm"
+                                                                       name="nameFirst"
+                                                                       value="{{$patient->name_first}}"
+                                                                       placeholder="First Name">
+                                                            </div>
+                                                            <div class="mb-2">
+                                                                <input type="text" class="form-control form-control-sm"
+                                                                       name="nameLast"
+                                                                       value="{{$patient->name_last}}"
+                                                                       placeholder="Last Name">
+                                                            </div>
+                                                            <div class="mb-2">
+                                                                <input type="date" class="form-control form-control-sm"
+                                                                       name="dob"
+                                                                       value="{{$patient->dob}}"
+                                                                       placeholder="Date of Birth">
+                                                            </div>
+                                                            <div class="mb-2">
+                                                                <input type="text" class="form-control form-control-sm"
+                                                                       name="mcn"
+                                                                       value="{{$patient->mcn}}"
+                                                                       placeholder="Medicare Number">
+                                                            </div>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-primary mr-2">
+                                                                    Submit
+                                                                </button>
+                                                                <button cancel class="btn btn-sm btn-default border">
+                                                                    Cancel
+                                                                </button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @endif
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class=separators>
-                                        <div>Joined <?=$memberSince?></div>
-                                        <div><label>MCP:</label> {{$mcpName}}
-                                            @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
-                                                <div moe class="ml-2">
-                                                    <a start show><i class="fa fa-edit"></i></a>
-                                                    <form url="/api/client/putMcp" class="mcp-theme-1">
-                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                        <div class="mb-2">
-                                                            <label class="text-secondary text-sm">MCP Pro</label>
-                                                            <select name="mcpProUid" class="form-control form-control-sm">
-                                                                <option value=""> --select-- </option>
-                                                                @foreach($pros as $iPro)
-                                                                    <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                                                                @endforeach
-                                                            </select>
-                                                        </div>
-                                                        <div>
-                                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            @endif
+                                        <div class=separators>
+                                            <div>Joined <?=$memberSince?></div>
+                                            <div><label>MCP:</label> {{$mcpName}}
+                                                @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
+                                                    <div moe class="ml-2">
+                                                        <a start show><i class="fa fa-edit"></i></a>
+                                                        <form url="/api/client/putMcp" class="mcp-theme-1">
+                                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                            <div class="mb-2">
+                                                                <label class="text-secondary text-sm">MCP Pro</label>
+                                                                <select name="mcpProUid"
+                                                                        class="form-control form-control-sm">
+                                                                    <option value=""> --select--</option>
+                                                                    @foreach($pros as $iPro)
+                                                                        <option
+                                                                            value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                                                    @endforeach
+                                                                </select>
+                                                            </div>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-primary mr-1">
+                                                                    Submit
+                                                                </button>
+                                                                <button cancel class="btn btn-sm btn-default border">
+                                                                    Cancel
+                                                                </button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @endif
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div>
-                                        @if($patient->has_mcp_done_onboarding_visit !== 'YES')
-                                        <span class="text-dark d-inline-flex align-items-center">
+                                        <div>
+                                            @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+                                                <span class="text-dark d-inline-flex align-items-center">
                                             <span class="mr-2">
                                                 <i class="fa fa-exclamation-triangle"></i>
                                                 MCP Onboarding Visit Pending
                                             </span>
                                         </span>
-                                        <span moe>
+                                                <span moe>
                                             <a start show><i class="fa fa-edit"></i></a>
                                             <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
                                                 <input type="hidden" name="uid" value="{{$patient->uid}}">
@@ -323,8 +342,10 @@
                                                     </select>
                                                 </div>
                                                 <div class="mb-2">
-                                                    <input type="date" class="if-visit-done form-control form-control-sm" disabled
-                                                           name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
+                                                    <input type="date"
+                                                           class="if-visit-done form-control form-control-sm" disabled
+                                                           name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}"
+                                                           max="{{ date('Y-m-d') }}">
                                                 </div>
                                                 <div class="mb-2">
                                                     <select name="mcpOnboardingVisitNoteUid" disabled
@@ -342,7 +363,10 @@
                                                     </select>
                                                 </div>
                                                 <div class="mb-2 if-note-outside-system">
-                                                    <textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
+                                                    <textarea class="form-control form-control-sm"
+                                                              name="reasonOnboardingVisitNoteOutsideSystem"
+                                                              placeholder="Visit note outside the system reason"
+                                                              spellcheck="false" data-gramm="false"></textarea>
                                                 </div>
                                                 <div>
                                                     <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
@@ -350,298 +374,322 @@
                                                 </div>
                                             </form>
                                         </span>
-                                        @else
-                                        <span class="text-dark d-inline-flex align-items-center">
+                                            @else
+                                                <span class="text-dark d-inline-flex align-items-center">
                                             <span class="mr-2 text-secondary">
                                                 <i class="fa fa-check text-sm"></i>
                                                 MCP Onboarding Visit Completed
                                             </span>
                                         </span>
-                                        @endif
-                                    </div>
-                                    <div>
-                                        <label>Physician:</label> {{$patient->pcp ? $patient->pcp->displayName() : '-' }}
-                                        @if($pro->pro_type == 'ADMIN')
-                                        <div moe class="ml-2">
-                                            <a start show><i class="fa fa-edit"></i></a>
-                                            <form url="/api/client/putPhysicianPro" class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                <div class="mb-2">
-                                                    <label class="text-secondary text-sm">Physician Pro</label>
-                                                    <select name="physicianProUid" class="form-control form-control-sm">
-                                                        <option value=""> --select-- </option>
-                                                        @foreach($pros as $iPro)
-                                                            <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                            @endif
+                                        </div>
+                                        <div>
+                                            <label>Physician:</label> {{$patient->pcp ? $patient->pcp->displayName() : '-' }}
+                                            @if($pro->pro_type == 'ADMIN')
+                                                <div moe class="ml-2">
+                                                    <a start show><i class="fa fa-edit"></i></a>
+                                                    <form url="/api/client/putPhysicianPro" class="mcp-theme-1">
+                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                        <div class="mb-2">
+                                                            <label class="text-secondary text-sm">Physician Pro</label>
+                                                            <select name="physicianProUid"
+                                                                    class="form-control form-control-sm">
+                                                                <option value=""> --select--</option>
+                                                                @foreach($pros as $iPro)
+                                                                    <option
+                                                                        value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                        <div>
+                                                            <button submit class="btn btn-sm btn-primary mr-1">Submit
+                                                            </button>
+                                                            <button cancel class="btn btn-sm btn-default border">
+                                                                Cancel
+                                                            </button>
+                                                        </div>
+                                                    </form>
                                                 </div>
-                                            </form>
+                                            @endif
                                         </div>
-                                        @endif
-                                    </div>
-                                    <div>
-                                        <span class="text-dark d-inline-flex align-items-center">
-                                            <span class="mr-2">
-                                                Intiative: {{$patient->initiative}}
+                                    </section>
+                                    {{--<section>
+                                        <div>
+                                            <label>Next Appt:</label>
+                                            <?php
+                                            $nextAppointment = $patient->nextMcpAppointment();
+                                            $startTime = false;
+                                            $endTime = false;
+                                            if($nextAppointment) {
+                                                $startTime = date('H:i', strtotime($nextAppointment->start_time));
+                                                $endTime = date('H:i', strtotime($nextAppointment->end_time));
+                                                $nextAppointment = date('Y-m-d', strtotime($nextAppointment->start_time));
+                                            }
+                                            ?>
+                                            {{$nextAppointment ? friendly_date_time($nextAppointment . ($startTime ? ' ' . $startTime : ''), true, '') : '-'}}
+                                            <span moe relative class="ml-1">
+                                                <a start show><i class="fa fa-edit"></i></a>
+                                                <form url="/api/appointment/create" class="mcp-theme-1" right>
+                                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                                    <input type="hidden" name="title" value="MCP Appointment">
+                                                    <div class="mb-2">
+                                                        <label class="text-secondary text-sm">Pro</label>
+                                                        <select name="proUid" class="form-control form-control-sm">
+                                                            <option value=""> --select-- </option>
+                                                            @foreach($pros as $iPro)
+                                                                <option value="{{$iPro->uid}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                                            @endforeach
+                                                        </select>
+                                                    </div>
+                                                    <div class="mb-2">
+                                                        <label class="text-secondary text-sm">Date</label>
+                                                        <input type="date" name="date" min="{{ date('Y-m-d') }}"
+                                                               value="{{ $nextAppointment ? $nextAppointment : date('Y-m-d') }}"
+                                                               class="form-control form-control-sm">
+                                                    </div>
+                                                    <div class="mb-2">
+                                                        <label class="text-secondary text-sm">Start Time</label>
+                                                        <input type="time" name="startTime" class="form-control form-control-sm"
+                                                               value="{{ $startTime ? $startTime : '' }}">
+                                                    </div>
+                                                    <div class="mb-2">
+                                                        <label class="text-secondary text-sm">End Time</label>
+                                                        <input type="time" name="endTime" class="form-control form-control-sm"
+                                                               value="{{ $endTime ? $endTime : '' }}">
+                                                    </div>
+                                                    <div>
+                                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                    </div>
+                                                </form>
                                             </span>
-                                        </span>
-                                        <span moe>
-                                            <a start show><i class="fa fa-edit"></i></a>
-                                            <form url="/api/client/updateInitiative" class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                <div class="mb-2">
-                                                    <select name="initiative" class="form-control">
-                                                        <option value="">-- select --</option>
-                                                        @foreach($intiatives as $initiative)
-                                                        <option value="{{$initiative}}">{{$initiative}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </span>
-
-                                    </div>
-                                </section>
-                                {{--<section>
-                                    <div>
-                                        <label>Next Appt:</label>
-                                        <?php
-                                        $nextAppointment = $patient->nextMcpAppointment();
-                                        $startTime = false;
-                                        $endTime = false;
-                                        if($nextAppointment) {
-                                            $startTime = date('H:i', strtotime($nextAppointment->start_time));
-                                            $endTime = date('H:i', strtotime($nextAppointment->end_time));
-                                            $nextAppointment = date('Y-m-d', strtotime($nextAppointment->start_time));
-                                        }
-                                        ?>
-                                        {{$nextAppointment ? friendly_date_time($nextAppointment . ($startTime ? ' ' . $startTime : ''), true, '') : '-'}}
-                                        <span moe relative class="ml-1">
-                                            <a start show><i class="fa fa-edit"></i></a>
-                                            <form url="/api/appointment/create" class="mcp-theme-1" right>
+                                        </div>
+                                        <div>
+                                            <label>CM:</label> {{ $patient->is_enrolled_in_cm === 'YES' ? 'Yes' : 'No' }}
+                                            <label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
+                                        </div>
+                                    </section>--}}
+                                    <section class="vbox mt-2 align-self-start ml-4">
+                                        <div moe>
+                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
+                                            </button>
+                                            <form url="/api/note/createUsingTemplate"
+                                                  redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
+                                                  class="mcp-theme-1">
                                                 <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                <input type="hidden" name="title" value="MCP Appointment">
-                                                <div class="mb-2">
-                                                    <label class="text-secondary text-sm">Pro</label>
-                                                    <select name="proUid" class="form-control form-control-sm">
-                                                        <option value=""> --select-- </option>
-                                                        @foreach($pros as $iPro)
-                                                            <option value="{{$iPro->uid}}" {{ $iPro->uid === $pro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                                <input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
+                                                <input type="hidden" name="effectiveDateEST" value="{{date("Y-m-d")}}">
+                                                <input type="hidden" name="effectiveTime" value="{{date("h:i")}}">
+                                                <input type="hidden" name="title" id="note-create-title" value="">
+                                                <div class="form-group mb-2">
+                                                    <label for="" class="text-secondary text-sm mb-1">Note Template
+                                                        *</label>
+                                                    <select name="noteTemplateUid" class="form-control form-control-sm"
+                                                            onchange="$('#note-create-title').val($(this).find('option:selected').text())"
+                                                            required>
+                                                        <option value=""> --select--</option>
+                                                        @foreach($pro->noteTemplates as $noteTemplate)
+                                                            <?php $nT = $noteTemplate->template(); ?>
+                                                            <option value="{{$nT->uid}}">{{$nT->title}}</option>
                                                         @endforeach
                                                     </select>
                                                 </div>
-                                                <div class="mb-2">
-                                                    <label class="text-secondary text-sm">Date</label>
-                                                    <input type="date" name="date" min="{{ date('Y-m-d') }}"
-                                                           value="{{ $nextAppointment ? $nextAppointment : date('Y-m-d') }}"
-                                                           class="form-control form-control-sm">
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label class="text-secondary text-sm">Start Time</label>
-                                                    <input type="time" name="startTime" class="form-control form-control-sm"
-                                                           value="{{ $startTime ? $startTime : '' }}">
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label class="text-secondary text-sm">End Time</label>
-                                                    <input type="time" name="endTime" class="form-control form-control-sm"
-                                                           value="{{ $endTime ? $endTime : '' }}">
-                                                </div>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                <div class="form-group m-0">
+                                                    <button submit class="btn btn-primary btn-sm">submit</button>
                                                 </div>
                                             </form>
-                                        </span>
-                                    </div>
-                                    <div>
-                                        <label>CM:</label> {{ $patient->is_enrolled_in_cm === 'YES' ? 'Yes' : 'No' }}
-                                        <label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
-                                    </div>
-                                </section>--}}
-                                <section class="vbox mt-2 align-self-start ml-4">
-                                    <div moe>
-                                        <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note</button>
-                                        <form url="/api/note/createUsingTemplate"
-                                              redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
-                                              class="mcp-theme-1">
-                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
-                                            <input type="hidden" name="effectiveDateEST" value="{{date("Y-m-d")}}">
-                                            <input type="hidden" name="effectiveTime" value="{{date("h:i")}}">
-                                            <input type="hidden" name="title" id="note-create-title" value="">
-                                            <div class="form-group mb-2">
-                                                <label for="" class="text-secondary text-sm mb-1">Note Template *</label>
-                                                <select name="noteTemplateUid" class="form-control form-control-sm"
-                                                        onchange="$('#note-create-title').val($(this).find('option:selected').text())" required>
-                                                    <option value=""> --select-- </option>
-                                                    @foreach($pro->noteTemplates as $noteTemplate)
-                                                    <?php $nT = $noteTemplate->template(); ?>
-                                                    <option value="{{$nT->uid}}">{{$nT->title}}</option>
-                                                    @endforeach
-                                                </select>
-                                            </div>
-                                            <div class="form-group m-0">
-                                                <button submit class="btn btn-primary btn-sm">submit</button>
+                                        </div>
+                                        <div>
+                                            <div moe relative>
+                                                <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
+                                                </button>
+                                                <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
+                                                    <input type="hidden" name="uid" value="{{ $patient->uid }}">
+                                                    <div class="mb-2">
+                                                        <label for="" class="text-sm text-secondary mb-1">Cell
+                                                            Number</label>
+                                                        <input type="text" class="form-control form-control-sm"
+                                                               name="cellNumber" value="{{$patient->cell_number}}">
+                                                    </div>
+                                                    <div class="mb-2">
+                                                        <label for=""
+                                                               class="text-sm text-secondary mb-1">Message</label>
+                                                        <textarea type="text" class="form-control form-control-sm"
+                                                                  name="message"></textarea>
+                                                    </div>
+                                                    <div class="d-flex align-items-center">
+                                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>
+                                                            Cancel
+                                                        </button>
+                                                    </div>
+                                                </form>
                                             </div>
-                                        </form>
-                                    </div>
-                                    <div>
-                                        <div moe relative>
-                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS</button>
-                                            <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
+                                        </div>
+                                        <div>
+                                            <button onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Video&nbsp;<i
+                                                    class="fa fa-play text-secondary"></i></button>
+                                        </div>
+                                        <div>
+                                        <span moe relative class="">
+                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i
+                                                    class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
+                                            <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right
+                                                  class="mcp-theme-1">
                                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
+                                                <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
                                                 <div class="mb-2">
-                                                    <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
-                                                    <input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$patient->cell_number}}">
+                                                    <label for=""
+                                                           class="text-sm text-secondary mb-1">Cell Number</label>
+                                                    <input type="text" class="form-control input-sm" name="cellNumber"
+                                                           value="{{$patient->cell_number}}">
                                                 </div>
                                                 <div class="mb-2">
-                                                    <label for="" class="text-sm text-secondary mb-1">Message</label>
-                                                    <textarea type="text" class="form-control form-control-sm" name="message"></textarea>
+                                                    <label for=""
+                                                           class="text-sm text-secondary mb-1">Email address</label>
+                                                    <input type="text" class="form-control input-sm" name="emailAddress"
+                                                           value="{{$patient->email_address}}">
                                                 </div>
                                                 <div class="d-flex align-items-center">
                                                     <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    <button class="btn btn-sm btn-default mr-2 border"
+                                                            cancel>Cancel</button>
                                                 </div>
                                             </form>
+                                        </span>
                                         </div>
-                                    </div>
-                                    <div>
-                                        <button onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Video&nbsp;<i class="fa fa-play text-secondary"></i></button>
-                                    </div>
-                                    <div>
-                                        <span moe relative class="">
-                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
-                                            <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                                                <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
-                                                <div class="mb-2">
-                                                    <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
-                                                    <input type="text" class="form-control input-sm" name="cellNumber" value="{{$patient->cell_number}}">
+                                    </section>
+                                    <section class="vbox mt-2 align-self-start ml-2">
+                                        <div class="">
+                                            @if($pro->isWorkingOnClient($patient))
+                                                {{-- stop work on client --}}
+                                                <div moe>
+                                                    <form url="/api/proClientWork/KillRunningWorkForSelf"
+                                                          class="mcp-theme-1" show>
+                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                        <div>
+                                                            <button submit><i class="fa fa-stop text-secondary"></i>&nbsp;Work:
+                                                                Stop
+                                                            </button>
+                                                        </div>
+                                                    </form>
                                                 </div>
-                                                <div class="mb-2">
-                                                    <label for="" class="text-sm text-secondary mb-1">Email address</label>
-                                                    <input type="text" class="form-control input-sm" name="emailAddress" value="{{$patient->email_address}}">
+                                            @else
+                                                {{-- start work on client --}}
+                                                <div moe>
+                                                    <form url="/api/proClientWork/create" class="mcp-theme-1" show>
+                                                        <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                                        <div>
+                                                            <button submit><i class="fa fa-play text-secondary"></i>&nbsp;Work:
+                                                                Start
+                                                            </button>
+                                                        </div>
+                                                    </form>
                                                 </div>
+                                            @endif
+                                        </div>
+                                        <div class="mr-auto">
+                                            @if($pro->isWorkingOnClient($patient))
                                                 <div class="d-flex align-items-center">
-                                                    <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                    @if($patient->active_mcp_request_id)
+                                                        {{-- kill mcp request for client --}}
+                                                        <div moe relative class="">
+                                                            <button href="" start show class="on-hover-opaque"><i
+                                                                    class="fa fa-times text-danger"></i>&nbsp;MCP Req.
+                                                            </button>
+                                                            <form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
+                                                                <input type="hidden" name="clientUid"
+                                                                       value="{{$patient->uid}}">
+                                                                <p>Kill the MCP Request for this patient?</p>
+                                                                <div>
+                                                                    <button submit class="btn btn-sm btn-primary mr-2">
+                                                                        Yes
+                                                                    </button>
+                                                                    <button cancel
+                                                                            class="btn btn-sm btn-default border">Cancel
+                                                                    </button>
+                                                                </div>
+                                                            </form>
+                                                        </div>
+                                                    @else
+                                                        {{-- create mcp request for client --}}
+                                                        <div moe relative class="">
+                                                            <button href="" start show><i
+                                                                    class="fa fa-plus text-sm text-secondary"></i>&nbsp;MCP
+                                                                Req.
+                                                            </button>
+                                                            <form url="/api/mcpRequest/createAsPro" class="mcp-theme-1"
+                                                                  right>
+                                                                <p>Create an MCP Request for this patient?</p>
+                                                                <div>
+                                                                    <button submit class="btn btn-sm btn-primary mr-2">
+                                                                        Yes
+                                                                    </button>
+                                                                    <button cancel
+                                                                            class="btn btn-sm btn-default border">Cancel
+                                                                    </button>
+                                                                </div>
+                                                            </form>
+                                                        </div>
+                                                    @endif
                                                 </div>
-                                            </form>
-                                        </span>
-                                    </div>
-                                </section>
-                                <section class="vbox mt-2 align-self-start ml-2">
-                                    <div class="">
-                                        @if($pro->isWorkingOnClient($patient))
-                                            {{-- stop work on client --}}
-                                            <div moe>
-                                                <form url="/api/proClientWork/KillRunningWorkForSelf" class="mcp-theme-1" show>
-                                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                                    <div>
-                                                        <button submit><i class="fa fa-stop text-secondary"></i>&nbsp;Work: Stop</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @else
-                                            {{-- start work on client --}}
-                                            <div moe>
-                                                <form url="/api/proClientWork/create" class="mcp-theme-1" show>
-                                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                    <div>
-                                                        <button submit><i class="fa fa-play text-secondary"></i>&nbsp;Work: Start</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @endif
-                                    </div>
-                                    <div class="mr-auto">
-                                        @if($pro->isWorkingOnClient($patient))
-                                            <div class="d-flex align-items-center">
-                                                @if($patient->active_mcp_request_id)
-                                                    {{-- kill mcp request for client --}}
-                                                    <div moe relative class="">
-                                                        <button href="" start show class="on-hover-opaque"><i class="fa fa-times text-danger"></i>&nbsp;MCP Req.</button>
-                                                        <form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
-                                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                                            <p>Kill the MCP Request for this patient?</p>
-                                                            <div>
-                                                                <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </div>
-                                                @else
-                                                    {{-- create mcp request for client --}}
-                                                    <div moe relative class="">
-                                                        <button href="" start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;MCP Req.</button>
-                                                        <form url="/api/mcpRequest/createAsPro" class="mcp-theme-1" right>
-                                                            <p>Create an MCP Request for this patient?</p>
-                                                            <div>
-                                                                <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </div>
-                                                @endif
-                                            </div>
-                                        @endif
-                                    </div>
-                                </section>
+                                            @endif
+                                        </div>
+                                    </section>
 
-                                <ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
-                                    <li class="d-flex align-items-start">
-                                        <span class="aligned-icon"><i class="fa fa-map-marker-alt" aria-hidden="true"></i></span>
-                                        <div class="position-relative">
-                                            <?php
-                                            $addressParts = [];
-                                            if(!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
-                                            if(!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
-                                            $addressParts = implode(", ", $addressParts) . "<br/>";
-                                            $addressPart2 = [];
-                                            if(!!$patient->mailing_address_city) $addressPart2[] = $patient->mailing_address_city;
-                                            if(!!$patient->mailing_address_state) $addressPart2[] = $patient->mailing_address_state;
-                                            $addressParts .= implode(", ", $addressPart2);
-                                            echo $addressParts;
-                                            ?>
-                                            {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
-                                            @if($patient->mailing_address_memo)
-                                                <span class="position-relative c-pointer text-center stag-tooltip ml-2">
+                                    <ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
+                                        <li class="d-flex align-items-start">
+                                            <span class="aligned-icon"><i class="fa fa-map-marker-alt"
+                                                                          aria-hidden="true"></i></span>
+                                            <div class="position-relative">
+                                                <?php
+                                                $addressParts = [];
+                                                if (!!$patient->mailing_address_line1) $addressParts[] = $patient->mailing_address_line1;
+                                                if (!!$patient->mailing_address_line2) $addressParts[] = $patient->mailing_address_line2;
+                                                $addressParts = implode(", ", $addressParts) . "<br/>";
+                                                $addressPart2 = [];
+                                                if (!!$patient->mailing_address_city) $addressPart2[] = $patient->mailing_address_city;
+                                                if (!!$patient->mailing_address_state) $addressPart2[] = $patient->mailing_address_state;
+                                                $addressParts .= implode(", ", $addressPart2);
+                                                echo $addressParts;
+                                                ?>
+                                                {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
+                                                @if($patient->mailing_address_memo)
+                                                    <span
+                                                        class="position-relative c-pointer text-center stag-tooltip ml-2">
                                                     <i class="fa fa-info-circle"></i>
-                                                    <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                                                    <div
+                                                        class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
                                                         <div class="text-left font-weight-bold pb-1">Special Instructions</div>
-                                                        <div class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
+                                                        <div
+                                                            class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
                                                     </div>
                                                 </span>
-                                            @endif
-                                        </div>
-                                    </li>
-                                    @if($patient->cell_number)
-                                    <li>
-                                        <span class="aligned-icon"><i class="fa fa-phone-alt" aria-hidden="true"></i></span>
-                                        {{$patient->cell_number}}
-                                    </li>
-                                    @endif
-                                    @if($patient->phone_home)
-                                    <li>
-                                        <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
-                                        {{$patient->phone_home}}
-                                    </li>
-                                    @endif
-                                    <li>
-                                        <span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
-                                        {{$confirmedEmail}}
-                                    </li>
-                                </ul>
+                                                @endif
+                                            </div>
+                                        </li>
+                                        @if($patient->cell_number)
+                                            <li>
+                                                <span class="aligned-icon"><i class="fa fa-phone-alt"
+                                                                              aria-hidden="true"></i></span>
+                                                {{$patient->cell_number}}<span
+                                                    class="small text-secondary ml-1">{{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}</span>
+                                            </li>
+                                        @endif
+                                        @if($patient->phone_home)
+                                            <li>
+                                                <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
+                                                {{$patient->phone_home}}
+                                            </li>
+                                        @endif
+                                        <li>
+                                            <span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
+                                            {{$confirmedEmail}}
+                                        </li>
+                                    </ul>
+                                </div>
                             </div>
-                        </div></div> <!-- z -->
+                        </div> <!-- z -->
                     </div>
                     {{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
 

+ 44 - 0
spec/todo-11-24.txt

@@ -0,0 +1,44 @@
+
+------------------------------------------------------------------------
+	
+	phone number search
+	
+	!'programs' needs attention
+	
+	measurements fail on Robert Byrd, WHY 1160/something BP?
+	
+	erx/order creation logic - auto-manager/assign etc.
+	erx/order fields - fix them all!
+	
+	Stag FE: pro-pro access
+	
+	repeat the appointment reminder - the day before and day of!
+		* add email support for it
+		*** reminder text should include NP name and info.
+	
+	Time-zone weirdness
+
+	Emma Hopkins - supporter phone # w/ textable flag
+		ADD cell_number_memo
+		ADD field labels on moe
+
+	Add preferred pharmacy
+
+		client:
+			preferred_pharmacy_detail JSONB
+
+				FRONTED:
+					name
+					phone_number
+					...
+
+	why is Bruce Blackistone visible to Kierstan?
+		* why is this guy showing?
+		* pro access:
+				pro | client_access, ...
+
+	Lino Maker - apply the PLAN template creator to the Assessment part.
+	
+	Initiative is weird to show an NP.
+
+------------------------------------------------------------------------