Merge branch 'dev' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -983,6 +983,8 @@ class PracticeManagementController extends Controller
 
         $performer = $this->performer();
 
+        abort_if($performer->pro->pro_type !== 'ADMIN' && !$performer->pro->can_view_rm_matrix, 403);
+
         $ym = ($request->input('y') ?: 'Y') . '-' . ($request->input('m') ?: 'm');
         $careMonthStart = date($ym . '-01');
 

resources/views/app/dashboard-mcp.blade.php

@@ -302,16 +302,18 @@
                             <div id="mcp-dashboard-appointments" class="mb-4">
 
                             </div>
-                            <div class="card mb-4 d-none">
+                            @if($performer->pro->can_view_rm_matrix || $performer->pro->pro_type=='ADMIN')
+                            <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>
                                         Remote Monitoring: {{friendly_month(date('Y-m-d'))}}
                                     </strong>
                                 </div>
-                                <div class="card-body p-1 d-none">
+                                <div class="card-body p-1">
                                     @include('app.practice-management.remote-monitoring-tree')
                                 </div>
                             </div>
+                            @endif
                             <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>

resources/views/app/new-patient.blade.php

@@ -12,7 +12,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 		color: rgb(0, 54, 175);
 	}
 	.form-control:focus {
-		color: rgb(0, 54, 175);	
+		color: rgb(0, 54, 175);
 	}
 </style>
 
@@ -117,10 +117,12 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					});
 			},
 			initOnInputChange: function() {
+				var self = this;
 				var form = $('#createNewPatientForm');
-				form.find('input[type=text],textarea').change(function() {
+				form.find('input,textarea').on('paste change', function() {
 					var value = this.value.replace(/\s\s+/g, ' ');
 					value = value.trim();
+					self.form[this.name] = value;
 					$(this).val(value);
 				});
 			},

resources/views/app/patient-suggest.blade.php

@@ -7,6 +7,12 @@
        href="" data-target-uid="{{$client->uid}}" {!! $client->mcp ? '' : 'title="Unclaimed Patient"' !!}>
         <img src="/img/bluecircle.png" alt="Unclaimed Patient" class="mr-1 {{$client->mcp ? 'claimed' : 'unclaimed'}}">
         {{$client->displayName()}}
+        @if($client->client_engagement_status_category == 'DUMMY') 
+         [Test Record]
+        @endif 
+        @if($client->client_engagement_status_category == 'DUPLICATE') 
+         [Duplicate Record]
+        @endif 
         {!! $client->cell_number ? '<span class="text-sm text-secondary ml-1">(' . $client->cell_number . ')</span>' : '' !!}
     </a>
     <?php $activeSet = true; ?>

resources/views/app/patient/coverage-status.blade.php

@@ -64,11 +64,13 @@
           <td>
             @if($mcnDetails && $mcnDetails->plan_details)
               <span class="font-weight-bold">{{ $mcnDetails->plan_details->MC->payer_name }}</span> <br>
+              @if($mcnDetails->plan_details->MC->contacts)
               @foreach($mcnDetails->plan_details->MC->contacts as $contact)
                 @if($contact->contact_type == 'telephone')
                   <a href="tel:{{ $contact->contact_value }}"><b><i class="fas fa-phone-alt"></i></b> {{ $contact->contact_value }}</a> <br>
                 @endif
               @endforeach
+              @endif
             @endif
 
             @if($coverage->manual_medicare_is_partbprimary == 'YES')

resources/views/app/patient/create-patient/demographics-form.blade.php

@@ -145,4 +145,4 @@
 		<input type='checkbox' name='isTestRecord' />
 		This is a test record
 	</label>
-</div>
+</div>