Merge branch 'dev' into dev-vj

app/Http/Controllers/HomeController.php

@@ -407,6 +407,7 @@ class HomeController extends Controller
 
     public function patients(Request $request, $filter = '')
     {
+
         $performer = $this->performer();
         $query = $performer->pro->getAccessibleClientsQuery();
 
@@ -435,6 +436,7 @@ class HomeController extends Controller
         }
         $patients = $query->orderBy('id', 'desc')->paginate(50);
         return view('app/patients', compact('patients', 'filter'));
+
     }
 
     public function patientsSuggest(Request $request)

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

@@ -42,7 +42,7 @@
             <th class="px-2 text-secondary border-bottom-0">New Patient / FU</th>
             <th class="px-2 text-secondary border-bottom-0">HCP</th>
             <th class="px-2 text-secondary border-bottom-0">Signed</th>
-            <th class="px-2 text-secondary border-bottom-0 w-50">Content</th>
+            <!-- <th class="px-2 text-secondary border-bottom-0 w-50">Content</th> -->
             <th class="px-2 text-secondary border-bottom-0">&nbsp;</th>
             <th class="px-2 text-secondary border-bottom-0">Actions</th>
         </tr>
@@ -79,11 +79,12 @@
                 <td class="px-2">
                     {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
                 </td>
+<?php /*
                 <td class="px-2 note-summary">
                     <div class="note-section-content-html-outer">
                         {!! $note->summary() !!}
                     </div>
-                </td>
+                </td> */ ?>
                 <td class="px-2">
                     <div class="position-relative c-pointer text-center stag-tooltip">
                         <i class="fa fa-info-circle"></i>

resources/views/app/patients.blade.php

@@ -46,6 +46,7 @@
                     <th class="px-3 border-0">Chart #</th>
                     <th class="border-0">Patient</th>
                     <th class="border-0">Created At</th>
+		    <th class="border-0">Address</th>
                     @if($showProgramsColumn)<th class="border-0">Program(s)</th>@endif
                     <th class="border-0">MCN</th>
                     <th class="border-0">PCP</th>
@@ -72,6 +73,19 @@
                             <div>{{ friendly_date_time($patient->dob, false) }}{{ $patient->sex === 'M' ? ', Male' : ($patient->sex === ', F' ? 'Female' : '') }}</div>
                         </td>
                         <td>{{friendly_date_time_short_with_tz($patient->created_at, true, 'EASTERN')}}</td>
+			<td>
+				<?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;
+                                                ?>	
+			</td>
                         @if($showProgramsColumn)
                         <td>
                             <?php $programNumber = 0; ?>

resources/views/app/practice-management/claims-report.blade.php

@@ -2,6 +2,6 @@
 
 @section('content')
     <div >
-        <iframe class="mt-5" src="/api/dev/view/claimsReport?sessionKey={{$performer->session_key}}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;"/>
+        <iframe class="mt-5" src="/api/dev/view/claimsReport?sessionKey={{$performer->session_key}}" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden;"/>
     </div>
 @endsection