Merge branch 'dev-vj' into dev-vj-rx-erx-link

app/Http/Controllers/NoteController.php

@@ -30,7 +30,9 @@ class NoteController extends Controller
                 }
             }
         }
-        return view('app.patient.note.dashboard', compact('patient', 'note', 'pros', 'allSections'));
+
+        $allyPros = Pro::all(); //TODO: paginate, use select2
+        return view('app.patient.note.dashboard', compact('patient', 'note', 'allyPros', 'allSections'));
     }
 
     public function renderNote($noteUid, Request $request)

app/Models/Client.php

@@ -51,6 +51,11 @@ class Client extends Model
         return $this->hasOne(Pro::class, 'id', 'rmg_pro_id');
     }
 
+    public function defaultNaPro()
+    {
+        return $this->hasOne(Pro::class, 'id', 'default_na_pro_id');
+    }
+
     public function prosInMeetingWith()
     {
         return Pro::where('in_meeting_with_client_id', $this->id)->get();

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

@@ -0,0 +1,40 @@
+@if($performer->pro->pro_type == 'ADMIN')
+    <div>
+        @if($note->allyPro)
+            <h2>NA: {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</h2>
+            <span class="d-block" moe>
+                <a class="text-danger" href="" show start>Remove NA</a>
+                <form url="/api/note/removeNa">
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <p>Remove NA?</p>
+                    <div class="mb-0">
+                        <button class="btn btn-success btn-sm" submit>Submit</button>
+                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                    </div>
+                </form>
+            </span>
+        @else
+            <div class="alert alert-info">No NA set</div>
+            <span class="d-block" moe>
+                <a class="text-danger" href="" show start>Set NA</a>
+                <form url="/api/note/putNa">
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <div class="form-group">
+                        <label for="" class="control-label">NA</label>
+                        <select name="naProUid" class="form-control">
+                            <option value="">--select--</option>
+                            @foreach($allyPros as $allyPro)
+                                <option value="{{$allyPro->uid}}">{{$allyPro->name_first}} {{$allyPro->name_last}}</option>
+                            @endforeach
+                        </select>
+                    </div>
+                    <div class="mb-0">
+                        <button class="btn btn-success btn-sm" submit>Submit</button>
+                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                    </div>
+                </form>
+            </span>
+        @endif
+
+    </div>
+@endif

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

@@ -208,7 +208,7 @@
                             <div moe
                                  class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                  title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
-                                <a class="" href="" show start>Sign Note</a>
+                                <a class="" href="" show start>Sign Note As HCP</a>
                                 <form url="/api/note/signAsHcp" right>
                                     <input type="hidden" name="uid" value="{{$note->uid}}">
                                     <p>Sign this note as HCP?</p>
@@ -221,6 +221,32 @@
                         @endif
                     </div>
                 </div>
+                @if($note->allyPro)
+                <div class="mx-4">
+                    <div>
+                        @if($note->is_signed_by_ally)
+                            <span class="text-secondary">
+                        <i class="fa fa-check"></i>
+                        Note Signed By NA
+                    </span>
+                        @else
+                            <div moe
+                                 class="{{ $note->ally_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                 title="{{ $note->ally_pro_id !== $pro->id ? 'Only the note\'s Ally can sign' : '' }}">
+                                <a class="" href="" show start>Sign Note As NA</a>
+                                <form url="/api/note/signAsAlly" right>
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Sign this NA?</p>
+                                    <div class="mb-0">
+                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                </div>
+                @endif
                 @if($note->is_cancelled || (!$note->is_cancelled && !$note->is_signed_by_hcp))
                 <div class="ml-2 pl-2 border-left">
                     <div class="d-flex justify-content-end">
@@ -434,7 +460,7 @@
                         <div class="d-flex align-items-center mb-2">
                             <p class="font-weight-bold text-secondary m-0">Bills</p>
                             @include('app/patient/note/_create-bill')
-                            @if($pro->pro_type === 'ADMIN')
+
                                 @if(!$note->is_bill_closed)
                                     <span class="mx-2 text-secondary">|</span>
                                     <span class="d-block" moe>
@@ -462,14 +488,13 @@
                                         </form>
                                     </span>
                                 @endif
-                            @else
                                 <span class="mx-2 text-secondary">|</span>
-                                @if(!$note->is_bill_ready_to_verify)
+                                @if(!$note->is_billing_marked_done)
                                     <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Mark Ready to Verify</a>
-                                        <form url="/api/note/setIsBillReadyToVerifyToTrue">
+                                        <a class="text-danger" href="" show start>Mark Billing Done</a>
+                                        <form url="/api/note/setIsBillingMarkedDoneToTrue">
                                             <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark bills on this note as Ready to Verify?</p>
+                                            <p>Mark billing on this note as done?</p>
                                             <div class="mb-0">
                                                 <button class="btn btn-success btn-sm" submit>Submit</button>
                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
@@ -478,17 +503,17 @@
                                     </span>
                                 @else
                                     <span class="d-block" moe>
-                                        <a class="text-danger" href="" show start>Undo Mark Ready to Verify</a>
-                                        <form url="/api/note/setIsBillReadyToVerifyToFalse">
+                                        <a class="text-danger" href="" show start>Undo Mark Billing Done</a>
+                                        <form url="/api/note/setIsBillingMarkedDoneToFalse">
                                             <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark bills on this note as Not Ready to Verify?</p>
+                                            <p>Mark billing on this note as not done?</p>
                                             <div class="mb-0">
                                                 <button class="btn btn-success btn-sm" submit>Submit</button>
                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                             </div>
                                         </form>
                                     </span>
-                                @endif
+
                             @endif
                         </div>
 
@@ -557,7 +582,7 @@
                                         @endif
                                     </td>
                                     <td class="">
-                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }}</div>
+                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
                                         <div class="text-nowrap mt-1">
                                             <span class="text-secondary">Paid: </span>
                                             <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
