fixed typo on deductible

app/Http/Controllers/PracticeManagementController.php

@@ -3517,7 +3517,14 @@ ORDER BY c.name_last, c.name_first
 
         $pro = $this->performer()->pro;
         if($pro->pro_type !== 'ADMIN') {
-            $patients = $patients->where('mcp_pro_id', $this->performer()->pro->id);
+            if($pro->is_hcp){
+               $patients = $patients->where('mcp_pro_id', $this->performer()->pro->id); 
+            }
+            if($pro->is_considered_for_dna){
+                $patients = $patients->where('default_na_pro_id', $this->performer()->pro->id); 
+             }
+            
+
         }
 
         // filters

resources/views/app/dna/appointments.blade.php

@@ -79,7 +79,7 @@
 
                     @if(count($appointments) === 0)
                     <tr>
-                        <td colspan="6">No records found!</td>
+                        <td colspan="10">No records found!</td>
                     </tr>
                     @endif
                 </tbody>
@@ -93,4 +93,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

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

@@ -16,11 +16,11 @@ $appointmentPendingConfirmation = $performer->pro->appointmentsPendingConfirmati
                 @foreach($appointmentPendingConfirmation as $appointment)
                 <tr class="{{$appointment->bgColor}}">
                     <td>
-                        <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
+                        <a native target="_blank" href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
                             {{$appointment->client->name_first }} {{$appointment->client->name_last }}
                         </a>
                         <div class="mt-1">
