added hcp dashboard

app/Http/Controllers/AdminController.php

@@ -86,47 +86,6 @@ class AdminController extends Controller
         return view('app.mcp.patients', compact('patients', 'filters'));
     }
 
-    private function filterSimpleQuery(Request $request, $query, $columnName, $valueName) {
-        if($request->input($valueName)) {
-            $query->where($columnName, $request->input($valueName));
-        }
-    }
-    private function filterMultiQuery(Request $request, $query, $columnName, $keyName, $valueName1, $valueName2) {
-        switch($request->input($keyName)) {
-            case 'EXACTLY':
-                if($request->input($valueName1)) {
-                    $query->where($columnName, $request->input($valueName1));
-                }
-                break;
-            case 'LESS_THAN':
-                if($request->input($valueName1)) {
-                    $query->where($columnName, '<', $request->input($valueName1));
-                }
-                break;
-            case 'GREATER_THAN':
-                if($request->input($valueName1)) {
-                    $query->where($columnName, '>', $request->input($valueName1));
-                }
-                break;
-            case 'BETWEEN':
-                if($request->input($valueName1) && $request->input($valueName2)) {
-                    $query
-                        ->where($columnName, '>=', $request->input($valueName1))
-                        ->where($columnName, '<=', $request->input($valueName2));
-                }
-                break;
-            case 'NOT_BETWEEN':
-                if($request->input($valueName1) && $request->input($valueName2)) {
-                    $query
-                        ->where(function ($q) use ($request, $columnName, $valueName1, $valueName2) {
-                            $q->where($columnName, '<', $request->input($valueName1))
-                                ->orWhere($columnName, '>', $request->input($valueName2));
-                        });
-                }
-                break;
-        }
-    }
-
     public function notes(Request $request)
     {
         $notes = Note::paginate(5);

app/Http/Controllers/HomeController.php

@@ -189,7 +189,7 @@ class HomeController extends Controller
         }
     }
 
-    private function dashboard_MCP(Request $request){
+    public function dashboard_MCP(Request $request){
 
 
         $keyNumbers = [];
@@ -571,7 +571,11 @@ WHERE cl.shadow_pro_id IS NULL
             'mcpClientMemos', 'mcpClientMemosCount', 'naClientMemos', 'incomingSmsMessagesPendingReply'));
     }
 
-    private function dashboard_DNA(Request $request){
+    public function dashboard_HCP(Request $request){
+        return view('app/dashboard-hcp'); //TODO provide data
+    }
+
+    public function dashboard_DNA(Request $request){
         $performer = $this->performer();
         $pro = $performer->pro;
         $performerProID = $performer->pro->id;
@@ -580,7 +584,7 @@ WHERE cl.shadow_pro_id IS NULL
         return view('app/dashboard-dna', compact( 'milliseconds'));
     }
 
-    private function dashboard_ADMIN(Request $request){
+    public function dashboard_ADMIN(Request $request){
         $keyNumbers = [];
 
         // Patients // SELECT * FROM client WHERE mcp_pro_id = :me.id;
@@ -955,15 +959,18 @@ WHERE cl.shadow_pro_id IS NULL
         $performer = $this->performer();
         $pro = $performer->pro;
 
-        if($pro->is_enrolled_as_mcp){
-            return $this->dashboard_MCP($request);
-        }elseif($pro->pro_type === 'ADMIN'){
+        if($pro->pro_type === 'ADMIN'){
             return $this->dashboard_ADMIN($request);
+        }elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment) {
+            return $this->dashboard_MCP($request);
+        }elseif($pro->is_hcp){
+            return $this->dashboard_HCP($request); //TODO for HCP
         }else{
             return $this->dashboard_DNA($request);
         }
     }
 
+
     public function dashboardMeasurementsTab(Request $request, $page = 1) {
 
         $performer = $this->performer();
@@ -1069,7 +1076,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
             $results = $results->where(function($query) use ($performerProID){
                 return $query->where('appointment.pro_id', $performerProID)
                         ->orWhere('c.default_na_pro_id', $performerProID);
-            });          
+            });
         }
 
         $results = $results->get();

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

@@ -0,0 +1,7 @@
+@extends ('layouts.template')
+
+@section('content')
+    <div>
+        <h1>HCP Dashboard</h1>
+    </div>
+@endsection

resources/views/layouts/template.blade.php

@@ -88,7 +88,7 @@
 
 
     <nav class="navbar navbar-expand-md navbar-dark stag-primary-bg py-1 mcp-theme-1 px-2">
