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

app/Helpers/helpers.php

@@ -128,14 +128,21 @@ if(!function_exists('friendly_date_time')) {
     function friendly_date_time($value, $includeTime = true, $default = '-', $long_year=false) {
         if(!$value || empty($value)) return $default;
         try {
-            $result = strtotime($value);
+
+            $realTimezone = 'US/Eastern';
+            $date = new DateTime($value);
+            $date->setTimezone(new DateTimeZone($realTimezone));
+
+            return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
+
+            /*$result = strtotime($value);
             if($long_year){
                 $result = date("m/d/Y" . ($includeTime ? ", h:ia" : ""), $result);
             }else{
                 $result = date("m/d/y" . ($includeTime ? ", h:ia" : ""), $result);
             }
 
-            return $result;
+            return $result;*/
         }
         catch (Exception $e) {
             return $value;
@@ -147,9 +154,16 @@ if(!function_exists('friendlier_date_time')) {
     function friendlier_date_time($value, $includeTime = true, $default = '-') {
         if(!$value || empty($value)) return $default;
         try {
-            $result = strtotime($value);
+
+            $realTimezone = 'US/Eastern';
+            $date = new DateTime($value);
+            $date->setTimezone(new DateTimeZone($realTimezone));
+
+            return $date->format("m/d/y" . ($includeTime ? ", h:ia" : "")) . ($includeTime ? ' EST' : '');
+
+            /*$result = strtotime($value);
             $result = date("m/d/Y" . ($includeTime ? ", h:i a" : ""), $result);
-            return $result;
+            return $result;*/
         }
         catch (Exception $e) {
             return $value;

app/Http/Controllers/PracticeManagementController.php

@@ -431,12 +431,12 @@ class PracticeManagementController extends Controller
     public function myFavorites(Request $request, $filter = 'all')
     {
         $performer = $this->performer();
-        $myFavorites = ProFavorite::where('pro_id', $performer->pro_id)
-            ->where('is_removed', false);
+        $myFavorites = ProFavorite::where('pro_id', $performer->pro_id)->where('is_removed', false);
         if ($filter !== 'all') {
             $myFavorites = $myFavorites->where('category', $filter);
         }
         $myFavorites = $myFavorites
+            ->whereIn('category', ['allergy', 'medication', 'problem'])
             ->orderBy('category', 'asc')
             ->orderBy('position_index', 'asc')
             ->get();

app/Models/Client.php

@@ -85,6 +85,11 @@ class Client extends Model
         return $this->hasOne(Pro::class, 'id', 'default_na_pro_id');
     }
 
+    public function creator()
+    {
+        return $this->hasOne(Pro::class, 'id', 'created_by_pro_id');
+    }
+
     public function prosInMeetingWith()
     {
         return Pro::where('in_meeting_with_client_id', $this->id)->get();

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 39,
+    'asset_version' => 40,
 
     'temp_dir' => env('TEMP_DIR'),
 

public/css/style.css

@@ -1690,8 +1690,9 @@ button.note-templates-trigger-assessment {
 }
 .on-hover-show .on-hover-content {
     position: absolute;
-    width: 300px;
+    max-width: 300px;
     right: 0;
+    top: 100%;
     background: #fff;
     opacity: 0;
     padding: 0 0.75rem;
@@ -1700,7 +1701,6 @@ button.note-templates-trigger-assessment {
     pointer-events: none;
     transition: opacity 0.3s ease;
     z-index: 2;
-    top: 0;
 }
 .on-hover-show.left .on-hover-content {
     right: auto;
@@ -2685,4 +2685,44 @@ body.stag-scrollbar-scrolling .stag-scrollbar[stag-h-scrollbar] .stag-scrollbar-
 }
 .conditions-tree .condition-children {
     overflow: hidden;
+}
+table.stag-compact-grid>tbody>tr>td {
+    white-space: nowrap;
+    max-height: 1rem !important;
+}
+table.stag-compact-grid>tbody>tr>td>ul>li {
+    display: none;
+}
+table.stag-compact-grid>tbody>tr>td ul>li:nth-child(1) {
+    display: block;
+    margin-left: 0 !important;
+}
+table.stag-compact-grid>tbody>tr>td .alert {
+    padding: 0;
+    margin: 0;
+}
+table.stag-compact-grid>tbody>tr>td table>thead,
+table.stag-compact-grid>tbody>tr>td table>tbody tr{
+    display: none;
+}
+table.stag-compact-grid>tbody>tr>td table>tbody tr:nth-child(1) {
+    display: table-row;
+}
+table.stag-compact-grid>tbody>tr>td {
+    border-left: 1px solid #ddd;
+}
+table.stag-compact-grid>tbody>tr>td:first-child {
+    border-left: 0;
+}
+table tr td [if-details-view] {
+    display: block;
+}
+table tr td [if-grid-view] {
+    display: none;
+}
+table.stag-compact-grid>tbody>tr>td [if-details-view] {
+    display: none;
+}
+table.stag-compact-grid>tbody>tr>td [if-grid-view] {
+    display: block;
 }

resources/views/app/admin/patients-table-extended.blade.php

@@ -1,3 +1,9 @@
+<div>
+    <div class="pl-3 mb-3 d-inline-flex align-items-baseline">
+        <a href="#" native class="mr-3 text-decoration-none" onclick="$('#admin-patients-list-extended>table').addClass('stag-compact-grid'); return false;"><i class="fa fa-list text-sm"></i> Grid</a>
+        <a href="#" native class="text-decoration-none" onclick="$('#admin-patients-list-extended>table').removeClass('stag-compact-grid'); return false;"><i class="fa fa-file text-sm"></i> Details</a>
+    </div>
+</div>
 <div class="table-responsive border-top" style="height: calc(100vh - 280px)" id="admin-patients-list-extended">
     <table class="table p-0 m-0 table-sm table-striped border-bottom text-nowrap">
         <thead class="bg-light">
@@ -44,6 +50,11 @@
 						<i class="fa fa-info-circle ml-1"></i>
 						<div class="on-hover-content py-2 pl-3">
 							Created: <b class="m-0">{{friendly_date_time($patient->created_at)}}</b>
+                            @if($pro->pro_type === 'ADMIN')
+                                <div class="mt-1">
+                                    Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
+                                </div>
+                            @endif
 						</div>
 					</span>
                 </td>
@@ -76,11 +87,13 @@
                     {{-- {{$patient->lastMcpAppointment ? friendly_date_time($patient->lastMcpAppointment->raw_date.' '.$patient->lastMcpAppointment->raw_start_time) : '-'}}--}}
                 </td>
                 <td>{{$patient->nextMcpAppointment ? friendly_date_time($patient->nextMcpAppointment->raw_date.' '.$patient->nextMcpAppointment->raw_start_time) : '-'}}
-                    <br>
-                    {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
+                    <div if-details-view>
+                        {{$patient->nextMcpAppointment ? $patient->nextMcpAppointment->status : '-'}}
+                    </div>
                 </td>
 
                 <td class="p-0 pb-1">
+                    <div if-details-view>
                     @if(count($patient->activeNotes))
                         <?php $noteIndex = 0; ?>
                         @foreach ($patient->activeNotes as $note)
@@ -259,6 +272,10 @@
                             </div>
                         @endforeach
                     @endif
+                    </div>
+                    <div if-grid-view class="p-1">
+                        {{count($patient->activeNotes)}}
+                    </div>
                 </td>
 
                 <td>

resources/views/app/patient/appointments.blade.php

@@ -39,7 +39,7 @@
                     <tr>
                         <td>
                             <a href="/patients/view/{{$patient->uid}}/calendar/{{$appointment->uid}}" class="text-nowrap">
-                                {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
+                                {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}} <span class="text-sm">{{friendly_timezone($appointment->timezone)}}</span>
                             </a>
                         </td>
                         <td>{{ $appointment->pro->displayName() }}</pre></td>

resources/views/app/practice-management/my-favorites.blade.php

@@ -2,67 +2,190 @@
 
 @section('content')
 
-    <div class="p-3 mcp-theme-1">
-    <div class="card">
+    <div class="p-3 mcp-theme-1" id="my-favorites">
+        <div class="card">
 
-        <div class="card-header px-2 py-1 d-flex align-items-center">
-            <strong class="">
-                <i class="fas fa-user"></i>
-                Favorites
-            </strong>
-            <span class="ml-3 text-secondary">
-                You can add Allergy, Rx and Dx items to favorites from the respective sections
-            </span>
-            <select class="ml-auto max-width-300px form-control form-control-sm"
-                    onchange="fastLoad('/practice-management/my-favorites/' + this.value, true, false, false)">
-                <option value="allergies" {{ $filter === 'allergies' ? 'selected' : '' }}>Allergies</option>
-                <option value="rx" {{ $filter === 'rx' ? 'selected' : '' }}>Rx</option>
-                <option value="dx" {{ $filter === 'dx' ? 'selected' : '' }}>Dx</option>
-                <option value="all" {{ $filter === 'all' ? 'selected' : '' }}>All favorites</option>
-            </select>
-        </div>
-        <div class="card-body p-0">
-            <table class="table table-sm table-striped p-0 m-0">
-                <thead class="bg-light">
-                <tr>
-                    <th class="px-3 border-0 width-100px">Category</th>
-                    <th class="border-0">Content</th>
-                    <th class="border-0 w-25">&nbsp;</th>
-                </tr>
-                </thead>
-                <tbody>
-                @foreach($myFavorites as $favorite)
+            <div class="card-header px-2 py-1 d-flex align-items-center">
+                <strong class="">
+                    <i class="fas fa-user"></i>
+                    Favorites
+                </strong>
+                <span class="ml-4">Show:</span>
+                <select class="ml-2 width-150px form-control form-control-sm"
+                        onchange="fastLoad('/practice-management/my-favorites/' + this.value, true, false, false)">
+                    <option value="allergy" {{ $filter === 'allergy' ? 'selected' : '' }}>Allergy</option>
+                    <option value="medication" {{ $filter === 'medication' ? 'selected' : '' }}>Medication</option>
+                    <option value="problem" {{ $filter === 'problem' ? 'selected' : '' }}>Problem</option>
+                    <option value="all" {{ $filter === 'all' ? 'selected' : '' }}>All favorites</option>
+                </select>
+                <span class="ml-4 mr-2">+ New Favorite:</span>
+                <div moe relative>
+                    <a start show href="#">Allergy</a>
+                    <form url="/api/proFavorite/create">
+                        <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                        <input type="hidden" name="category" value="allergy">
+                        <input type="hidden" name="data" value="">
+                        <div class="mb-2">
+                            <label class="text-sm mb-0 font-weight-bold">Allergy *</label>
+                            <input type="text" class="form-control form-control-sm"
+                                   stag-suggest allergy stag-suggest-ep="/fdb-allergy-suggest/json" required>
+                        </div>
+                        <div class="form-group m-0">
+                            <button submit class="btn btn-primary btn-sm mr-2" disabled>Save</button>
+                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <div moe relative>
+                    <a start show href="#">Medication</a>
+                    <form url="/api/proFavorite/create">
+                        <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                        <input type="hidden" name="category" value="medication">
+                        <input type="hidden" name="data" value="">
+                        <div class="mb-2">
+                            <label class="text-sm mb-0 font-weight-bold">Medication *</label>
+                            <input type="text" class="form-control form-control-sm"
+                                   stag-suggest medication stag-suggest-ep="/fdb-med-suggest-v2/json" required>
+                        </div>
+                        <div class="form-group m-0">
+                            <button submit class="btn btn-primary btn-sm mr-2" disabled>Save</button>
+                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <div moe relative>
+                    <a start show href="#">Problem</a>
+                    <form url="/api/proFavorite/create">
+                        <input type="hidden" name="proUid" value="{{$pro->uid}}">
+                        <input type="hidden" name="category" value="problem">
+                        <input type="hidden" name="data" value="">
+                        <div class="mb-2">
+                            <label class="text-sm mb-0 font-weight-bold">Problem *</label>
+                            <input type="text" class="form-control form-control-sm"
+                                   stag-suggest problem stag-suggest-ep="/fdb-dx-suggest-v2/json" required>
+                        </div>
+                        <div class="form-group m-0">
+                            <button submit class="btn btn-primary btn-sm mr-2" disabled>Save</button>
+                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="card-body p-0">
+                <table class="table table-sm table-striped p-0 m-0">
+                    <thead class="bg-light">
                     <tr>
-                        <td class="px-3">{{ ucwords($favorite->category) }}</td>
-                        <td>
-                            <?php $parsed = json_decode($favorite->data); ?>
-                            {{ $parsed->title }}
-                        </td>
-                        <td>
-                            <div class="d-flex align-items-center">
-                                <div moe relative wide class="mr-2">
-                                    <a start show class="text-danger">
-                                        <i class="fa fa-trash-alt"></i>
-                                    </a>
-                                    <form url="/api/proFavorite/remove" right>
-                                        <input type="hidden" name="uid" value="{{$favorite->uid}}">
-                                        <p>
-                                            Are you sure you want to remove this from your favorites?
-                                        </p>
-                                        <div class="form-group m-0">
-                                            <button submit class="btn btn-danger btn-sm mr-2">Yes</button>
-                                            <button cancel class="btn btn-default border btn-sm mr-2">No</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            </div>
-                        </td>
+                        <th class="px-3 border-0 width-100px">Category</th>
+                        <th class="border-0">Content</th>
+                        <th class="border-0 min-width-500px">&nbsp;</th>
                     </tr>
-                @endforeach
-                </tbody>
-            </table>
+                    </thead>
+                    <tbody>
+                    @foreach($myFavorites as $favorite)
+                        <?php $parsed = json_decode($favorite->data); ?>
+                        <tr>
+                            <td class="px-3">{{ ucwords($favorite->category) }}</td>
+                            <td class="text-nowrap">
+                                {{ @$parsed->name }}
+                            </td>
+                            <td>
+                                <div class="d-flex align-items-center">
+                                    <div moe relative class="mr-3">
+                                        <a start show class="text-primary">
+                                            <i class="fa fa-edit on-hover-opaque"></i>
+                                        </a>
+                                        <form url="/api/proFavorite/updateBasic">
+                                            <input type="hidden" name="uid" value="{{$favorite->uid}}">
+                                            <input type="hidden" name="category" value="{{$favorite->category}}">
+                                            <input type="hidden" name="data" value="{{$favorite->data}}">
+                                            <div class="mb-2">
+                                            @if($favorite->category === 'allergy')
+                                                <input type="text" class="form-control form-control-sm"
+                                                       value="{{ @$parsed->name }}"
+                                                       stag-suggest allergy stag-suggest-ep="/fdb-allergy-suggest/json" required>
+                                            @elseif($favorite->category === 'medication')
+                                                <input type="text" class="form-control form-control-sm"
+                                                       value="{{ @$parsed->name }}"
+                                                       stag-suggest medication stag-suggest-ep="/fdb-med-suggest-v2/json" required>
+                                            @elseif($favorite->category === 'problem')
+                                                <input type="text" class="form-control form-control-sm"
+                                                       value="{{ @$parsed->name }}"
+                                                       stag-suggest problem stag-suggest-ep="/fdb-dx-suggest-v2/json" required>
+                                            @endif
+                                            </div>
+                                            <div class="form-group m-0">
+                                                <button submit class="btn btn-primary btn-sm mr-2" disabled>Save</button>
+                                                <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                    <div moe relative wide class="mr-2">
+                                        <a start show class="text-danger">
+                                            <i class="fa fa-trash-alt on-hover-opaque"></i>
+                                        </a>
+                                        <form url="/api/proFavorite/remove" right>
+                                            <input type="hidden" name="uid" value="{{$favorite->uid}}">
+                                            <p>
+                                                Are you sure you want to remove this from your favorites?
+                                            </p>
+                                            <div class="form-group m-0">
+                                                <button submit class="btn btn-danger btn-sm mr-2">Yes</button>
+                                                <button cancel class="btn btn-default border btn-sm mr-2">No</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
-    </div>
+    <script>
+        (function () {
+            function init() {
+                let parentSegment = $('#my-favorites');
+                parentSegment.find('input[stag-suggest][allergy]')
+                    .off('stag-suggest-selected')
+                    .on('stag-suggest-selected', (_e, _input, _data) => {
+                        $(_input).closest('form').find('[name="data"]').val(JSON.stringify({
+                            name: _data.text,
+                            damConceptId: _data.dam_concept_id,
+                            damConceptIdType: _data.dam_concept_id_typ
+                        }));
+                        $(_input).closest('form').find('[submit]').prop('disabled', false);
+                    });
+                parentSegment.find('input[stag-suggest][medication]')
+                    .off('stag-suggest-selected')
+                    .on('stag-suggest-selected', (_e, _input, _data) => {
+                        $(_input).closest('form').find('[name="data"]').val(JSON.stringify({
+                            name: _data.text,
+                            medId: _data.medid,
+                            routedMedId: _data.routed_med_id,
+                            routedDosageFormMedId: _data.routed_dosage_form_med_id,
+                            gcnSeqno: _data.gcn_seqno,
+                        }));
+                        $(_input).closest('form').find('[submit]').prop('disabled', false);
+                    });
+                parentSegment.find('input[stag-suggest][problem]')
+                    .off('stag-suggest-selected')
+                    .on('stag-suggest-selected', (_e, _input, _data) => {
+                        $(_input).closest('form').find('[name="data"]').val(JSON.stringify({
+                            name: _data.text,
+                            dxid: _data.dxid,
+                            icd: _data.sub_text,
+                            "icd-type": ""
+                        }));
+                        $(_input).closest('form').find('[submit]').prop('disabled', false);
+                    });
+
+            }
+            addMCInitializer('my-favorites', init, '#my-favorites');
+        }).call(window);
+    </script>
 
 @endsection

resources/views/app/practice-management/pro-financials.blade.php

@@ -19,6 +19,7 @@
                         <option value="" {{!@$targetPro ? 'selected' : ''}}>All Pros</option>
                     </select>
                 </div>
+                <a href="#" class="ml-auto" onclick="$('.debited-row').toggleClass('d-none');return false;">Toggle Debited</a>
                 @if(@$targetPro)
                     <a href="/practice-management/pro-financials" class="ml-2">Clear Filter</a>
                 @endif
@@ -107,9 +108,9 @@
                                             <th></th>
                                         </tr>
                                         @foreach($row->debitBills as $debitBill)
-                                        <tr>
+                                        <tr class="{{$debitBill->has_debit_pro_been_debited ? 'debited-row d-none' : ''}}">
                                             <td>{{$debitBill->debit_pro_expected_amount}}</td>
-                                            <td>{{$debitBill->has_debit_pro_been_debited}}</td>
+                                            <td>{{$debitBill->has_debit_pro_been_debited?'Yes':'No'}}</td>
                                             <td>{{$debitBill->debit_pro_expected_amount?'Yes':'No'}}</td>
                                             <td>{{$debitBill->is_verified?'Yes':'No'}}</td>
                                             <td>

resources/views/layouts/patient.blade.php

@@ -376,7 +376,20 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											style="background-image:<?=$thumbnail?>"><?=$initials?></div>
 											<div class="d-inline-flex align-items-baseline">
 												<i class="chart mr-2">#{{$patient->chart_number}}</i>
-												<i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="right" title="Joined <?=$memberSince?>"></i>
+												<span class="on-hover-show d-inline-block on-hover-opaque">
+													<i class="fa fa-info-circle ml-1 text-primary"></i>
+													<div class="on-hover-content py-2 pl-3 text-nowrap">
+														Joined <?=$memberSince?>
+														@if($pro->pro_type === 'ADMIN')
+															<div class="mt-1">
+																Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
+															</div>
+															<div class="mt-1">
+																Created on <b>{{friendly_date_time($patient->created_at)}}</b>
+															</div>
+														@endif
+													</div>
+												</span>
 											</div>
 										</div>
 										<div class=separators>
@@ -385,8 +398,13 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											</div>
 											@if($patient->getPrimaryCoverage() &&  $patient->getPrimaryCoverageStatus() === 'YES')
 												<div class="text-nowrap screen-only">
-													<i class="fa fa-check-circle text-success" data-toggle="tooltip" data-placement="bottom" title="Covered"></i>
 													{{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+													<span class="on-hover-show d-inline-block on-hover-opaque">
+														<i class="fa fa-check-circle text-success"></i>
+														<div class="on-hover-content py-2 pl-3 text-nowrap">
+															Covered
+														</div>
+													</span>
 												</div>
 											@endif
 											<div class="screen-only">
@@ -564,119 +582,10 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 
                                         </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>
-                                                    <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>
-                                        </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="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
-										@if(false)
-                                        <div moe>
-                                            <button class="col-2-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}}">
-                                                @if($pro->is_hcp)
-                                                <input type="hidden" name="hcpProUid" value="{{$pro->uid}}">
-                                                @else
-                                                <input type="hidden" name="naProUid" value="{{$pro->uid}}">
-                                                @endif
-                                                <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 for="" class="text-secondary text-sm mb-1">Method *</label>
-                                                    <select name="method" class="form-control form-control-sm note-method-select" required>
-                                                        <option value="AUDIO">Audio</option>
-                                                        <option value="VIDEO">Video</option>
-                                                        <option value="IN_CLINIC">In-Clinic</option>
-                                                        <option value="HOUSE_CALL">House Call</option>
-                                                    </select>
-                                                </div>
-                                                <div class="form-group if-in-clinic">
-                                                    <label for="" class="text-secondary text-sm mb-1">Location</label>
-                                                    <select name="hcpCompanyLocationUid" class="form-control">
-                                                        <option value=""></option>
-                                                        @foreach($pro->companyLocations() as $location)
-                                                            <option value="{{$location->uid}}">{{$location->line1}} {{$location->city}}</option>
-                                                        @endforeach
-                                                    </select>
-                                                </div>
-                                                <div class="form-group m-0">
-                                                    <button submit class="btn btn-primary btn-sm">submit</button>
-                                                </div>
-                                            </form>
-                                        </div>
-										@endif
+                                    <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-3 pl-3 border-left mcp-theme-1">
                                         <div>
                                             <div moe relative>
-                                                <button class="col-2-button" start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
-                                                </button>
+                                                <a href="#" start show class="d-flex align-items-baseline"><i class="fa fa-plus text-sm mr-1"></i><span>SMS</span></a>
                                                 <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1" noreload>
                                                     <input type="hidden" name="uid" value="{{ $patient->uid }}">
                                                     <div class="mb-2">
@@ -702,8 +611,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
                                         </div>
                                         <div>
                                         <span moe relative class="">
-                                            <button class="col-2-button" start show title="SMS check-in link to the patient"><i
-                                                    class="on-hover-opaque fa fa-paper-plane text-secondary"></i>&nbsp;Send</button>
+                                            <a href="#" start show class="d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane text-sm mr-1"></i><span>Send</span></a>
                                             <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right
                                                   class="mcp-theme-1">
                                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
@@ -728,16 +636,14 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
                                             </form>
                                         </span>
                                         </div>
-																				@if($performer->pro->pro_type == 'ADMIN')
-																				<div>
-																					<button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i
-																									class="on-hover-opaque fa fa-video text-secondary"></i>&nbsp;Check</button>
-																				</div>
-																				@endif
-																				<div>
-																					<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i
-																									class="on-hover-opaque fa fa-video text-secondary"></i>&nbsp;Join</button>
-																				</div>
+										@if($performer->pro->pro_type == 'ADMIN')
+										<div>
+											<a href="#" start show class="d-flex align-items-baseline" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-video text-sm mr-1"></i><span>Check</span></a>
+										</div>
+										@endif
+										<div>
+											<a href="#" start show class="d-flex align-items-baseline" onclick="return openInRHS('/pro/meed/{{ $patient->uid }}')"><i class="fa fa-video text-sm mr-1"></i><span>Join</span></a>
+										</div>
                                     </section>
 									@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
@@ -922,8 +828,6 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 						form.find('.if-in-clinic').hide();
 					}
 				});
-
-				// $('[data-toggle="tooltip"]').tooltip('hover');
 			}
 			addMCInitializer('patient-add-note-popup', init, '#patient-header')
 		}).call(window);
@@ -939,10 +843,6 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 				if(localStorage.sidebarMenuScrollTop) {
 					$('#sidebarMenu').scrollTop(+localStorage.sidebarMenuScrollTop);
 				}
-
-				$(function () {
-					$('[data-toggle="tooltip"]').tooltip();
-				});
 			}
 			addMCInitializer('sidebarMenu', init, '#sidebarMenu')
 		}).call(window);