-                            <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
+                            <a native target="_blank" href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
                                 {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
                             <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
                         </div>

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

@@ -16,11 +16,11 @@ $cancelledApptsPendingAck = $performer->pro->cancelledAppointmentsPendingAckReco
                 @foreach($cancelledApptsPendingAck as $appointment)
                 <tr class="{{$appointment->bgColor}}">
                     <td>
-                        <a href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
+                        <a native target="_blank" href="/patients/view/{{$appointment->clientUid}}" class="font-weight-bold d-block">
                             {{$appointment->client->name_first }} {{$appointment->client->name_last }}
                         </a>
                         <div class="mt-1">
-                            <a href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
+                            <a native target="_blank" href="/patients/view/{{$appointment->clientUid}}/calendar/{{$appointment->uid}}">
                                 {{ friendly_date_time($appointment->start_time) }} - {{ friendly_date_time($appointment->end_time) }}</a>
                             <span class="text-secondary">{{ friendly_timezone($appointment->timezone) }}</span>
                         </div>

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

@@ -22,10 +22,12 @@
                         @foreach($encountersInProgress as $row)
                         <tr>
                             <td class="text-nowrap">
-                                {{$row->client->chart_number}}
+                                <a native target="_blank" href="{{ route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row]) }}">
+                                  {{$row->client->chart_number}}
+                                </a>
                             </td>
                             <td>
-                                <a href="{{ route('patients.view.dashboard', $row->client) }}">
+                                <a native target="_blank" href="{{ route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row]) }}">
                                     {{$row->client->displayName()}}
                                 </a>
                             </td>
@@ -61,4 +63,4 @@
             @endif
         </div>
     </div>
-</div>
+</div>

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

@@ -27,12 +27,12 @@
                             {{$row->client->chart_number}}
                         </td>
                         <td>
-                            <a href="{{route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row])}}">
+                            <a native target="_blank" href="{{route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row])}}">
                                 {{$row->client->displayName()}}
                             </a>
                         </td>
                         <td>
-                            <a href="{{ route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row]) }}">
+                            <a native target="_blank" href="{{ route('patients.view.notes.view.dashboard', ['patient' => $row->client, 'note' => $row]) }}">
                                 {{friendly_date($row->effective_dateest)}}
                             </a>
                         </td>

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

@@ -22,6 +22,7 @@
                     <div class="text-secondary text-sm">{{$appt->status_memo}} This is a status memo</div>
                 @endif
             </div>
+            @if($appt->pro_id == $pro->id)
             <div moe relative class="ml-auto">
                 <form show url="/api/appointment/acknowledgeStatusAsAppointmentPro">
                     <input type="hidden" name="uid" value="{{$appt->uid}}">
@@ -36,6 +37,7 @@
                     <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
                 </form>
             </div>
+            @endif
         </div>
     @endforeach
 @endif
@@ -46,12 +48,14 @@
             <a href="/patients/view/{{$appt->client->uid}}"><b>{{$appt->client->displayName()}}</b></a>
             <span class="ml-2">{{friendlier_date_time($appt->start_time)}}</span>
             <span class="ml-2">{{$appt->latestConfirmationDecision->decision_enum}}</span>
-            <div moe relative class="ml-auto">
-                <form show url="/api/appointment/acknowledgeDecisionAsAppointmentPro">
-                    <input type="hidden" name="uid" value="{{$appt->uid}}">
-                    <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
-                </form>
-            </div>
+            @if($appt->pro_id == $pro->id)
+                <div moe relative class="ml-auto">
+                    <form show url="/api/appointment/acknowledgeDecisionAsAppointmentPro">
+                        <input type="hidden" name="uid" value="{{$appt->uid}}">
+                        <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
+                    </form>
+                </div>
+            @endif
         </div>
     @endforeach
 @endif

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

@@ -23,7 +23,7 @@
                         {{$row->chart_number}}
                     </td>
                     <td class="pl-2">
-                        <a href="{{ route('patients.view.dashboard', $row) }}">
+                        <a native target="_blank" href="{{ route('patients.view.dashboard', $row) }}">
                             {{$row->displayName()}}
                         </a>
                     </td>

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

@@ -24,7 +24,7 @@
                                 {{$row->chart_number}}
                             </td>
                             <td>
-                                <a href="{{ route('patients.view.dashboard', $row) }}">
+                                <a native target="_blank" href="{{ route('patients.view.dashboard', $row) }}">
                                     {{$row->displayName()}}
                                 </a>
                             </td>

resources/views/app/dna/my-bills.blade.php

@@ -16,79 +16,289 @@
         </div>
 
         <div class="card-body p-0">
+
+
             <div class="p-3">
                 @include('app.dna.my_bills_filters')
             </div>
-            <table class="table table-sm table-striped p-0 m-0">
-                <thead class="bg-light border-top">
-                    <tr>
-                        <th class="border-0">Effective Date</th>
-                        <th class="border-0">Patient</th>
-                        <th class="border-0">Service</th>
-                        <th class="border-0">Description</th>
-                        <th class="border-0">Amount</th>
-                        <th class="border-0">Submitted</th>
-                        <th class="border-0">Verified</th>
-                        <th class="border-0">Cancelled</th>
-                    </tr>
+            <table class="table table-sm table-striped mb-0 table-bordered">
+                <thead class="bg-light">
+                <tr class="text-secondary">
+                    <th class="border-bottom-0">Date</th>
+                    <th class="border-bottom-0">Pro</th>
+                    @if(@$adminView)
+                        <th class="border-bottom-0">Context</th>
+                    @endif
+                    <th class="border-bottom-0">Service</th>
+                    <th class="border-bottom-0">Billable</th>
+                    <th class="border-bottom-0 screen-only">Total</th>
+                    <th class="border-bottom-0">Sign</th>
+                    <th class="border-bottom-0">Cancellation</th>
+                    <th class="border-bottom-0">Verification</th>
+                    @if($pro->pro_type === 'ADMIN')
+                    <th class="border-bottom-0 screen-only">Payment</th>
+                    @endif
+                </tr>
                 </thead>
                 <tbody>
-                    @foreach($bills as $bill)
-                    <tr>
-                        <td>{{ friendly_date($bill->effective_date) }}</td>
-                       
-                        <td>
-                            @if($bill->client)
-                            <a native target="_blank" href="{{route('patients.view.dashboard', $bill->client)}}">
-                                {{$bill->client->displayName()}}
-                            </a>
-                            @else 
-                            --
+                @foreach ($bills as $bill)
+                    <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
+                        <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
+                        <td class="">
+                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->genericPro->displayName() }}</div>
+                            <div class="text-nowrap mt-1 screen-only">
+                                <span class="text-secondary">Paid: </span>
+                                <span>{{ $bill->has_generic_pro_been_paid ? 'Yes' : 'No' }}</span>
+                            </div>
+                            @if(!$bill->has_generic_pro_been_paid)
+                                <div class="text-nowrap mt-1 screen-only">
+                                    <span class="text-secondary">Expected: </span>
+                                    <span class="font-weight-bold">${{ round($bill->total_expected, 2) }}</span>
+                                </div>
+                            @else
+                                <div class="text-nowrap mt-1 screen-only">
+                                    <span class="text-secondary">Amount: </span>
+                                    <span class="font-weight-bold">${{ round($bill->total_paid, 2) }}</span>
+                                </div>
                             @endif
                         </td>
