fixed queries on NA dashboard

app/Models/Pro.php

@@ -380,13 +380,6 @@ class Pro extends Model
             ->count();
     }
 
-    function get_notes_pending_billing_count_as_dna() {
-        return Note::where('ally_pro_id', $this->id)
-            ->where('is_cancelled', '<>', true)
-            ->where('is_signed_by_hcp', true)
-            ->where('is_billing_marked_done', '<>', true)
-            ->count();
-    }
 
     function get_measurements_awaiting_review_count_as_mcp() {
         $result = DB::select(DB::raw("
@@ -498,10 +491,11 @@ WHERE mcp_pro_id = :pro_id
             ->count();
     }
 
+    //TODO: Generic bills that are cancelled where performer is the pro and not acknowledged
     function get_cancelled_bills_awaiting_review_count_as_dna() {
-        // SELECT * FROM bill WHERE bill_service_type = 'NOTE' AND is_cancelled IS TRUE AND isCancellationAcknowledged IS FALSE;
-        return Bill::where('na_pro_id', $this->id)
-            ->where('bill_service_type', 'NOTE')
+        // SELECT * FROM bill WHERE bill_service_type = 'GENERIC' AND is_cancelled IS TRUE AND isCancellationAcknowledged IS FALSE;
+        return Bill::where('generic_pro_id', $this->id)
+            ->where('bill_service_type', 'GENERIC')
             ->where('is_cancelled', true)
             ->where('is_cancellation_acknowledged', '<>', true)
             ->count();

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

@@ -63,18 +63,6 @@
                                         </a>
                                     </th>
                                 </tr>
-                                <tr>
-                                    <th class="px-2 text-center">{{$pro->get_notes_pending_billing_count_as_dna()}}</th>
-                                    <th class="pl-2">
-                                        <a href="{{ route('dna.notes_pending_billing') }}"
-                                           native target="_blank"
-                                           open-in-stag-popup
-                                           popup-style="tall"
-                                           title="Notes Pending Billing">
-                                            Notes Pending Billing
-                                        </a>
-                                    </th>
-                                </tr>
 
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_without_appointment_count_as_dna()}}</th>

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

@@ -157,13 +157,13 @@ $medicaidStates = Config::get('constants.medicaid_states');
 
 							<div class='form-group mb-3'>
 								<label class='control-label'>How did you hear about us?</label>
-								<textarea class='form-control' type='text' required="" name='initiative'></textarea>
+								<input  class='form-control' type='text' required="" name='initiative'/>
 							</div>
 
 						</div>
 						<div class="col-md-6">
-							<div class="col-md-12 bg-light p-3 mb-2">
-								<h5 class="m-0 font-weight-bold">Insurance Cover Details:</h5>
+							<div class="col-md-12 bg-light py-3 px-1 mb-2 ">
+								<h5 class="m-0 font-weight-bold">Insurance Coverage:</h5>
 							</div>
 							<div class="px-1">
 								<div class="row">