= 3 роки тому
батько
коміт
d2bddf4a5e

+ 1 - 1
app/Http/Controllers/HomeController.php

@@ -1339,7 +1339,7 @@ WHERE cl.shadow_pro_id IS NULL
     {
         $performer = $this->performer();
         $pro = $performer->pro;
-
+       
         if($pro->pro_type === 'ADMIN'){
             return $this->dashboard_ADMIN($request);
         }elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment) {

+ 2 - 5
resources/views/layouts/template.blade.php

@@ -97,7 +97,6 @@
 
         <div class="collapse navbar-collapse" id="navBar">
             <ul class="navbar-nav mr-auto">
-
                 @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>
@@ -108,15 +107,13 @@
                             <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)
+                    @if($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
                     <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')
 
@@ -184,7 +181,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.clientsBdtDevices') }}">Clients BDT Devices</a>
                             <a class="dropdown-item" href="{{ route('practice-management.memos') }}">Memos</a>
 
-                        @elseif($pro->is_enrolled_as_mcp)
+                        @elseif($pro->is_enrolled_as_mcp && $pro->is_considered_for_mcp_assignment)
 
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myTextShortcuts') }}">Text Shortcuts</a>