updated

app/Http/Controllers/McpController.php

@@ -83,7 +83,7 @@ class McpController extends Controller
         return view('app.mcp.client_messages', compact('clientMessages'));
     }
 
-    
+
 
     public function new_patients_awaiting_visit(Request $request){
         $data = [];

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

@@ -53,64 +53,73 @@
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_notes_pending_billing_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.notes_pending_billing') }}">Notes Pending Billing</a>
+                                        <a href="{{ route('mcp.notes_pending_billing') }}">
+                                            Notes Pending Billing
+                                        </a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_incoming_reports_pending_signature_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.reports_pending_signature') }}">Reports Pending
-                                            Signature</a>
+                                        <a href="{{ route('mcp.reports_pending_signature') }}">
+                                            Reports Pending Signature</a>
                                     </th>
                                 </tr>
 
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_without_appointment_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.patients_without_appointments') }}">Patients w/o
-                                            Appointments</a>
+                                        <a href="{{ route('mcp.patients_without_appointments') }}">
+                                            Patients w/o Appointments
+                                        </a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_overdue_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.patients_overdue_for_visit') }}">Patients Overdue for Visit</a>
+                                        <a href="{{ route('mcp.patients_overdue_for_visit') }}">
+                                            Patients Overdue for Visit
+                                        </a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_appointments_pending_acknowledgement_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.cancelled_appointments_pending_review') }}">Cancelled
-                                            Appts. Pending Review</a>
+                                        <a href="{{ route('mcp.cancelled_appointments_pending_review') }}">
+                                            Cancelled Appts. Pending Review</a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_bills_awaiting_review_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.cancelled_bills_pending_review') }}">Cancelled Bills
-                                            Pending Review</a>
+                                        <a href="{{ route('mcp.cancelled_bills_pending_review') }}">
+                                            Cancelled Bills Pending Review
+                                        </a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.cancelled_supply_orders_pending_review') }}">Cancelled
-                                            Supply Orders Pending Review</a>
+                                        <a href="{{ route('mcp.cancelled_supply_orders_pending_review') }}">
+                                            Cancelled Supply Orders Pending Review
+                                        </a>
                                     </th>
                                 </tr>
 
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_erx_and_orders_awaiting_signature_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.erx_and_orders_pending_signature') }}">ERx & Orders
-                                            Pending Signature</a>
+                                        <a href="{{ route('mcp.erx_and_orders_pending_signature') }}">
+                                            ERx & Orders Pending Signature
+                                        </a>
                                     </th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_supply_orders_awaiting_signature_count_as_mcp()}}</th>
                                     <th class="pl-2">
-                                        <a href="{{ route('mcp.supply_orders_pending_signature') }}">Supply Orders
-                                            Pending Signature</a>
+                                        <a href="{{ route('mcp.supply_orders_pending_signature') }}">
+                                            Supply Orders Pending Signature
+                                        </a>
                                     </th>
                                 </tr>
                                 </tbody>
@@ -203,93 +212,6 @@
                 </div>
                 <div class="col-md-9">
 