-                        <td>{{ $bill->bill_service_type }}</td>
-                        <td class="border-0"><?= nl2br($bill->generic_description) ?></td>
-                        <td>
-                            @if($bill->bill_service_type === 'GENERIC')
-                            {{ $bill->generic_pro_expected_payment_amount ? '$'.friendly_money($bill->generic_pro_expected_payment_amount) : '' }}</td>
-                            @else 
-                            {{ $bill->na_expected_payment_amount ? '$'.friendly_money($bill->na_expected_payment_amount) : '' }}</td>
+                        @if(@$adminView)
+                            <td>
+                                @include('app.generic-bills.context')
+                            </td>
+                        @endif
+                        <td>{{$bill->code}}
+                            @if($bill->generic_description)
+                                <pre class="max-width-300px text-wrap mb-0 text-sm text-secondary font-italic">{!! preg_replace('#<br\s*/?>#i', "\n", $bill->generic_description) !!}</pre>
                             @endif
-                        <td>
-                            @if($bill->has_hcp_been_paid)
-                            <span>YES</span>
-                            <div class="d-flex flex-column">
-                                <span class="text-muted">Expected: ${{ $bill->hcp_expected_payment_amount }}</span>
-                                <span class="text-muted">Paid: ${{ $bill->hcp_payment_amount }}</span>
-                            </div>
-                            @else
-                            <span>NO</span>
+                            @if(!$bill->is_signed_by_generic_pro)
+                                <div moe wide>
+                                    <a href="#" start show class="text-nowrap text-sm">Edit Description</a>
+                                    <form url="/api/bill/putGenericDescription">
+                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                        <p>Edit Description</p>
+                                        <div class="mb-2">
+                                                <textarea class="text form-control form-control-sm"
+                                                          rows="5"
+                                                          name="genericDescription"
+                                                          placeholder="">{{$bill->generic_description ? preg_replace('#<br\s*/?>#i', "\n", $bill->generic_description) : ''}}</textarea>
+                                        </div>
+                                        <div>
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
                             @endif
                         </td>
-                        <td>
-                            @if($bill->is_verified)
-                            <span>YES</span>
+                        <td class="">
+                            <?php
+                            $totalSeconds = $bill->number_of_units * 3600;
+                            $remainder = $totalSeconds % 60;
+                            if ($remainder !== 0) {
+                                if ($remainder < 30) {
+                                    $totalSeconds = $totalSeconds - $remainder;
+                                }
+                                else {
+                                    $totalSeconds = $totalSeconds + (60 - $remainder);
+                                }
+                            }
+                            ?>
+                            {{ time_in_hrminsec($totalSeconds) }}
+                        </td>
+                        <td class="pr-3 screen-only text-nowrap">
+                            @if($bill->has_generic_pro_been_paid)
+                                <span class="text-secondary">Paid. </span>
+                                <span class="font-weight-bold">${{ round($bill->total_paid, 2) }}</span>
                             @else
-                            <span>NO</span>
+                                <span class="text-secondary">Exp. </span>
+                                <span class="font-weight-bold">{{ $bill->total_expected ? '$' . round($bill->total_expected, 2) : '-' }}</span>
                             @endif
                         </td>
                         <td>
+                            @if(!$bill->is_cancelled)
+                                @if($bill->is_signed_by_generic_pro)
+                                    <div class="d-block text-secondary text-nowrap">
+                                        <i class="fa fa-check"></i>
+                                        Signed
+                                    </div>
+                                @else
+                                    <div moe
+                                          class="d-block {{ $bill->generic_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                          title="{{ $bill->generic_pro_id !== $pro->id ? 'Only the bill\'s pro can sign' : '' }}">
+                                        <a class="text-nowrap" href="" show start>Sign</a>
+                                        <form url="/api/bill/signAsGenericPro">
+                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                            <p>Sign this bill?</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
+                            @endif
+                        </td>
+                        <td>  <!-- cancellation -->
                             @if($bill->is_cancelled)