@@ -573,6 +598,26 @@
                                                 <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
                                             </div>
                                         @endif
+                                        @if($bill->ally)
+                                            <hr>
+                                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
+                                            <div class="text-nowrap mt-1">
+                                                <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">
+                                                    <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">
+                                                    <span class="text-secondary">Amount: </span>
+                                                    <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
+                                                </div>
+                                            @endif
+                                        @endif
+
                                     </td>
                                     <td class="pr-3">
                                         @if($bill->has_hcp_been_paid)
@@ -594,7 +639,7 @@
                                                 <span moe
                                                       class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                                       title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
-                                                    <a class="" href="" show start>Sign</a>
+                                                    <a class="" href="" show start>Sign As HCP</a>
                                                     <form url="/api/bill/signAsHcp">
                                                         <input type="hidden" name="uid" value="{{$bill->uid}}">
                                                         <p>Sign this bill as HCP?</p>
@@ -605,6 +650,27 @@
                                                     </form>
                                                 </span>
                                             @endif
+
+                                            @if($bill->is_signed_by_na)
+                                                <span class="d-block text-secondary text-nowrap">
+                                                    <i class="fa fa-check"></i>
+                                                    NA Signed
+                                                </span>
+                                            @else
+                                                <span moe
+                                                      class="d-block {{ $bill->na_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                      title="{{ $bill->na_pro_id !== $pro->id ? 'Only the bill\'s NA can sign' : '' }}">
+                                                    <a class="" href="" show start>Sign As NA</a>
+                                                    <form url="/api/bill/signAsNa">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Sign this bill as NA?</p>
+                                                        <div class="mb-0">
+                                                            <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @endif
                                         @endif
                                     </td>
                                     <td>
@@ -731,20 +797,38 @@
 
                                     </td>
                                     <td> <!-- submit payment -->
-                                        @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
-                                            <span class="d-block" moe relative="">
-                                                <a class="font-weight-bold" href="" show start>Submit Payment</a>
-                                                <form url="/api/bill/payHcpAmount" right>
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Submit Payment</p>
-                                                    <div class="mb-0">
-                                                        <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
-                                                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
-                                        @endif
+                                        <div class="my-1">
+                                            @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
+                                                <span class="d-block" moe relative="">
+                                                    <a class="font-weight-bold" href="" show start>Submit Payment For HCP</a>
+                                                    <form url="/api/bill/payHcpAmount" right>
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Submit Payment</p>
+                                                        <div class="mb-0">
+                                                            <input type="text" class="text form-control form-control-sm" name="hcpPaymentAmount" value="{{$bill->hcp_expected_payment_amount}}" placeholder="amount"><br>
+                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @endif
+                                        </div>
+                                        <div class="my-1">
+                                            @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
+                                                <span class="d-block" moe relative="">
+                                                    <a class="font-weight-bold" href="" show start>Submit Payment For NA</a>
+                                                    <form url="/api/bill/payNaAmount" right>
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Submit Payment For NA</p>
+                                                        <div class="mb-0">
+                                                            <input type="text" class="text form-control form-control-sm" name="naPaymentAmount" value="{{$bill->na_expected_payment_amount}}" placeholder="amount"><br>
+                                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @endif
+                                        </div>
                                     </td>
                                 </tr>
                             @endforeach
