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

config/app.php

@@ -63,7 +63,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 2,
+    'asset_version' => 3,
 
     /*
     |--------------------------------------------------------------------------

public/css/style.css

@@ -41,6 +41,9 @@
 .text-warning-mellow {
     color: #d8a714!important;
 }
+.text-link {
+    color: rgb(13, 89, 175) !important;
+}
 .stag-primary-bg {
   background-color: var(--primary-color) !important;
   color: #fff;
@@ -1708,4 +1711,41 @@ form.non-interactive .form-content * {
 }
 .training-event .patient-avatar {
     border-color: #0d59af7d !important;
+}
+
+
+/* print-note */
+@media print {
+    .stag-content #sidebarMenu {
+        display: none !important;
+    }
+    .stag-content .main-row {
+        padding-left: 0 !important;
+    }
+    .stag-content [moe] {
+        display: none !important;
+    }
+    .stag-content .screen-only {
+        display: none !important;
+    }
+}
+@media screen {
+    .stag-content .print-only {
+        display: none !important;
+    }
+}
+.child-sections>.note-section:not(.edit) {
+    position: relative;
+}
+.child-sections>.note-section:not(.edit):before {
+    content: '';
+    width: 9px;
+    border-top: 1px solid #ccc;
+    left: 0;
+    top: calc(1rem + 8px);
+    height: 1px;
+    position: absolute;
+}
+.child-sections>.note-section.edit {
+    margin-left: 1rem;
 }

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

@@ -115,7 +115,7 @@ $formID = rand(0, 100000);
                            v-on:change="includeChanged()">
                 </label>
             </td>
-            <td v-show="inclusion[index]" >
+            <td @if(@$note) v-show="inclusion[index]" @endif>
                 <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>
@@ -133,18 +133,24 @@ $formID = rand(0, 100000);
                     <b><i class="fa fa-clock mr-1 text-sm"></i>Previous HPI: </b><br>
                     <div v-html="item.previous_hpi"></div>
                 </div>
+                <a v-if="item.previous_hpi" href="#"
+                   v-on:click.prevent="item.detail = item.previous_hpi"
+                   class="d-block py-1 px-2 border-bottom">Copy from previous</a>
                 <textarea type="text" class="form-control form-control-sm" v-model="item.detail" placeholder="Updated HPI *"></textarea>
             </td>
-            <td v-show="inclusion[index]" >
+            <td @if(@$note) v-show="inclusion[index]" @endif>
                 <div class="px-2 py-1 bg-white border-bottom text-secondary" v-if="item.previous_plan">
                     <b><i class="fa fa-clock mr-1 text-sm"></i>Previous Plan: </b><br>
                     <div v-html="item.previous_plan"></div>
                 </div>
+                <a v-if="item.previous_plan" href="#"
+                   v-on:click="copyPreviousPlan(item, index, $event)"
+                   class="d-block py-1 px-2 border-bottom">Copy from previous</a>
                 <textarea type="text" class="form-control form-control-sm"
                           dx-rte :data-index="index" data-field="plan"
                           v-model="item.plan"></textarea>
             </td>
-            <td v-show="inclusion[index]" class="px-2 text-nowrap">
+            <td @if(@$note) v-show="inclusion[index]" @endif class="px-2 text-nowrap">
                 <a href="#"
                    v-if="!isFavorite(item)" v-on:click.prevent="addToFavorites(item)"
                    class="mt-1 d-inline-block mr-1 text-secondary on-hover-opaque"
@@ -162,9 +168,11 @@ $formID = rand(0, 100000);
                     <i class="fa fa-trash-alt"></i>
                 </a>
             </td>
+            @if(@$note)
             <td v-show="!inclusion[index]" colspan="3" class="align-middle pl-2">
                 <span v-html="item.title"></span>
             </td>
+            @endif
         </tr>
         </tbody>
     </table>
@@ -191,16 +199,15 @@ $formID = rand(0, 100000);
         let saved = <?= json_encode($contentData['items']) ?>;
         // if FU, copy hpi into previous_hpi for each item, and empty out hpi
         @if(@$note && $note->new_or_fu_or_na === 'FU')