-                    <div class="row">
-                        <div class="col-6">
-
-                            <!-- Appointment Updates -->
-
-                            @if(false && count($proApptUpdates))
-                                <div class="card mb-4 ack-container">
-                                    <div class="card-header pl-2">
-                                        <strong>
-                                            Appointment Updates
-                                        </strong>
-                                    </div>
-                                    <div class="card-body p-0">
-                                        <table class="table table-sm mb-0 table-bordered">
-                                            <tbody>
-                                            <tr>
-                                                <th>Client</th>
-                                                <th>Appt. Date/Time</th>
-                                                <th>Status</th>
-                                                <th></th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                            @foreach($proApptUpdates as $update)
-                                                <tr>
-                                                    <td>{{$update->name_first}} {{$update->name_last}}</td>
-                                                    <td>{{friendlier_date_time($update->start_time)}}</td>
-                                                    <td>{{$update->status}}</td>
-                                                    <td>
-                                                        <a href="#" class="ack-pro-appt-update"
-                                                           data-uid="{{$update->uid}}">Acknowledge</a>
-                                                    </td>
-                                                </tr>
-                                            @endforeach
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            @endif
-
-                        <!-- new associations -->
-                            @if(count($newMCPAssociations))
-                                <div class="mb-3 border rounded px-3 py-2 ack-container">
-                                    <p class="pt-1 mb-2"><b>New Patients</b></p>
-                                    @foreach($newMCPAssociations as $assoc)
-                                        <div class="d-flex align-items-start bg-light mb-2 px-2 py-1">
-                                            <div class="flex-grow-1">
-                                                New Patients
-                                                <a href="/patients/view/{{$assoc->patient->uid}}"
-                                                   class="">{{$assoc->patient->displayName()}}</a>
-                                                <?php $nextAppt = $assoc->patient->nextAppointment(); ?>
-                                                @if($nextAppt)
-                                                    <div class="font-size-11">
-                                                        <span class="text-secondary font-size-11">Appt.</span>
-                                                        {{$nextAppt->pro->displayName()}}
-                                                        <span class="text-secondary font-size-11">on</span>
-                                                        {{friendlier_date_time($nextAppt->raw_date . ' ' . $nextAppt->raw_start_time)}}
-                                                    </div>
-                                                    @if($nextAppt->status === 'CREATED')
-                                                        <div
-                                                            class="text-warning-mellow font-weight-bold font-size-11 mt-1">
-                                                            <i class="fa fa-exclamation-triangle"></i>
-                                                            Confirmation pending
-                                                        </div>
-                                                    @endif
-                                                    @if($nextAppt->status === 'CONFIRMED')
-                                                        <div class="text-success font-weight-bold font-size-11 mt-1">
-                                                            <i class="fa fa-check"></i>
-                                                            Confirmed by the patient
-                                                        </div>
-                                                    @endif
-                                                    @if($nextAppt->status === 'REJECTED')
-                                                        <div class="text-danger font-weight-bold font-size-11 mt-1">
-                                                            <i class="fa fa-stop"></i>
-                                                            Rejected by the patient
-                                                        </div>
-                                                    @endif
-                                                @endif
-                                            </div>
-                                            <a href="#" class="ack-client-pro-change ml-3" data-uid="{{$assoc->uid}}">Stamp</a>
-                                        </div>
-                                    @endforeach
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-
                     <div class="row mcp-theme-1" id="pro-dashboard-container" v-cloak>
                         <div class="col-md-6 mcp-theme-1">
                             <div class="card mb-4">
@@ -299,79 +221,7 @@
                                     </strong>
                                 </div>
                                 <div class="card-body p-0">