-                            <span>YES</span>
+                                <div class="text-warning-mellow font-weight-bold">Cancelled</div>
+                                @if($bill->cancellation_memo)
+                                    <div class="text-dark text-sm font-italic my-1">{{$bill->cancellation_memo}}</div>
+                                @endif
+                                @if($bill->is_cancelled_by_administrator)
+                                    <div class="text-secondary text-sm text-nowrap">(by Administrator)</div>
+                                @endif
+                                <div moe class="mt-1">
+                                    <a class="text-nowrap" href="" show start>Update Memo</a>
+                                    <form url="/api/bill/updateCancellationMemo">
+                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                        <p>Update Cancellation Memo</p>
+                                        <div class="mb-2">
+                                            <textarea class="text form-control form-control-sm" name="cancellationMemo"
+                                                      placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
+                                        </div>
+                                        <div>
+                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
                             @else
-                            <span>NO</span>
+                                <div class="d-block" moe relative="">
+                                    <a class="text-danger" href="" show start>Cancel</a>
+                                    <form url="/api/bill/markCancelled" right="">
+                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                        <p class="mb-2">Cancel this bill?</p>
+                                        <div class="mb-2">
+                                            <label class="mb-1 text-secondary">Cancellation Memo</label>
+                                            <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">@if($pro->pro_type === 'ADMIN')Please contact billing.@endif</textarea>
+                                        </div>
+                                        <div class="mb-0">
+                                            <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                            <button class="btn btn-default border btn-sm" cancel>No</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+
+                            @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
+                                <div class="mt-2 text-secondary text-nowrap">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    Not Ack.
+                                </div>
+                                <div class="d-block mt-1" moe>
+                                    <a class="text-nowrap" href="" show start>Ack. Cancellation</a>
+                                    <form url="/api/bill/acknowledgeCancellation">
+                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                        <p>Acknowledge Cancellation?</p>
+                                        <div class="mb-0">
+                                            {{--<input type="text" class="text form-control form-control-sm" name="cancellationMemo" value="{{$bill->cancellation_memo}}" placeholder=""><br>--}}
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
                             @endif
-                        </td>
-                    </tr>
-                    @endforeach
 
-                    @if(count($bills) === 0)
-                    <tr>
-                        <td colspan="9">No records found!</td>
+                            @if($bill->is_cancellation_acknowledged)
+                                <div class="mt-2 text-secondary">
+                                    <i class="fa fa-check"></i>
+                                    Ack.
+                                </div>
+                                <div class="d-block mt-1" moe>
+                                    <a class="text-nowrap" href="" show start>Undo Cancellation Ack.</a>
+                                    <form url="/api/bill/undoAcknowledgeCancellation">
+                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                        <p>Undo Acknowledge Cancellation?</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>
+                                </div>
+                            @endif
+
+                        </td>
+                        @if($pro->pro_type !== 'ADMIN')
+                        <td> <!-- verification -->
+                            @if(!$bill->is_cancelled)
+                                @if(!$bill->is_verified)
+                                    <div class="text-warning-mellow font-weight-bold text-nowrap">Not Verified</div>
+                                @else
+                                    <div class="text-info font-weight-bold text-nowrap"><i class="fa fa-check"></i> Verified</div>
+                                @endif
+                            @endif
+                        </td>
+                        @endif
+                        @if($pro->pro_type === 'ADMIN')
+                        <td> <!-- verification -->
+                            @if(!$bill->is_cancelled)
+                                @if(!$bill->is_verified)
+                                    <div class="text-warning-mellow font-weight-bold text-nowrap">Not Verified</div>
+                                    <div class="d-block mt-1" moe>
+                                        <a href="" show start>Mark Verified</a>
+                                        <form url="/api/bill/markAsVerified">
+                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                            <p>Mark As Verified?</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>
+                                    </div>
+                                @else
+                                    <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                    <div class="d-block mt-1" moe>
+                                        <a class="" href="" show start>Undo</a>
+                                        <form url="/api/bill/undoMarkAsVerified">
+                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                            <p>Undo Mark As Verified?</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>
+                                    </div>
+                                @endif
+                            @endif
+                        </td>
+                        <td class="screen-only"> <!-- submit payment -->
+                            <div class="my-1">
+                                @if(!$bill->is_cancelled && !$bill->has_generic_pro_been_paid )
+                                    @if(+$bill->total_expected && $bill->is_signed_by_generic_pro)
+                                        <div class="d-block" moe relative="">
+                                            <a class="font-weight-bold text-nowrap" href="" show start>Submit Payment</a>
+                                            <form url="/api/bill/payGenericProAmount" 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="genericProPaymentAmount" value="{{$bill->total_expected}}" 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>
+                                        </div>
+                                    @else
+                                        @if(!+$bill->total_expected)
+                                            <div class="mb-1 text-danger">
+                                                <i class="fa fa-exclamation-triangle"></i>
+                                                Pro expected amount is invalid
+                                            </div>
+                                        @endif
+                                        @if(!$bill->is_signed_by_generic_pro)
+                                            <div class="mb-1 text-danger">
+                                                <i class="fa fa-exclamation-triangle"></i>
+                                                Pro has not signed the bill
+                                            </div>
+                                        @endif
+                                    @endif
+                                @endif
+                            </div>
+                        </td>
+                        @endif
                     </tr>
