Updated patient coverage section

public/js/icd-autocomplete copy.js

@@ -0,0 +1,28 @@
+(function() {
+
+    function init() {
+        let self = this;
+        $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
+            let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
+                codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+            $(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();
+                codeElem.val(acData[0].code).trigger('change');
+                descElem.val(acData[0].data['name']).trigger('change');
+                return false;
+            });
+            $(elem).attr('ac-initialized', 1);
+        });
+    }
+
+    addMCInitializer('icd-autocomplete', init);
+
+}).call(window);

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

@@ -18,7 +18,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 				</strong>
 			</div>
 			<div class="card-body">
-				<form show url="/api/client/create" class="px-2 pb-1 primary-form" redir="patients/view/[data]">
+				<form id="createNewPatientForm" show url="/api/client/create" class="px-2 pb-1 primary-form" redir="patients/view/[data]">
 					@if (session('message'))
 					<div class="alert alert-danger">{{ session('message') }}</div>
 					@endif
@@ -159,7 +159,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 							<div class='form-group mb-3'>
 								<label class='control-label'>How did you hear about us?</label>
-								<input class='form-control' type='text' required="" name='initiative' />
+								<input class='form-control' type='text' name='initiative' />
 							</div>
 
 							<div class='form-group mb-3 checkbox'>
@@ -286,7 +286,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 													<div class="form-group col-md-6">
 														<label class="control-label">Medicaid Number</label>
-														<input type="text" name="mcdNumber" class="form-control input-sm">
+														<input type="text" name="mcdNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
 													</div>
 												</div>
 											</div>
@@ -302,7 +302,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 												<div class="px-2">
 													<div class="form-group col-md-6">
 														<label class="control-label">Medicare Number</label>
-														<input type="text" name="mcrNumber" class="form-control input-sm">
+														<input type="text" name="mcrNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
 													</div>
 												</div>
 											</div>
@@ -376,7 +376,16 @@ $medicaidStates = Config::get('constants.medicaid_states');
 						hiddenInput.val(_data.uid);
 					});
 			},
+			initOnInputChange: function(){
+				var form = $('#createNewPatientForm');
+				form.find('input[type=text],textarea').change(function(){
+					var value = this.value.replace(/\s\s+/g, ' ');
+					value = value.trim();
+					$(this).val(value);
+				});
+			},
 			init: function() {
+				this.initOnInputChange();
 				this.onCommercialPayerChange();
 			}
 		},

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

@@ -17,12 +17,14 @@
             @else
               <span><i class="fas fa-times text-danger"></i> {{$coverage->auto_medicare_is_partbprimary}}</span> <br>
               <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
+              @if(!$coverage->auto_medicare_is_partcactive)
               <span><b>Part B:</b> {{$coverage->auto_medicare_is_partbactive}}</span> <br>
+              @endif
               <span><b>Part C:</b> {{$coverage->auto_medicare_is_partcactive}}</span>
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive == 'YES' && $performer->pro->pro_type == 'ADMIN')
+        @if($coverage->auto_medicare_is_partbactive == 'YES' && !$coverage->auto_medicare_is_partcactive)
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
           <td>{{number_format($coverage->auto_medicare_mpb_deductible, 2, '.',',') ?? '-'}}</td>
@@ -34,6 +36,7 @@
         @endif
       </table>
       @else
+      <!-- Manual determination -->
       <table class="table table-sm table-bordered">
         <tr>
           <td class="font-weight-bold">Medicare Part B (Primary)</td>
@@ -45,12 +48,14 @@
             @else
             <span><i class="fas fa-times text-danger"></i> not primary! ({{$coverage->manual_determination_strategy}})</span> <br>
             <span><i class="fas fa-check-circle text-success"></i> record found</span> <br>
-            <span><b>Part B:</b> {{$coverage->manual_medicare_is_partbactive}}</span> <br>
+            @if(!$coverage->manual_medicare_is_partcactive)
+              <span><b>Part B:</b> {{$coverage->manual_medicare_is_partbactive}}</span> <br>
+            @endif
             <span><b>Part C:</b> {{$coverage->manual_medicare_is_partcactive}}</span>
             @endif
           </td>
         </tr>
-        @if($coverage->auto_medicare_is_partbactive && $performer->pro->pro_type == 'ADMIN')
+        @if($coverage->auto_medicare_is_partbactive && !$coverage->manual_medicare_is_partcactive)
         <tr>
           <td class="font-weight-bold">Part B Deductible</td>
           <td>{{number_format($coverage->auto_medicare_mpb_deductible,2,'.',',') ?? '-'}}</td>

resources/views/app/patient/primary-coverage-form.blade.php

@@ -1,9 +1,9 @@
 <?php
-$medicaidStates = Config::get('constants.medicaid_states');
+	$medicaidStates = Config::get('constants.medicaid_states');
 ?>
 	<div id="new-coverage-form-{{$patient->uid}}">
 		<div class="p-3">
-			<form :url="url" class="mcp-theme-1" @submit.prevent="submitForm">
+			<form :url="url" class="mcp-theme-1" @submit.prevent="submitForm" autocomplete="off">
 				<input type="hidden" name="clientUid" value="{{$patient->uid}}" class="form-control input-sm" />
 				<div class="row">
 					<div class="form-group col-md-12">
@@ -59,11 +59,11 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					</div>
 					<div class="form-group col-md-4">
 						<label class="control-label">Patient Sex</label>
-						<select class="form-control input-sm" name="patientSex" select2>
+						<select class="form-control input-sm" name="sex" select2>
 							<option value="">--</option>
-							<option value="M">Male</option>
-							<option value="F">Female</option>
-							<option value="UNKNOWN">Unknown</option>
+							<option value="M" @if($patient->sex === 'M') selected @endif>Male</option>
+							<option value="F"  @if($patient->sex === 'F') selected @endif>Female</option>
+							<option value="UNKNOWN"  @if($patient->sex === 'UNKNOWN') selected @endif>Unknown</option>
 						</select>
 					</div>
 					<div class="form-group col-md-4">
@@ -155,7 +155,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 					<div class="form-group col-md-6">
 						<label class="control-label">Medicaid Number</label>
-						<input type="text" name="mcdNumber" class="form-control input-sm">
+						<input type="text" name="mcdNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
 					</div>
 				</div>
 
@@ -165,7 +165,7 @@ $medicaidStates = Config::get('constants.medicaid_states');
 					</div>
 					<div class="form-group col-md-6">
 						<label class="control-label">Medicare Number</label>
-						<input type="text" name="mcrNumber" class="form-control input-sm">
+						<input type="text" name="mcrNumber" class="form-control input-sm" oninput="this.value = this.value.toUpperCase()">
 					</div>
 
 				</div>

resources/views/app/patient/primary-coverage-manual-determination-medicare-modal.blade.php

@@ -83,7 +83,7 @@
 							<td>Is Part C Active?</td>
 							<td>{{$cpc->auto_medicare_is_partcactive}}</td>
 							<td>
-								<div class="alert alert-danger" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES') || (uiState.manualMedicareIsPartBPrimary == 'YES' && uiState.manualMedicareIsPartCActive == 'YES')">
+								<div class="alert alert-danger p-1 mb-1" v-if="(cpc.auto_medicare_is_partcactive == 'YES' && cpc.auto_medicare_is_partbprimary == 'YES') || (uiState.manualMedicareIsPartBPrimary == 'YES' && uiState.manualMedicareIsPartCActive == 'YES')">
 									Oops! Patient Medicare Part B Primary is set to <b>Yes</b>.
 								</div>
 								<div class="form-group mb-0">