-
-                                    <table v-if="events.length > 0" class="mb-0 table table-sm table-bordered appointments">
-                                        <tr v-for="event in events" class="">
-                                            <td>
-                                                <a :href="'/patients/view/' + event.clientUid" class="font-weight-bold">@{{
-                                                    event.clientName }}</a>
-                                            </td>
-                                            <td>
-                                              {{-- <span class="small d-inline-block text-secondary font-weight-normal"> (@{{ event.clientAge }} y.o. @{{event.clientSex}})</span>--}}
-                                              @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }} <span
-                                                  class="text-secondary">@{{ formatTimeZone(event.timezone) }}</span>
-                                              <span v-if="event.title"
-                                                    class="d-inline-block ml- 2 text-secondary font-weight-bold">
-                                                      &nbsp;/&nbsp;
-                                                  @{{ event.title }}
-                                                  </span>
-                                              <a :href="'/patients/view/' + event.clientUid + '/calendar/' + event.uid">
-                                                  <i class="fa fa-edit"></i>
-                                              </a>
-                                            </td>
-                                            <td>
-                                              <div class="d-flex align-items-baseline">
-                                                  <!-- <div v-if="event.status === 'CREATED'"
-                                                       class="text-warning-mellow font-weight-bold">
-                                                      <i class="fa fa-exclamation-triangle"></i>
-                                                      Confirmation pending
-                                                  </div>
-                                                  <div v-else-if="event.status === 'CONFIRMED'"
-                                                       class="text-success font-weight-bold">
-                                                      <i class="fa fa-check"></i>
-                                                      Confirmed by the patient
-                                                  </div>
-                                                  <div v-else-if="event.status === 'REJECTED'"
-                                                       class="text-danger font-weight-bold">
-                                                      <i class="fa fa-stop"></i>
-                                                      Rejected by the patient
-                                                  </div> -->
-                                                  <select v-model="event.newStatus"
-                                                  class="form-control input-sm bg-light"
-                                                  v-on:change="updateStatus(event)">
-                                                  <option value="CREATED">CREATED</option>
-                                                  <option value="CONFIRMED">CONFIRMED</option>
-                                                  <option value="CANCELLED">CANCELLED</option>
-                                                  <option value="COMPLETED">COMPLETED</option>
-                                                  <option value="ABANDONED">ABANDONED</option>
-                                                </select>
-                                                <div v-if="selectedDate === '{{ date('Y-m-d') }}'"
-                                                class="pt-1 text-right"
-                                                :class="event.started ? 'text-danger': 'text-secondary'">
-                                                @{{ event.inHowManyHours }}
-                                              </div>
-                                              </div>
-                                            </td>
-                                            <td>
-                                              <div>
-                                                  <b v-if="event.coverage == 'YES'" class="text-success">Covered</b>
-                                                  <b v-else-if="event.coverage == 'NO'" class="text-danger">Not Covered</b>
-                                                  <b v-else class="text-warning-mellow">Pending</b>
-                                              </div>
-                                            </td>
-                                        </tr>
-                                    </table>
-
-                                    <div v-if="numEventsForDate === 0 && selectedDate"
-                                         class="bg-light p-3 text-secondary border bounded">
-                                        <span v-if="filterStatus === ''">You have no appointments on <b>@{{ formatSelectedDate(selectedDate) }}</b></span>
-                                        <span v-if="filterStatus !== ''">You have no appointments on <b>@{{ formatSelectedDate(selectedDate) }}</b> with status <b>@{{ filterStatus }}</b></span>
-                                    </div>
-
-                                    <div v-show="!selectedDate" class="bg-light p-3 text-secondary border bounded">
-                                        Please select a date from the calendar on the left
-                                    </div>
-
+                                    @include('app.mcp.dashboard.appointments')
                                 </div>
                             </div>
                             <div class="card mb-4">
@@ -416,6 +266,16 @@
                                     @include('app.mcp.dashboard.notifications')
                                 </div>
                             </div>
+                            <div class="card mb-4">
+                                <div class="card-header pl-2">
+                                    <strong>
+                                        Reports
+                                    </strong>
+                                </div>
+                                <div class="card-body">
+                                    @include('app.mcp.dashboard.reports')
+                                </div>
+                            </div>
                             <div class="card mb-4">
                                 <div class="card-header pl-2">
                                     <strong>
@@ -661,45 +521,45 @@
                                 initFastLoad($('#measurements-tab'));
                             });
                         },