-                    @endif
+                @endforeach
                 </tbody>
-
             </table>
             @if($bills->hasPages())
                 <div class="ml-2 mt-2">
@@ -98,4 +308,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

resources/views/app/patient/claims-resolver.blade.php

@@ -22,7 +22,7 @@
     $totalNotesWithBillingClosed = 0;
     $totalNotesWithClaimingClosed = 0;
     foreach($patient->notesAscending as $note){
-        if($note->is_cancelled) continue;
+        if($note->is_cancelled || !$note->hcpPro) continue;
         $hcpIdToProMap[$note->hcp_pro_id] = $note->hcpPro;
         $d = $note->effective_dateest;
         $firstDateSeenByHcpMap[$note->hcp_pro_id] = isset($firstDateSeenByHcpMap[$note->hcp_pro_id]) ? $firstDateSeenByHcpMap[$note->hcp_pro_id] : $d;
@@ -240,7 +240,7 @@
             $loopLastContentByHcp = [];
             $rowIndex = 0;
             foreach($patient->notesAscending as $note){
-                if($note->is_cancelled) continue;
+                if($note->is_cancelled || !$note->hcpPro) continue;
                 $rowIndex++;
 
                 $d = $note->effective_dateest;

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

@@ -36,7 +36,7 @@
         <small class="ml-2 text-muted">(No insurance)</small>
     @endif
 </div>
-@if($coverage->plan_type === 'MEDICARE')
+@if($coverage && $coverage->plan_type === 'MEDICARE')
     @if(@$patient->mpb_remaining !== null)
         <small class="text-muted d-block ml-3">Deductible: {{format_number(@$patient->mpb_remaining)}} </small>
     @endif

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

@@ -110,24 +110,32 @@
                                 @if($measurement->is_cellular_zero || !$measurement->ts)
                                     -
                                 @else
-                                    @if($measurement->has_been_stamped_by_mcp)
+                                    @if($measurement->careMonth)
+                                        @if($measurement->careMonth->mcp && $measurement->careMonth->mcp->id == $pro->id && $measurement->has_been_stamped_by_mcp)
+                                            <i class="fa fa-check text-success mr-2" title="Stamped"></i>
+                                        @elseif($measurement->careMonth->rmePro && $measurement->careMonth->rmePro->id == $pro->id && $measurement->has_been_stamped_by_rme)
                                         <i class="fa fa-check text-success mr-2" title="Stamped"></i>
-                                    @else
-                                        <div moe relative>
-                                            <a href="#" start show>Stamp</a>
-                                            <form url="/api/measurement/stamp" class="width-300px" right>
-                                                <input type="hidden" name="uid" value="{{$measurement->uid}}">
-                                                <p class="mb-1">Stamp this measurement?</p>
-                                                <div class="mb-2">
-                                                    <label class="mb-1 text-secondary text-sm">Memo</label>
-                                                    <textarea class="form-control form-control-sm" name="memo"></textarea>
-                                                </div>
-                                                <div class="form-group m-0">
-                                                    <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
-                                                    <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                        @elseif($measurement->careMonth->rmmPro && $measurement->careMonth->rmmPro->id == $pro->id && $measurement->has_been_stamped_by_rmm)
+                                        <i class="fa fa-check text-success mr-2" title="Stamped"></i>
+                                        @else
+                                            @if($measurement->careMonth->mcp && $measurement->careMonth->mcp->id == $pro->id || $measurement->careMonth->rmePro && $measurement->careMonth->rmePro->id == $pro->id || $measurement->careMonth->rmmPro && $measurement->careMonth->rmmPro->id == $pro->id)
+                                                <div moe relative>
+                                                    <a href="#" start show>Stamp</a>
+                                                    <form url="/api/measurement/stamp" class="width-300px" right>
+                                                        <input type="hidden" name="uid" value="{{$measurement->uid}}">
+                                                        <p class="mb-1">Stamp this measurement?</p>
+                                                        <div class="mb-2">
+                                                            <label class="mb-1 text-secondary text-sm">Memo</label>
+                                                            <textarea class="form-control form-control-sm" name="memo"></textarea>
+                                                        </div>
+                                                        <div class="form-group m-0">
+                                                            <button submit class="btn btn-primary btn-sm mr-2">Submit</button>
+                                                            <button cancel class="btn btn-default border btn-sm mr-2">Cancel</button>
+                                                        </div>
+                                                    </form>
                                                 </div>
-                                            </form>
-                                        </div>
+                                            @endif
+                                        @endif
                                     @endif
                                 @endif
                             </td>

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

@@ -158,7 +158,7 @@
 
                     <div class="form-group mb-2">
                         <label for="" class="text-secondary text-sm mb-1">HCP Pro *</label>
-                        <select name="hcpProUid" class="form-control" provider-search required data-pro-uid="{{$pro->is_hcp ? $pro->uid : ''}}">
+                        <select name="hcpProUid" class="form-control" provider-search required <?= $pro->pro_type !== 'ADMIN' ? 'provider-type="hcp"':'' ?> data-pro-uid="{{$pro->is_hcp ? $pro->uid : ''}}">
                         </select>
                     </div>
 

resources/views/layouts/template.blade.php

@@ -116,7 +116,7 @@
                 @elseif($pro->is_considered_for_dna)
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
-                @else 
+                @else
                     <li class="nav-item"><a class="nav-link" href="{{ route('ps.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
                 @endif
 
@@ -145,7 +145,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.myTextShortcuts') }}">My Text Shortcuts</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myFavorites') }}">My Favorites</a>
                             <a class="dropdown-item" href="{{ route('practice-management.my-flyers') }}">My Flyers</a>