-        <a class="navbar-brand" href="{{ route('dashboard') }}">
+        <a class="navbar-brand" href="/">
             <img src="/img/logo_white.svg" alt="Leadership Health">
         </a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navBar" aria-controls="navBar" aria-expanded="false" aria-label="Toggle navigation">
@@ -98,13 +98,28 @@
         <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->pro_type == 'ADMIN')
+                    <li class="nav-item"><a class="nav-link" href="{{ route('admin.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
+                    <li class="nav-item"><a class="nav-link" href="{{ route('admin.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
+                @elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
+                    <li class="nav-item"><a class="nav-link" href="{{ route('mcp.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</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>
+                @elseif($pro->is_enrolled_as_hcp)
+                    <li class="nav-item"><a class="nav-link" href="{{ route('hcp.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
+                @else
+                    <li class="nav-item"><a class="nav-link" href="{{ route('dna.dashboard') }}"><i class="mr-1 fas fa-home"></i> Home</a> </li>
+                @endif
+
 
                 @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"></i> Patients</a> </li>
                     @elseif($pro->pro_type == 'ADMIN')
-                    <li class="nav-item"><a class="nav-link" href="{{ route('admin.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
+
                     @else
                     <li class="nav-item"><a class="nav-link" href="{{ route('dna.patients') }}"><i class="mr-1 fas fa-user"></i> Patients</a> </li>
                     @endif
@@ -114,32 +129,13 @@
                   <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_type == 'ADMIN')
-
                             <a class="dropdown-item" href="{{ route('practice-management.rpmMatrix') }}">RPM Matrix</a>
-
                             {{--<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>

routes/web.php

@@ -74,6 +74,8 @@ Route::middleware('pro.auth')->group(function () {
 
     Route::name('mcp.')->prefix('m')->group(function () {
 
+        Route::get('dashboard', 'HomeController@dashboard_MCP')->name('dashboard');
+
         Route::get('patients', 'McpController@patients')->name('patients');
         Route::get('notes', 'McpController@notes')->name('notes');
         Route::get('appointments', 'McpController@appointments')->name('appointments');
@@ -105,8 +107,46 @@ Route::middleware('pro.auth')->group(function () {
 
     });
 
+    Route::name('hcp.')->prefix('h')->group(function () {
+
+        Route::get('dashboard', 'HomeController@dashboard_HCP')->name('dashboard');
+
+        //TODO HCP CONTROLLER
+//        Route::get('patients', 'McpController@patients')->name('patients');
+//        Route::get('notes', 'McpController@notes')->name('notes');
+//        Route::get('appointments', 'McpController@appointments')->name('appointments');
+//        Route::get('bills', 'McpController@bills')->name('bills');
+//        Route::get('erx-and-orders', 'McpController@erx_and_orders')->name('erx_and_orders');
+//        Route::get('reports', 'McpController@reports')->name('reports');
+//        Route::get('supply-orders', 'McpController@supply_orders')->name('supply_orders');
+//        Route::get('client-messages', 'McpController@client_messages')->name('client_messages');
+//        Route::get('clients-bdt-devices', 'McpController@clients_bdt_devices')->name('clients_bdt_devices');
+//        Route::get('patients-accounts-invites', 'McpController@patients_accounts_invites')->name('patients_accounts_invites');
+//        Route::get('memos', 'McpController@memos')->name('memos');
+//
+//
+//        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('bills-pending-signature', 'McpController@bills_pending_signature')->name('bills_pending_signature');
+//        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('supply-orders-awaiting-shipment', 'McpController@supply_orders_awaiting_shipment')->name('supply_orders_awaiting_shipment');
+//
+//        Route::get('measurements-pending-stamping', 'McpController@measurements_pending_stamping')->name('measurements_pending_stamping');
+
+    });
+
     Route::name('dna.')->prefix('n')->group(function () {
 
+        Route::get('dashboard', 'HomeController@dashboard_DNA')->name('dashboard');
+
         Route::get('patients', 'DnaController@patients')->name('patients');
         Route::get('encounters', 'DnaController@encounters')->name('encounters');
         Route::get('notes', 'DnaController@notes')->name('notes');
@@ -149,6 +189,9 @@ Route::middleware('pro.auth')->group(function () {
 
     Route::name('admin.')->prefix('a')->group(function () {
         // TODO
+
+        Route::get('dashboard', 'HomeController@dashboard_ADMIN')->name('dashboard');
+
         Route::get('patients', 'AdminController@patients')->name('patients');
         Route::get('notes', 'AdminController@notes')->name('notes');
         Route::get('appointments', 'AdminController@appointments')->name('appointments');