@@ -1097,6 +1181,10 @@
 
                 @include('app/patient/note/_cancel-signed-note')
 
+                <div class="border-top p-3">
+                    @include('app/patient/note/_manage_note_ally')
+                </div>
+
             </div>
         </div>
     </div>

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

@@ -207,7 +207,7 @@
                     <div class="font-weight-bold">Associated Pros</div>
                 </div>
                 <div class="pl-3">
-                   
+
                     <div class="mb-1">
                         RMM: <b>{{ $patient->rmm->name_display ?? ''}}</b>
                         @if($pro->pro_type === 'ADMIN')
@@ -217,7 +217,7 @@
                                 <input type="hidden" name="uid" value="{{$patient->uid}}">
                                 <div class="mb-2">
                                     <label class="mb-1 text-secondary text-sm">RMM Pro</label>
-                                    
+
                                     <select class="form-control form-control-sm" name="rmmProUid">
                                         <option value="">--select--</option>
                                         @foreach($pros as $rmmPro)
@@ -267,7 +267,7 @@
                                 <input type="hidden" name="uid" value="{{$patient->uid}}">
                                 <div class="mb-2">
                                     <label class="mb-1 text-secondary text-sm">RMS Pro</label>
-                                    
+
                                     <select class="form-control form-control-sm" name="rmsProUid">
                                         <option value="">--select--</option>
                                         @foreach($pros as $rmsPro)
@@ -284,6 +284,55 @@
                         @endif
                     </div>
 
+                    <div class="mb-1">
+                        <label>Default NA:</label> <b>{{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}</b>
+                        @if($pro->pro_type == 'ADMIN')
+                            <div moe class="ml-2">
+                                <a start show><i class="fa fa-edit"></i></a>
+                                <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
+                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                    <div class="mb-2">
+                                        <label class="text-secondary text-sm">Default NA Pro</label>
+                                        <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}"
+                                                name="defaultNaProUid"
+                                                class="form-control form-control-sm">
+                                            <option value=""> --select--</option>
+                                            @foreach($pros as $iPro)
+                                                <option
+                                                    value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->defaultNaPro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                    <div>
+                                        <button submit class="btn btn-sm btn-primary mr-1">Submit
+                                        </button>
+                                        <button cancel class="btn btn-sm btn-default border">
+                                            Cancel
+                                        </button>
+                                    </div>
+                                </form>
+                            </div>
+                            @if($patient->defaultNaPro)
+                                <div moe class="ml-2">
+                                    <a start show><i class="fa fa-times"></i></a>
+                                    <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                        <div class="mb-2">
+                                            <label class="text-secondary text-sm">Remove Default NA Pro</label>
+
+                                        </div>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Submit
+                                            </button>
+                                            <button cancel class="btn btn-sm btn-default border">
+                                                Cancel
+                                            </button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+                        @endif
+                    </div>
                 </div>
 
             </div>
@@ -456,6 +505,8 @@
                     </span>
                 </div>
 
+
+
                 @if($pro->pro_type == 'ADMIN')
                 <hr class="m-negator-3 mt-3">
                 <div>

resources/views/layouts/patient.blade.php

@@ -534,6 +534,55 @@
                                                 @endif
                                             @endif
                                         </div>
+                                        <div>
+                                            <label>Default NA:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
+                                            @if($pro->pro_type == 'ADMIN')
+                                                <div moe class="ml-2">
+                                                    <a start show><i class="fa fa-edit"></i></a>
+                                                    <form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
+                                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                        <div class="mb-2">
+                                                            <label class="text-secondary text-sm">Default NA Pro</label>
+                                                            <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}"
+                                                                    name="defaultNaProUid"
+                                                                    class="form-control form-control-sm">
+                                                                <option value=""> --select--</option>
+                                                                @foreach($pros as $iPro)
+                                                                    <option
+                                                                        value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->defaultNaPro->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                        <div>
+                                                            <button submit class="btn btn-sm btn-primary mr-1">Submit
+                                                            </button>
+                                                            <button cancel class="btn btn-sm btn-default border">
+                                                                Cancel
+                                                            </button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                                @if($patient->defaultNaPro)
+                                                    <div moe class="ml-2">
+                                                        <a start show><i class="fa fa-times"></i></a>
+                                                        <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+                                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                            <div class="mb-2">
+                                                                <label class="text-secondary text-sm">Remove Default NA Pro</label>
+
+                                                            </div>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-primary mr-1">Submit
+                                                                </button>
+                                                                <button cancel class="btn btn-sm btn-default border">
+                                                                    Cancel
+                                                                </button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @endif
+                                            @endif
+                                        </div>
                                     </section>
                                     {{--<section>
                                         <div>