-                        getFormattedCurrentDate: function() {
-                          let date = new Date();
-                          let day = date.getDate();
-                          day =  day < 10 ? '0' + day : day;
+                        getFormattedCurrentDate: function () {
+                            let date = new Date();
+                            let day = date.getDate();
+                            day = day < 10 ? '0' + day : day;
 
-                          return date.getFullYear()+'-'+parseInt(date.getMonth()+1) +'-' + day;
+                            return date.getFullYear() + '-' + parseInt(date.getMonth() + 1) + '-' + day;
                         },
-                        formatSelectedDate: function(_date, _format) {
-                          _format = _format || 'MM/DD/YYYY';
-                          if(_date) {
-                            return moment(_date).format(_format);
-                          }
+                        formatSelectedDate: function (_date, _format) {
+                            _format = _format || 'MM/DD/YYYY';
+                            if (_date) {
+                                return moment(_date).format(_format);
+                            }
                         },
-                        formatTimeZone: function(_tz) {
-                          switch (_tz) {
-                            case 'EASTERN':
-                              return 'EST'
-                              break;
-                            case 'CENTRAL':
-                              return 'CST'
-                              break;
-                            case 'MOUNTAIN':
-                              return 'MST'
-                              break;
-                            case 'PACIFIC':
-                              return 'PST'
-                              break;
-                            case 'ALASKA':
-                              return 'Alaska'
-                              break;
-                            case 'HAWAII':
-                              return 'Hawaii'
-                              break;
-                            case 'PUERTO_RICO':
-                              return 'Puerto Rico'
-                              break;
-                            default:
-                              return 'N/A';
-                          }
+                        formatTimeZone: function (_tz) {
+                            switch (_tz) {
+                                case 'EASTERN':
+                                    return 'EST'
+                                    break;
+                                case 'CENTRAL':
+                                    return 'CST'
+                                    break;
+                                case 'MOUNTAIN':
+                                    return 'MST'
+                                    break;
+                                case 'PACIFIC':
+                                    return 'PST'
+                                    break;
+                                case 'ALASKA':
+                                    return 'Alaska'
+                                    break;
+                                case 'HAWAII':
+                                    return 'Hawaii'
+                                    break;
+                                case 'PUERTO_RICO':
+                                    return 'Puerto Rico'
+                                    break;
+                                default:
+                                    return 'N/A';
+                            }
                         }
                     },
                     mounted: function () {

resources/views/app/mcp/cancelled_appointments_pending_review.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Cancelled Appointments Pending Review
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/cancelled_bills_pending_review.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Cancelled Bills Pending Review
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/cancelled_supply_orders_pending_review.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Cancelled Supply Orders Pending Review
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

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

@@ -0,0 +1,71 @@
+<table v-if="events.length > 0"
+       class="mb-0 table table-sm table-bordered appointments">
+    <tr v-for="event in events" class="">
+        <td>
+            <a :href="'/patients/view/' + event.clientUid" class="font-weight-bold">@{{
+                event.clientName }}</a>
+        </td>
+        <td>
+            {{-- <span class="small d-inline-block text-secondary font-weight-normal"> (@{{ event.clientAge }} y.o. @{{event.clientSex}})</span>--}}
+            @{{ event.friendlyStartTime }} - @{{ event.friendlyEndTime }} <span
+                class="text-secondary">@{{ formatTimeZone(event.timezone) }}</span>
+            <span v-if="event.title"
+                  class="d-inline-block ml- 2 text-secondary font-weight-bold">
+                                                      &nbsp;/&nbsp;
+                                                  @{{ event.title }}
+                                                  </span>
+            <a :href="'/patients/view/' + event.clientUid + '/calendar/' + event.uid">
+                <i class="fa fa-edit"></i>
+            </a>
+        </td>
+        <td>
+            <div class="d-flex align-items-baseline">
+                <!-- <div v-if="event.status === 'CREATED'"
+                     class="text-warning-mellow font-weight-bold">
+                    <i class="fa fa-exclamation-triangle"></i>
+                    Confirmation pending
+                </div>
+                <div v-else-if="event.status === 'CONFIRMED'"
+                     class="text-success font-weight-bold">
+                    <i class="fa fa-check"></i>
+                    Confirmed by the patient
+                </div>
+                <div v-else-if="event.status === 'REJECTED'"
+                     class="text-danger font-weight-bold">
+                    <i class="fa fa-stop"></i>
+                    Rejected by the patient
+                </div> -->
+                <select v-model="event.newStatus"
+                        class="form-control input-sm bg-light"
+                        v-on:change="updateStatus(event)">
+                    <option value="CREATED">CREATED</option>
+                    <option value="CONFIRMED">CONFIRMED</option>
+                    <option value="CANCELLED">CANCELLED</option>
+                    <option value="COMPLETED">COMPLETED</option>
+                    <option value="ABANDONED">ABANDONED</option>
+                </select>
+                <div v-if="selectedDate === '{{ date('Y-m-d') }}'"
+                     class="pt-1 text-right"
+                     :class="event.started ? 'text-danger': 'text-secondary'">
+                    @{{ event.inHowManyHours }}
+                </div>
+            </div>
+        </td>
+        <td>
+            <div>
+                <b v-if="event.coverage == 'YES'" class="text-success">Covered</b>
+                <b v-else-if="event.coverage == 'NO'" class="text-danger">Not
+                    Covered</b>
+                <b v-else class="text-warning-mellow">Pending</b>
+            </div>
+        </td>
+    </tr>
+</table>
+<div v-if="numEventsForDate === 0 && selectedDate"
+     class="bg-light p-3 text-secondary border bounded">
+    <span v-if="filterStatus === ''">You have no appointments on <b>@{{ formatSelectedDate(selectedDate) }}</b></span>
+    <span v-if="filterStatus !== ''">You have no appointments on <b>@{{ formatSelectedDate(selectedDate) }}</b> with status <b>@{{ filterStatus }}</b></span>
+</div>
+<div v-show="!selectedDate" class="bg-light p-3 text-secondary border bounded">
+    Please select a date from the calendar on the left
+</div>

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

@@ -0,0 +1 @@
+<h1>Reports</h1>

resources/views/app/mcp/erx_and_orders_pending_signature.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    ERx & Orders Pending Signature
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/new_patients_awaiting_visit.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    New Patients Awaiting Visit
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/notes_pending_billing.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Notes Pending Billing
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/notes_pending_signature.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Notes Pending Signature
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/patients_overdue_for_visit.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Patients Overdue for Visit
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/patients_without_appointments.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Patients w/o Appointments
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/reports_pending_signature.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Reports Pending Signature
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/mcp/supply_orders_pending_signature.blade.php

@@ -0,0 +1,19 @@
+@extends ('layouts/template')
+
+@section('content')
+    <div class="p-3 mcp-theme-1" id="patients-list">
+        <div class="card">
+
+            <div class="card-header px-3 py-2 d-flex align-items-center">
+                <strong class="mr-4">
+                    <i class="fas fa-user-injured"></i>
+                    Supply Orders Pending Signature
+                </strong>
+            </div>
+
+            <div class="card-body p-0">
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/practice-management/financial-transactions.blade.php

@@ -23,13 +23,6 @@
             </div>
             <div class="card-header p-3">
                 <div class="d-flex align-items-center">
-                    <div class="width-200px">
-                        <select provider-search data-pro-uid="{{ request()->input('p') ? request()->input('p') : '' }}"
-                                name="proUid" class="form-control form-control-sm mr-auto width-200px min-width-unset"
-                                onchange="return transactionsFilter('p', this.value)">
-                            <option value="" {{!request()->input('p') ? 'selected' : ''}}>All Pros</option>
-                        </select>
-                    </div>
                     <select name="filter" class="form-control form-control-sm width-200px ml-2"
                             onchange="return transactionsFilter('t', this.value)">
                         <option {{request()->input('t') === '' ? 'selected' : ''}} value="">All Transactions</option>
@@ -38,16 +31,25 @@
                         <option {{request()->input('t') === 'MINUS' ? 'selected' : ''}} value="MINUS">Debits
                         </option>
                     </select>
-                    <select name="filter" class="form-control form-control-sm width-200px ml-2"
-                            onchange="return transactionsFilter('c', this.value)">
-                        <option {{!request()->input('c') ? 'selected' : ''}} value="">All Companies</option>
-                        @foreach($companies as $company)
-                            <option {{request()->input('c') == $company->id ? 'selected' : ''}}
-                                    value="{{$company->id}}">
-                                {{$company->name}}
-                            </option>
-                        @endforeach
-                    </select>
+                    @if($pro->pro_type == 'ADMIN')
+                        <select name="filter" class="form-control form-control-sm width-200px ml-2"
+                                onchange="return transactionsFilter('c', this.value)">
+                            <option {{!request()->input('c') ? 'selected' : ''}} value="">All Companies</option>
+                            @foreach($companies as $company)
+                                <option {{request()->input('c') == $company->id ? 'selected' : ''}}
+                                        value="{{$company->id}}">
+                                    {{$company->name}}
+                                </option>
+                            @endforeach
+                        </select>
+                        <div class="width-200px">
+                            <select provider-search data-pro-uid="{{ request()->input('p') ? request()->input('p') : '' }}"
+                                    name="proUid" class="form-control form-control-sm mr-auto width-200px min-width-unset"
+                                    onchange="return transactionsFilter('p', this.value)">
+                                <option value="" {{!request()->input('p') ? 'selected' : ''}}>All Pros</option>
+                            </select>
+                        </div>
+                    @endif
                     <div class="ml-4 d-inline-flex align-items-center">
                         <span class="mr-2">Date</span>
                         <input type="date"
@@ -76,7 +78,7 @@
                                 <th class="border-0">Pro</th>
                                 <th class="border-0">Company</th>
                             @endif
-                            
+
                             <th class="border-0">Context</th>
                             <th class="border-0">Amount</th>
                             <th class="border-0">Balance</th>
@@ -108,7 +110,7 @@
                                         {{$transaction->company ? $transaction->company->name : ''}}
                                     </td>
                                 @endif
-                               
+
                                 <td class="text-nowrap">
                                     @if($transaction->bill && $transaction->bill->note)
                                         <a href="{{route('patients.view.notes.view.dashboard', ['patient'=>$transaction->client, 'note'=>$transaction->bill->note])}}">

resources/views/layouts/template.blade.php

@@ -95,7 +95,9 @@
 
         <div class="collapse navbar-collapse" id="navBar">
             <ul class="navbar-nav mr-auto">
+
                 <li class="nav-item"><a class="nav-link" href="{{ route('dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
+
                 @if($pro)
                     @if($pro->is_enrolled_as_mcp)
                     <li class="nav-item"><a class="nav-link" href="{{ route('mcp.patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
@@ -105,44 +107,53 @@
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user-injured"></i> Patients</a> </li>
                     @endif
                 @endif
+
                 @if($pro && ($pro->can_add_patients || $pro->pro_type== 'ADMIN'))
                   <li class="nav-item"><a class="nav-link" href="{{ route('new-patient') }}"><i class="mr-1 fas fa-user-plus"></i> New Patient</a> </li>
                 @endif
+
+                @if($pro->is_enrolled_as_mcp)
+
+{{--                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.erx_and_orders') }}">--}}
+{{--                            <i class="mr-1 fas fa-file-prescription"></i> ERx & Orders--}}
+{{--                        </a>--}}
+{{--                    </li>--}}
+
+                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.appointments') }}">
+                            <i class="mr-1 fas fa-calendar-alt"></i> Appointments
+                        </a>
+                    </li>
+
+                @endif
+
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="practice-management" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <i class="mr-1 fas fa-tasks"></i> Practice
                     </a>
                     <div class="dropdown-menu mcp-theme-1 no-overflow-menu p-0" aria-labelledby="practice-management">
 
-                        @if($pro && $pro->isDefaultNA())
-                            <a class="dropdown-item" href="/practice-management/my-teams">My Teams</a>
-                        @endif
+                        @if($pro->pro_type == 'ADMIN')
+
+                            {{--<a class="dropdown-item" href="{{ route('practice-management.previousBills') }}">Previous Bills</a>--}}
+                            <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
+                            <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>
+                            <a class="dropdown-item" href="/practice-management/notes/not-yet-signed">Pending Notes to Sign</a>
+                            <a class="dropdown-item" href="/practice-management/notes/not-yet-signed-but-ally-signed">Pending Notes to Sign (Ally Signed)</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.remote-monitoring') }}">Remote Monitoring</a>
+                            <a class="dropdown-item" href="{{ route('pro-care-month-report') }}">Care Month Report</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.rm-bills-to-sign') }}">RM Bills to Sign</a>
+                            <a class="dropdown-item" href="{{ route('unmapped-sms') }}">Unmapped SMS</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.myTickets') }}">My Tickets</a>
+                            <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.proAvailability') }}">Pro Availability</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Pro Calendar</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.rm-launch-and-clean') }}">RM: Launch &amp; Clean</a>
+
+                            <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>
 
-                        {{--<a class="dropdown-item" href="{{ route('practice-management.dashboard') }}">Dashboard</a>--}}
-                        @if($pro && $pro->pro_type == 'ADMIN')
-                            <a class="dropdown-item" href="/practice-management/rates/all">Payment Rates</a>
-                        @endif
-                        {{--<a class="dropdown-item" href="{{ route('practice-management.previousBills') }}">Previous Bills</a>--}}
-                        <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
-                        <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>
-                        <a class="dropdown-item" href="/practice-management/notes/not-yet-signed">Pending Notes to Sign</a>
-                        <a class="dropdown-item" href="/practice-management/notes/not-yet-signed-but-ally-signed">Pending Notes to Sign (Ally Signed)</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.remote-monitoring') }}">Remote Monitoring</a>
-                        <a class="dropdown-item" href="{{ route('pro-care-month-report') }}">Care Month Report</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.rm-bills-to-sign') }}">RM Bills to Sign</a>
-                        <a class="dropdown-item" href="{{ route('unmapped-sms') }}">Unmapped SMS</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.myTickets') }}">My Tickets</a>
-                        <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.proAvailability') }}">Pro Availability</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Pro Calendar</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.rm-launch-and-clean') }}">RM: Launch &amp; Clean</a>
-
-                        <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
-                        <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>
-
-                        @if($pro && $pro->pro_type == 'ADMIN')
                             <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix') }}">Processing Bills</a>
                             <a class="dropdown-item" href="{{ route('practice-management.pro-financials') }}">Pro Financials</a>
                             <a class="dropdown-item" href="{{ route('practice-management.cellularMeasurements') }}">Cellular Measurements</a>