-            for (let i = 0; i < saved.length; i++) {
-                if(saved[i].note_uid !== '{{$note->uid}}') {
-                    if(saved[i].detail) saved[i].previous_hpi = saved[i].detail;
-                    if(saved[i].plan) saved[i].previous_plan = saved[i].plan;
-                    saved[i].detail = '';
-                    saved[i].plan = '';
-                    saved[i].note_uid = '{{$note->uid}}';
-                }
+        for (let i = 0; i < saved.length; i++) {
+            if(saved[i].note_uid !== '{{$note->uid}}') {
+                if(saved[i].detail) saved[i].previous_hpi = saved[i].detail;
+                if(saved[i].plan) saved[i].previous_plan = saved[i].plan;
+                saved[i].detail = '';
+                saved[i].plan = '';
+                saved[i].note_uid = '{{$note->uid}}';
             }
-        console.log('ALIX', saved)
+        }
         @endif
 
         function init() {
@@ -251,6 +258,13 @@ $formID = rand(0, 100000);
                     }
                 },
                 methods: {
+                    copyPreviousPlan: function(item, index, trigger) {
+                        item.plan = item.previous_plan;
+                        Vue.nextTick(() => {
+                            $(trigger.currentTarget).closest('td').find('.ql-editor').html(item.plan);
+                        });
+                        return false;
+                    },
                     includeAllChanged: function() {
                         for (let i = 0; i < this.items.length; i++) {
                             this.inclusion[i] = this.includeAll; // NOTE: this does not trigger a watch event

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

@@ -25,7 +25,7 @@
                         <div class="d-flex align-items-center">
                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                        </div>
+                        </div>Me
                     </form>
                 </div>
                 <span class="mx-2 text-secondary">|</span>
@@ -95,7 +95,7 @@
                                 @if($measurement->is_cellular_zero)
                                     <i class="font-size-11 fa fa-rss"></i>
                                 @elseif($measurement->label === 'BP')
-                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg
+                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
                                 @elseif($measurement->label === 'Wt. (lbs.)')
                                     {{ $measurement->numeric_value }} lbs
                                 @else

resources/views/app/patient/note/dashboard.blade.php

@@ -36,15 +36,18 @@
     @endif
     --}}
 
-    <div id="note-single-header" class="pt-2 pb-3 d-flex align-items-start">
-        <h6 class="my-0 text-secondary d-flex align-items-start w-100">
+    <div id="note-single-header" class="pt-2 pb-3 d-flex align-items-start screen-only">
+        <h6 class="my-0 text-secondary d-flex align-items-center w-100">
             <a href="/patients/view/{{ $patient->uid }}/notes" class="small text-decoration-none mr-3">
                 <i class="fa fa-chevron-left"></i>
             </a>
-            <div class="mr-auto">
+            <div class="mr-auto d-inline-flex align-items-center">
                 <span class="text-dark font-weight-bold">Note
                     <span class="text-secondary font-weight-normal">{{ $note->is_cancelled ? '(CANCELLED)' : '' }}</span>
                 </span>
+                @if($pro->pro_type === 'ADMIN')
+                    <a href="#" class="print-note ml-3 btn btn-sm btn-primary text-white font-weight-bold invisible"><i class="fa fa-print"></i> Print</a>
+                @endif
             </div>
             @if($patient->has_mcp_done_onboarding_visit !== 'YES')
                 <div class="ml-auto">
@@ -399,22 +402,22 @@
                     <div class="">
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0 font-size-14">ERx/Orders Summary</p>
-                            <span class="mx-2 text-secondary">|</span>
+                            <span class="mx-2 text-secondary screen-only">|</span>
                             <a href="/patients/view/{{$patient->uid}}/tickets/erx/create?popupmode=1&note-uid={{$note->uid}}"
                                native target="_blank"
-                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap">
+                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
                                 + ERx
                             </a>
-                            <span class="mx-2 text-secondary">|</span>
+                            <span class="mx-2 text-secondary screen-only">|</span>
                             <a href="/patients/view/{{$patient->uid}}/tickets/lab/create?popupmode=1&note-uid={{$note->uid}}"
                                native target="_blank"
-                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap">
+                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
                                 + Lab
                             </a>
-                            <span class="mx-2 text-secondary">|</span>
+                            <span class="mx-2 text-secondary screen-only">|</span>
                             <a href="/patients/view/{{$patient->uid}}/tickets/imaging/create?popupmode=1&note-uid={{$note->uid}}"
                                native target="_blank"
-                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap">
+                               class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
                                 + Imaging
                             </a>
                         </div>
@@ -660,8 +663,9 @@
                     <div class="">
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0 font-size-14">Supply Orders Summary</p>
-                            <span class="mx-2 text-secondary">|</span>
+                            <span class="mx-2 text-secondary screen-only">|</span>
                             <a native target="_blank"
+                               class="screen-only"
                                open-in-stag-popup
                                update-parent
                                mc-initer="patient-supply-orders"
@@ -796,7 +800,7 @@
                     </div>
                 </div>
                 @if($pro->pro_type === 'ADMIN')
-                <div class="p-3 border-bottom">
+                <div class="p-3 border-bottom screen-only">
                     <div>
                         <h2 class="font-weight-bold text-secondary">Bills & Claims Summary</h2>
                         <div class="d-flex justify-content-center align-items-start">
@@ -922,7 +926,7 @@
                 @endif
 
                 @if($note->method === 'IN_CLINIC' || $pro->pro_type === 'ADMIN')
-                <div class="p-3 border-bottom">
+                <div class="p-3 border-bottom screen-only">
                     <div class="ml-auto d-inline-flex align-items-center">
 
                         <span class="text-secondary font-weight-bold">Pro:&nbsp;</span>
@@ -1032,12 +1036,12 @@
                                 <th class="border-bottom-0">Service</th>
                                 <th class="border-bottom-0">Billable</th>
                                 <th class="border-bottom-0">HCP</th>
-                                <th class="border-bottom-0">Total</th>
+                                <th class="border-bottom-0 screen-only">Total</th>
                                 <th class="border-bottom-0">Sign</th>
-                                <th class="border-bottom-0">Bal Post Date</th>
+                                <th class="border-bottom-0 screen-only">Bal Post Date</th>
                                 <th class="border-bottom-0">Verification</th>
                                 <th class="border-bottom-0">Cancellation</th>
-                                <th class="border-bottom-0">Payment</th>
+                                <th class="border-bottom-0 screen-only">Payment</th>
                             </tr>
                             </thead>
                             <tbody>
@@ -1089,17 +1093,17 @@
                                     </td>
                                     <td class="">
                                         <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
-                                        <div class="text-nowrap mt-1">
+                                        <div class="text-nowrap mt-1 screen-only">
                                             <span class="text-secondary">Paid: </span>
                                             <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
                                         </div>
                                         @if(!$bill->has_hcp_been_paid)
-                                            <div class="text-nowrap mt-1">
+                                            <div class="text-nowrap mt-1 screen-only">
                                                 <span class="text-secondary">Expected: </span>
                                                 <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
                                             </div>
                                         @else
-                                            <div class="text-nowrap mt-1">
+                                            <div class="text-nowrap mt-1 screen-only">
                                                 <span class="text-secondary">Amount: </span>
                                                 <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
                                             </div>
@@ -1107,17 +1111,17 @@
                                         @if($bill->ally)
                                             <hr>
                                             <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
-                                            <div class="text-nowrap mt-1">
+                                            <div class="text-nowrap mt-1 screen-only">
                                                 <span class="text-secondary">Paid: </span>
                                                 <span>{{ $bill->has_na_been_paid ? 'Yes' : 'No' }}</span>
                                             </div>
                                             @if(!$bill->has_na_been_paid)
-                                                <div class="text-nowrap mt-1">
+                                                <div class="text-nowrap mt-1 screen-only">
                                                     <span class="text-secondary">Expected: </span>
                                                     <span class="font-weight-bold">${{ $bill->na_expected_payment_amount }}</span>
                                                 </div>
                                             @else
-                                                <div class="text-nowrap mt-1">
+                                                <div class="text-nowrap mt-1 screen-only">
                                                     <span class="text-secondary">Amount: </span>
                                                     <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
                                                 </div>
@@ -1125,7 +1129,7 @@
                                         @endif
 
                                     </td>
-                                    <td class="pr-3">
+                                    <td class="pr-3 screen-only">
                                         @if($bill->has_hcp_been_paid)
                                             <span class="text-secondary">Paid. </span>
                                             <span class="font-weight-bold">${{ friendly_money($bill->total_paid) }}</span>
@@ -1179,7 +1183,7 @@
                                             @endif
                                         @endif
                                     </td>
-                                    <td>
+                                    <td class="screen-only">
                                         @if(!$bill->is_cancelled)
                                             <span class="d-block" moe>
                                                 <a class="" href="" show start>
@@ -1307,7 +1311,7 @@
                                         @endif
 
                                     </td>
-                                    <td> <!-- submit payment -->
+                                    <td class="screen-only"> <!-- submit payment -->
                                         <div class="my-1">
                                             @if(!$bill->is_cancelled && !$bill->has_hcp_been_paid )
                                                 @if(+$bill->hcp_expected_payment_amount && $bill->is_signed_by_hcp)
@@ -1555,7 +1559,7 @@
                 {{-- claims --}}
                 @if($pro->pro_type === 'ADMIN')
                 @if($note->claims->count())
-                    <div class="p-3">
+                    <div class="screen-only p-3">
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0">Claims</p>
                             @include('app/patient/note/_create-claim')
@@ -1916,7 +1920,7 @@
                         </table>
                     </div>
                 @else
-                    <div class="my-3 px-3 d-flex">
+                    <div class="screen-only my-3 px-3 d-flex">
                         <p class="font-weight-bold mb-0 text-secondary">No claims in this note</p>
                         @include('app/patient/note/_create-claim')
                     </div>
@@ -1924,7 +1928,7 @@
                 @endif
 
 
-                <div class="border-top p-3">
+                <div class="border-top p-3 screen-only">
                     @if($note->addendums->count())
                         <div class="">
                             <div class="d-flex align-items-center mb-2">
@@ -1986,7 +1990,9 @@
                     @endif
                 </div>
 
-                @include('app/patient/note/_cancel-signed-note')
+                <div class="screen-only">
+                    @include('app/patient/note/_cancel-signed-note')
+                </div>
 
 
             </div>

resources/views/app/patient/note/dashboard_script.blade.php

@@ -5,6 +5,15 @@
 
             function init() {
 
+                // print note
+                $(document)
+                    .off('click.print', '.print-note')
+                    .on('click.print', '.print-note', () => {
+                        window.print();
+                        return false;
+                    });
+                $('.print-note').removeClass('invisible');
+
                 $('.note-method-select').change(function() {
                     let form = $(this).closest('form');
                     if(this.value === 'IN_CLINIC') {
@@ -72,9 +81,12 @@
                     .off('click.edit-trigger')
                     .on('click.edit-trigger', function() {
                         let editParent = $(this).closest('.note-section');
-                        editParent.toggleClass('edit');
                         if(editParent.is('.edit')) {
-                            editParent.siblings('.edit').removeClass('edit');
+                            editParent.removeClass('edit');
+                        }
+                        else {
+                            $('.note-section.edit').removeClass('edit');
+                            editParent.addClass('edit');
                             if(editParent.find('[autofocus]').length) {
                                 editParent.find('[autofocus]').first().focus();
                             }

resources/views/app/patient/note/note-section-list.blade.php

@@ -1,5 +1,27 @@
 <?php $canvasData = json_decode($patient->canvas_data, true); ?>
+<?php $previousHeading = null; ?>
 @foreach($note->sections as $section)
+<?php
+/** @var \App\Models\Section $section */
+if($section->heading !== $previousHeading) {
+    if(!empty($previousHeading)) {
+        echo '</div></div>'; // <!-- end the previous parent section -->
+    }
+    if(!empty($section->heading)) {
+        echo '<div class="note-section-heading px-3 pt-3">' .
+            '<div class="text-link font-weight-bold pb-2">' .
+            $section->heading .
+            '</div>' .
+            '<div class="child-sections border-left">'; // <!-- open new parent section -->
+    }
+    $previousHeading = $section->heading;
+}
+?>
 @include('app.patient.note.section')
 @endforeach
+<?php
+if(!empty($previousHeading)) {
+    echo '</div></div>'; // <!-- close any open parent section -->
+}
+?>
 @include('app.patient.note.section_script')

resources/views/app/patient/note/section.blade.php

@@ -59,20 +59,22 @@ if ($latestSectionTS === 0 || $latestSectionTS < $sectionTS) {
 
         @if(isset($pro))
             <div class="ml-auto d-inline-flex align-items-center">
-                <div class="ml-auto">
+                {{--<div class="ml-auto">
                     @if(!isset($note) || (isset($note) && !$note->is_signed_by_hcp))
                         @include('app.patient.note.guest-access')
                     @endif
-                </div>
+                </div>--}}
                 <a href="#" class="d-none text-danger if-edit ml-2 remove-section-trigger mr-1" data-uid="{{$section->uid}}" title="Remove {{$section->sectionTemplate->title}}">
                     Remove
                 </a>
+                @if($pro->pro_type === 'ADMIN')
                 <a href="#" class="d-none if-edit ml-2 move-up-trigger" data-uid="{{$section->uid}}" title="Move Up">
                     <i class="fa fa-arrow-up"></i>
                 </a>
                 <a href="#" class="d-none if-edit ml-2 move-down-trigger" data-uid="{{$section->uid}}" title="Move Down">
                     <i class="fa fa-arrow-down"></i>
                 </a>
+                @endif
             </div>
         @endif
     </div>

resources/views/app/patient/note/section_script.blade.php

@@ -143,7 +143,7 @@
                                 let ccValue = 'Patient {{$patient->name_first . ' ' . $patient->name_last}} ' +
                                     'is a {{$patient->age_in_years}} year old {{$patient->sex}} with a history of ' +
                                     itemsText + ' ' +
-                                    '{{ @$note ? (@$note->new_or_fu_or_na === 'NEW' ? 'presenting for establishing care' : 'presenting for follow-up') : '' }}';
+                                    '{{ @$note ? (@$note->new_or_fu_or_na === 'NEW' ? 'presenting for establishing care' : 'presenting for follow-up') : '' }}.';
                                 let para = $('<p/>').text(ccValue)[0].outerHTML;
                                 ccSection.find('[name="data"]').first().val(JSON.stringify({value: para}));
                                 ccSection.find('.ql-editor').html(para);

resources/views/app/patient/partials/measurements.blade.php

@@ -106,7 +106,7 @@
                             </span>
                             <span class="font-weight-bold ml-1">
                                 @if($measurement->label == 'BP')
-                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mm Hg
+                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mm Hg <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
                                 @elseif($measurement->label == 'Wt. (lbs.)')
                                     {{round($measurement->numeric_value, 1)}} lbs.
                                 @elseif($measurement->numeric_value)

resources/views/app/practice-management/calendar.blade.php

@@ -409,6 +409,20 @@
                                 });
                             $('#eventPros')
                                 .select2({
+
+                                    // ajax driven pros listing
+                                    ajax: {
+                                        url: '/pro-suggest',
+                                        dataType: 'json',
+                                        data: function (params) {
+                                            return {
+                                                term: params.term,
+                                                json: true
+                                            };
+                                        },
+                                    },
+                                    minimumInputLength: 3,
+
                                     closeOnSelect: false,
 
                                     // dropdown options
@@ -481,7 +495,7 @@
                                 },
                                 initialView: 'timeGridWeek',
                                 initialDate: '{{ $initialDate }}',
-                                editable: true,
+                                editable: false,
                                 selectable: true,
                                 navLinks: true,
                                 dayMaxEvents: false,
@@ -515,7 +529,7 @@
                                                             ev.textColor = meta.fc;
                                                             ev.initials = meta.initials;
                                                             ev.display = 'block';
-                                                            ev.editable = true;
+                                                            ev.editable = false;
 
                                                             // active/all
                                                             if(['CANCELLED', 'COMPLETED', 'ABANDONED'].indexOf(ev.status) !== -1) {
@@ -598,8 +612,8 @@
                                             .appendTo('.fc-highlight');
                                     }*/
                                 },
-                                eventDrop: self.eventMovedOrResized,
-                                eventResize: self.eventMovedOrResized
+                                // eventDrop: self.eventMovedOrResized,
+                                // eventResize: self.eventMovedOrResized
                             });
                             $(document).on('mousedown', '.fc-highlight', function() {
                                  if(self.selectedSlot && self.today.getTime() <= self.selectedSlot.start.getTime()) {
@@ -770,12 +784,13 @@
                                     $('#eventTz').trigger('change');
                                 });
                             }
-                            if(localStorage.stagProCalendarProIds) {
-                                this.proIds = JSON.parse(localStorage.stagProCalendarProIds);
-                                Vue.nextTick(function() {
-                                    $('#eventPros').trigger('change');
-                                });
-                            }
+                            // pros not pre-loaded anymore! so this isn't possible in a straight-forw manner
+                            // if(localStorage.stagProCalendarProIds) {
+                            //     this.proIds = JSON.parse(localStorage.stagProCalendarProIds);
+                            //     Vue.nextTick(function() {
+                            //         $('#eventPros').trigger('change');
+                            //     });
+                            // }
                         @endif
                     }
                 });

resources/views/layouts/patient.blade.php

@@ -279,7 +279,7 @@
                                     </div>
                                 @endif
                                 <div class=hbox>
-                                    <div class="mr-1 patient-presence-indicator thumbnail {{$online}}"
+                                    <div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
                                          data-patient-uid="{{$patient->uid}}"
                                          style="background-image:<?=$thumbnail?>"><?=$initials?></div>
                                     {{--<div>
@@ -395,6 +395,7 @@
                                                 @endif
                                             </div>
                                         </div>
+                                        <div class="screen-only">
                                         <div class=separators>
                                             <div>Joined <?=$memberSince?></div>
                                             <div><label>MCP:</label> {{$mcpName}}
@@ -609,6 +610,7 @@
                                                 @endif
                                             @endif
                                         </div>
+                                        </div>
                                     </section>
                                     {{--<section>
                                         <div>
@@ -666,7 +668,7 @@
                                             <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">
+                                    <section class="screen-only 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>
@@ -769,7 +771,7 @@
                                         </span>
                                         </div>
                                     </section>
-                                    <section class="vbox mt-2 align-self-start ml-1">
+                                    <section class="screen-only vbox mt-2 align-self-start ml-1">
                                         @if($performer->pro->pro_type == 'ADMIN')
                                         <div>
                                             <button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
@@ -903,11 +905,11 @@
                                                 {{$patient->phone_home}}
                                             </li>
                                         @endif
-                                        <li>
+                                        <li class="{{empty($confirmedEmail) || $confirmedEmail === '-' ? 'screen-only' : ''}}">
                                             <span class="aligned-icon"><i class="fa fa-envelope" aria-hidden="true"></i></span>
                                             {{$confirmedEmail}}
                                         </li>
-                                        <li>
+                                        <li class="screen-only">
                                             <span class="aligned-icon text-primary">
                                                 <i class="fa fa-link" aria-hidden="true"></i>
                                             </span>
@@ -923,7 +925,7 @@
                         </div> <!-- z -->
                     </div>
                     @if($pro->pro_type === 'ADMIN')
-                        <div class="card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
+                        <div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue">
                             <b class="">Tags ({{count($patient->clientTags)}}):</b>
                             @foreach($patient->clientTags as $tag)
                                 <div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">