-                        @else 
+                        @else
                             <a class="dropdown-item" href="{{ route('ps.client-review-requests') }}">My Patient Chart Review Requests</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myTickets') }}">My Bills</a>
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
@@ -158,8 +158,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.myFavorites') }}">Favorites</a>
                             <a class="dropdown-item" href="{{ route('practice-management.proAvailability') }}">Availability</a>
                             <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Calendar</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
-
+                            
                             <a class="dropdown-item" href="{{ route('practice-management.rpmMatrix') }}">RPM Matrix</a>
 
                             <a class="dropdown-item" href="{{ route('mcp.notes') }}">Notes</a>
@@ -180,7 +179,7 @@
                             <a class="dropdown-item" href="{{ route('dna.careMonths') }}">Care Months</a>
                             <a class="dropdown-item" href="{{ route('dna.financialTransactions') }}">Financial Transactions</a>
                             <a class="dropdown-item" href="{{ route('dna.myBills') }}">My Bills</a>
-                            <a class="dropdown-item" href="{{ route('dna.myClinicalTeams') }}">My Clinical Teams</a>
+                            <!-- <a class="dropdown-item" href="{{ route('dna.myClinicalTeams') }}">My Clinical Teams</a> -->
                         @endif
                         @if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_supervising_physician)
                         <a class="dropdown-item" href="{{ route('practice-management.notes-pending-physician-supervisor-stamping') }}">Notes Pending Physician Supervisor Stamping</a>