@@ -153,8 +164,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.process-claims') }}">Process Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.process-notes') }}">Process Notes</a>
                             <a class="dropdown-item" href="{{ route('practice-management.notes-processing-center') }}">Notes Processing Center</a>
-{{--                            <a class="dropdown-item" href="{{ route('practice-management.hcpBillMatrix') }}">HCP Bill Matrix</a>--}}
-                            @if(false)
+                            @if($pro->id == '1' || $pro->id == '16')
                                 <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
                             @endif
                             <a class="dropdown-item" href="{{ route('practice-management.tickets') }}">Tickets</a>
@@ -166,7 +176,31 @@
                             <a class="dropdown-item" href="{{ route('practice-management.mc-code-checks') }}">MC Code Checks</a>
                             <a class="dropdown-item" href="{{ route('practice-management.clauses.list') }}">Clauses</a>
                             <a class="dropdown-item" href="{{ route('practice-management.statTrees.list') }}">Stat Trees</a>
+
+                            <a class="dropdown-item" href="/practice-management/rates/all">Payment Rates</a>
+
+                        @elseif($pro->is_enrolled_as_mcp)
+
+                            <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.myTextShortcuts') }}">Text Shortcuts</a>
+                            <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('mcp.notes') }}">Notes</a>
+                            <a class="dropdown-item" href="{{ route('mcp.appointments') }}">Appointments</a>
+                            <a class="dropdown-item" href="{{ route('mcp.bills') }}">Bills</a>
+                            <a class="dropdown-item" href="{{ route('mcp.erx_and_orders') }}">ERx & Orders</a>
+                            <a class="dropdown-item" href="{{ route('mcp.reports') }}">Reports</a>
+                            <a class="dropdown-item" href="{{ route('mcp.supply_orders') }}">Supply Orders</a>
+                            <a class="dropdown-item" href="{{ route('mcp.client_messages') }}">Messages</a>
+
+                        @elseif($pro && $pro->isDefaultNA())
+
+                            <a class="dropdown-item" href="/practice-management/my-teams">My Teams</a>
+
                         @endif
+
                     </div>
                 </li>
             </ul>

routes/web.php

@@ -84,17 +84,17 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('supply-orders', 'McpController@supply_orders')->name('supply_orders');
         Route::get('client-messages', 'McpController@client_messages')->name('client_messages');
 
-        Route::get('new_patients_awaiting_visit', 'McpController@new_patients_awaiting_visit')->name('new_patients_awaiting_visit');
-        Route::get('notes_pending_signature', 'McpController@notes_pending_signature')->name('notes_pending_signature');
-        Route::get('notes_pending_billing', 'McpController@notes_pending_billing')->name('notes_pending_billing');
-        Route::get('reports_pending_signature', 'McpController@reports_pending_signature')->name('reports_pending_signature');
-        Route::get('patients_without_appointments', 'McpController@patients_without_appointments')->name('patients_without_appointments');
-        Route::get('patients_overdue_for_visit', 'McpController@patients_overdue_for_visit')->name('patients_overdue_for_visit');
-        Route::get('cancelled_appointments_pending_review', 'McpController@cancelled_appointments_pending_review')->name('cancelled_appointments_pending_review');
-        Route::get('cancelled_bills_pending_review', 'McpController@cancelled_bills_pending_review')->name('cancelled_bills_pending_review');
-        Route::get('cancelled_supply_orders_pending_review', 'McpController@cancelled_supply_orders_pending_review')->name('cancelled_supply_orders_pending_review');
-        Route::get('erx_and_orders_pending_signature', 'McpController@erx_and_orders_pending_signature')->name('erx_and_orders_pending_signature');
-        Route::get('supply_orders_pending_signature', 'McpController@supply_orders_pending_signature')->name('supply_orders_pending_signature');
+        Route::get('new-patients-awaiting-visit', 'McpController@new_patients_awaiting_visit')->name('new_patients_awaiting_visit');
+        Route::get('notes-pending-signature', 'McpController@notes_pending_signature')->name('notes_pending_signature');
+        Route::get('notes-pending-billing', 'McpController@notes_pending_billing')->name('notes_pending_billing');
+        Route::get('reports-pending-signature', 'McpController@reports_pending_signature')->name('reports_pending_signature');
+        Route::get('patients-without-appointments', 'McpController@patients_without_appointments')->name('patients_without_appointments');
+        Route::get('patients-overdue-for-visit', 'McpController@patients_overdue_for_visit')->name('patients_overdue_for_visit');
+        Route::get('cancelled-appointments-pending-review', 'McpController@cancelled_appointments_pending_review')->name('cancelled_appointments_pending_review');
+        Route::get('cancelled-bills-pending-review', 'McpController@cancelled_bills_pending_review')->name('cancelled_bills_pending_review');
+        Route::get('cancelled-supply-orders-pending-review', 'McpController@cancelled_supply_orders_pending_review')->name('cancelled_supply_orders_pending_review');
+        Route::get('erx-and-orders-pending-signature', 'McpController@erx_and_orders_pending_signature')->name('erx_and_orders_pending_signature');
+        Route::get('supply-orders-pending-signature', 'McpController@supply_orders_pending_signature')->name('supply_orders_pending_signature');
 
     });