소스 검색

tree updates

Josh Kamau 5 년 전
부모
커밋
c71717b682
51개의 변경된 파일173개의 추가작업 그리고 211개의 파일을 삭제
  1. 12 0
      app/Http/Controllers/pros_SINGLE_Controller.php
  2. 4 0
      generatecv/tree.txt
  3. 3 7
      resources/views/admin/facilities/info.blade.php
  4. 3 3
      resources/views/admin/facilities/view.blade.php
  5. 3 7
      resources/views/admin/lobbies/info.blade.php
  6. 3 3
      resources/views/admin/lobbies/view.blade.php
  7. 3 7
      resources/views/admin/meeting_invitations/info.blade.php
  8. 3 3
      resources/views/admin/meeting_invitations/view.blade.php
  9. 3 7
      resources/views/admin/meeting_knocks/info.blade.php
  10. 3 3
      resources/views/admin/meeting_knocks/view.blade.php
  11. 3 7
      resources/views/admin/meeting_messages/info.blade.php
  12. 3 3
      resources/views/admin/meeting_messages/view.blade.php
  13. 3 7
      resources/views/admin/meeting_participants/info.blade.php
  14. 3 3
      resources/views/admin/meeting_participants/view.blade.php
  15. 3 7
      resources/views/admin/meeting_rings/info.blade.php
  16. 3 3
      resources/views/admin/meeting_rings/view.blade.php
  17. 3 7
      resources/views/admin/meetings/info.blade.php
  18. 3 3
      resources/views/admin/meetings/view.blade.php
  19. 3 7
      resources/views/admin/pro_rates/info.blade.php
  20. 3 3
      resources/views/admin/pro_rates/view.blade.php
  21. 2 0
      resources/views/admin/pros/actions.blade.php
  22. 3 7
      resources/views/admin/pros/info.blade.php
  23. 3 3
      resources/views/admin/pros/view.blade.php
  24. 1 1
      resources/views/layouts/generated-links.blade.php
  25. 3 7
      resources/views/pro/action_items/info.blade.php
  26. 3 3
      resources/views/pro/action_items/view.blade.php
  27. 3 7
      resources/views/pro/bills/info.blade.php
  28. 3 3
      resources/views/pro/bills/view.blade.php
  29. 3 2
      resources/views/pro/care_month_entries/index.blade.php
  30. 3 7
      resources/views/pro/care_month_entries/info.blade.php
  31. 3 3
      resources/views/pro/care_month_entries/view.blade.php
  32. 3 7
      resources/views/pro/care_months/info.blade.php
  33. 3 3
      resources/views/pro/care_months/view.blade.php
  34. 3 7
      resources/views/pro/erx/info.blade.php
  35. 3 3
      resources/views/pro/erx/view.blade.php
  36. 4 2
      resources/views/pro/my_clients/index.blade.php
  37. 3 7
      resources/views/pro/my_clients/info.blade.php
  38. 3 3
      resources/views/pro/my_clients/view.blade.php
  39. 3 2
      resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php
  40. 2 1
      resources/views/pro/my_payment_schedule/index.blade.php
  41. 6 3
      resources/views/pro/my_teams/index.blade.php
  42. 3 7
      resources/views/pro/my_teams/info.blade.php
  43. 3 3
      resources/views/pro/my_teams/view.blade.php
  44. 2 1
      resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php
  45. 8 4
      resources/views/pro/my_teams_SINGLE/SUB_dashboard.blade.php
  46. 10 5
      resources/views/pro/notes/index.blade.php
  47. 3 7
      resources/views/pro/notes/info.blade.php
  48. 3 3
      resources/views/pro/notes/view.blade.php
  49. 3 7
      resources/views/pro/pro_access/info.blade.php
  50. 3 3
      resources/views/pro/pro_access/view.blade.php
  51. 2 0
      routes/generated.php

+ 12 - 0
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -106,6 +106,18 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/ACTION_sendEmailAddressConfirmationMessage', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /pros/view/{uid}/ACTION_setIsHcpToTrue
+	public function ACTION_setIsHcpToTrue(Request $request, $uid) {
+		$record = DB::table('pro')->where('uid', $uid)->first();
+		return response()->view('admin/pros_SINGLE/ACTION_setIsHcpToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /pros/view/{uid}/ACTION_setIsHcpToFalse
+	public function ACTION_setIsHcpToFalse(Request $request, $uid) {
+		$record = DB::table('pro')->where('uid', $uid)->first();
+		return response()->view('admin/pros_SINGLE/ACTION_setIsHcpToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /pros/view/{uid}/ACTION_setIsEnrolledAsHcpToTrue
 	public function ACTION_setIsEnrolledAsHcpToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();

+ 4 - 0
generatecv/tree.txt

@@ -226,6 +226,7 @@ PRO
                     startYear:number
             care_month_entries
                 id=care_month_entry.client_id=>/care_month_entries/view/UID
+                !col:pro_id:Pro:select name_display as result from pro where id = $pro_id
             bills
                 id=bill.client_id=>/bills/view/UID
             related_transactions
@@ -381,6 +382,7 @@ PRO
                     contentDetail
             audit_log
     care_month_entries|care_month_entry|view|icon:calendar-alt
+        !col:pro_id:Pro:select name_display as result from pro where id = $pro_id
     care_month_entries/view/{uid}
         ACTIONS
             updateContent
@@ -550,6 +552,8 @@ ADMIN
                 ssn
             # new actions from ProService.java
             sendEmailAddressConfirmationMessage
+            setIsHcpToTrue
+            setIsHcpToFalse
             setIsEnrolledAsHcpToTrue
             setIsEnrolledAsHcpToFalse
             setIsEnrolledAsMcpToTrue

+ 3 - 7
resources/views/admin/facilities/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Facilities: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Facilities: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/facilities/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/facilities/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/facilities/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/facilities/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/lobbies/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Lobbies: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Lobbies: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/lobbies/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/lobbies/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/lobbies/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/lobbies/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meeting_invitations/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meeting Invitations: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meeting Invitations: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meeting_invitations/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meeting_invitations/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meeting_invitations/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meeting_invitations/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meeting_knocks/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meeting Knocks: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meeting Knocks: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meeting_knocks/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meeting_knocks/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meeting_knocks/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meeting_knocks/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meeting_messages/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meeting Messages: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meeting Messages: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meeting_messages/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meeting_messages/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meeting_messages/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meeting_messages/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meeting_participants/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meeting Participants: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meeting Participants: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meeting_participants/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meeting_participants/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meeting_participants/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meeting_participants/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meeting_rings/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meeting Rings: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meeting Rings: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meeting_rings/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meeting_rings/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meeting_rings/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meeting_rings/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/meetings/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Meetings: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Meetings: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/meetings/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/meetings/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/meetings/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/meetings/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/admin/pro_rates/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Pro Rates: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Pro Rates: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/pro_rates/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/pro_rates/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/pro_rates/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/pro_rates/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 2 - 0
resources/views/admin/pros/actions.blade.php

@@ -14,6 +14,8 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_updateDriverLicenseInfo' class='d-block btn btn-sm btn-default mb-3'>Update Driver License Info</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_updateSsn' class='d-block btn btn-sm btn-default mb-3'>Update Ssn</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_sendEmailAddressConfirmationMessage' class='d-block btn btn-sm btn-default mb-3'>Send Email Address Confirmation Message</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsHcpToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Hcp To True</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsHcpToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Hcp To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsEnrolledAsHcpToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled As Hcp To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsEnrolledAsHcpToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled As Hcp To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_setIsEnrolledAsMcpToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled As Mcp To True</a>

+ 3 - 7
resources/views/admin/pros/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Pros: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Pros: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/admin/pros/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/pros/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('admin/pros/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('admin/pros/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 1 - 1
resources/views/layouts/generated-links.blade.php

@@ -1,5 +1,5 @@
 <li class='nav-item'><a href='/my_payment_schedule' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_payment_schedule') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-dollar-sign'></i><p>My Payment Schedule</p></a></li>
-<li class='nav-item'><a href='/my_teams' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_teams') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user'></i><p>My Teams</p></a></li>
+<li class='nav-item'><a href='/my_teams' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_teams') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user-friends'></i><p>My Teams</p></a></li>
 <li class='nav-item'><a href='/my_clients' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_clients') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user-injured'></i><p>My Clients</p></a></li>
 <li class='nav-item'><a href='/notes' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'notes') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-file-alt'></i><p>Notes</p></a></li>
 <li class='nav-item'><a href='/erx' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'erx') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-file-signature'></i><p>Erx</p></a></li>

+ 3 - 7
resources/views/pro/action_items/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Action Items: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Action Items: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/action_items/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/action_items/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/action_items/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/action_items/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/pro/bills/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Bills: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Bills: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/bills/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/bills/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/bills/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/bills/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 2
resources/views/pro/care_month_entries/index.blade.php

@@ -34,7 +34,7 @@
 <th>Removed By Session Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
-<th>Pro Id</th>
+<th>Pro</th>
             </tr>
             </thead>
             <tbody>
@@ -62,7 +62,8 @@
 <td><?= $record->removed_by_session_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
-<td><?= $record->pro_id ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->pro_id ? $record->pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 3 - 7
resources/views/pro/care_month_entries/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Care Month Entries: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Care Month Entries: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/care_month_entries/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/care_month_entries/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/care_month_entries/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/care_month_entries/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/pro/care_months/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Care Months: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Care Months: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/care_months/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/care_months/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/care_months/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/care_months/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/pro/erx/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Erx: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Erx: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/erx/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/erx/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/erx/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/erx/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 4 - 2
resources/views/pro/my_clients/index.blade.php

@@ -29,8 +29,10 @@
 <td><?= $record->gender ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
 <td><?= $record->is_client_enrolled_in_rm ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = {$record->mcp_pro_id}")[0]->result ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = {$record->ally_pro_id}")[0]->result ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->mcp_pro_id ? $record->mcp_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 3 - 7
resources/views/pro/my_clients/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>My Clients: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>My Clients: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/my_clients/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/my_clients/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/my_clients/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/my_clients/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 2
resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php

@@ -36,7 +36,7 @@
 <th>Removed By Session Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
-<th>Pro Id</th>
+<th>Pro</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -64,7 +64,8 @@
 <td><?= $subRecord->removed_by_session_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->pro_id ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($subRecord->pro_id ? $subRecord->pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 2 - 1
resources/views/pro/my_payment_schedule/index.blade.php

@@ -24,7 +24,8 @@
 <td><?= $record->code ?></td>
 <td><?= $record->as_hcp_or_ally ?></td>
 <td><?= $record->amount ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select '- TODO -' as result")[0]->result ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select '- TODO -' as result");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 6 - 3
resources/views/pro/my_teams/index.blade.php

@@ -22,9 +22,12 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/my_teams/view/<?= $record->uid ?>"><?= $record->team_number ?></a></td>
-<td><a href="/foo/bar/<?= $record->hcp_pro_id ?>"><?= \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = {$record->hcp_pro_id} limit 1")[0]->result ?></a></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = {$record->ally_pro_id} limit 1")[0]->result ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select COUNT(*) as result FROM client WHERE team_id = {$record->id}")[0]->result ?></td>
+<td><a href="/foo/bar/<?= $record->hcp_pro_id ?>"><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->hcp_pro_id ? $record->hcp_pro_id : -1) . " limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></a></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . " limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select COUNT(*) as result FROM client WHERE team_id = " . ($record->id ? $record->id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 3 - 7
resources/views/pro/my_teams/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>My Teams: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>My Teams: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/my_teams/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/my_teams/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/my_teams/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/my_teams/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 2 - 1
resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php

@@ -178,7 +178,8 @@
 <td><?= $subRecord->current_meeting_participant_id ?></td>
 <td><?= $subRecord->mcp_em_visit_note_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select team_number as result from team where id = {$subRecord->team_id} limit 1")[0]->result ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select team_number as result from team where id = " . ($subRecord->team_id ? $subRecord->team_id : -1) . " limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 4
resources/views/pro/my_teams_SINGLE/SUB_dashboard.blade.php

@@ -14,8 +14,10 @@
         <tbody>
             <tr><td class="w-25 px-2 text-secondary border-right">Team Number</td><td class="w-75 px-2 font-weight-bold"><?= $record->team_number ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/my_teams/view/<?= $record->uid ?>/ACTION_updateTeamNumber' title='Update Team Number' class='ml-2 text-dark font-weight-normal'><i class='fa fa-pencil-alt text-sm'></i></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_at ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Clients</td><td class="w-75 px-2 font-weight-bold"><?= \Illuminate\Support\Facades\DB::select("select '- TODO -' as result")[0]->result ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Active</td><td class="w-75 px-2 font-weight-bold"><?= \Illuminate\Support\Facades\DB::select("SELECT d as result FROM (VALUES ('1','Yes'),('','No')) T(v,d) WHERE v = '{$record->is_active}' limit 1")[0]->result ?>@if( $record->is_active) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_teams/view/<?= $record->uid ?>/ACTION_deactivate' title='Deactivate' class='ml-2 text-dark font-weight-normal'><i class='fa fa-pencil-alt text-sm'></i></a> @endif
+<tr><td class="w-25 px-2 text-secondary border-right">Clients</td><td class="w-75 px-2 font-weight-bold"><?php $_r = \Illuminate\Support\Facades\DB::select("select '- TODO -' as result");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Active</td><td class="w-75 px-2 font-weight-bold"><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT d as result FROM (VALUES ('1','Yes'),('','No')) T(v,d) WHERE v = '" . ($record->is_active ? $record->is_active : -1) . "' limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?>@if( $record->is_active) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_teams/view/<?= $record->uid ?>/ACTION_deactivate' title='Deactivate' class='ml-2 text-dark font-weight-normal'><i class='fa fa-pencil-alt text-sm'></i></a> @endif
 @if(! $record->is_active) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_teams/view/<?= $record->uid ?>/ACTION_reactivate' title='Reactivate' class='ml-2 text-dark font-weight-normal'><i class='fa fa-pencil-alt text-sm'></i></a> @endif</td></tr>
         </tbody>
     </table>
@@ -29,8 +31,10 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">HCP Pro</td><td class="w-75 px-2 font-weight-bold"><a href="/foo/bar/<?= $record->hcp_pro_id ?>"><?= \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = {$record->hcp_pro_id} limit 1")[0]->result ?></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Ally Pro</td><td class="w-75 px-2 font-weight-bold"><?= \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = {$record->ally_pro_id} limit 1")[0]->result ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">HCP Pro</td><td class="w-75 px-2 font-weight-bold"><a href="/foo/bar/<?= $record->hcp_pro_id ?>"><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->hcp_pro_id ? $record->hcp_pro_id : -1) . " limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Ally Pro</td><td class="w-75 px-2 font-weight-bold"><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . " limit 1");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td></tr>
         </tbody>
     </table>
 </div>

+ 10 - 5
resources/views/pro/notes/index.blade.php

@@ -27,14 +27,19 @@
             @foreach($records as $record)
                 <tr>
 <td><?= $record->effective_dateest ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select name_display as result FROM client WHERE id = {$record->client_id}")[0]->result ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = {$record->hcp_pro_id}")[0]->result ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = {$record->ally_pro_id}")[0]->result ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("select concat(reason1,reason2) as result FROM note WHERE id = {$record->id}")[0]->result ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM client WHERE id = " . ($record->client_id ? $record->client_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = " . ($record->hcp_pro_id ? $record->hcp_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result FROM pro WHERE id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("select concat(reason1,reason2) as result FROM note WHERE id = " . ($record->id ? $record->id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
 <td><?= $record->content_text ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
-<td><?= \Illuminate\Support\Facades\DB::select("SELECT '-- TODO --' as result")[0]->result ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT '-- TODO --' as result");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 3 - 7
resources/views/pro/notes/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Notes: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Notes: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/notes/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/notes/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/notes/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/notes/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 3 - 7
resources/views/pro/pro_access/info.blade.php

@@ -1,7 +1,3 @@
-<div class="row">
-    <div class="col-12">
-        <h4 class="d-flex mb-3">
-            <div>Pro Access: Single [<?= $record->uid ?>]</div>
-        </h4>
-    </div>
-</div>
+<h4 class="d-flex my-3 px-3">
+    <div>Pro Access: Single [<?= $record->uid ?>]</div>
+</h4>

+ 3 - 3
resources/views/pro/pro_access/view.blade.php

@@ -1,15 +1,15 @@
 @extends('layouts.pro-logged-in')
 @section('content')
 
-    <div class="card">
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/pro_access/info')</div>
         <div class="d-flex align-items-stretch">
             <div class="inner-side-nav">
                 <div class="border-right h-100">
                     @include('pro/pro_access/subs')
                 </div>
             </div>
-            <div class="flex-grow-1 p-3 mb-3 inner-content">
-                <div class="border-bottom">@include('pro/pro_access/info')</div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
                 <div>
                     @yield('content-inner')
                 </div>

+ 2 - 0
routes/generated.php

@@ -239,6 +239,8 @@ Route::get('/pros/view/{uid}/ACTION_uploadDriverLicense', 'pros_SINGLE_Controlle
 Route::get('/pros/view/{uid}/ACTION_updateDriverLicenseInfo', 'pros_SINGLE_Controller@ACTION_updateDriverLicenseInfo')->name('pros_SINGLE-ACTION_updateDriverLicenseInfo');
 Route::get('/pros/view/{uid}/ACTION_updateSsn', 'pros_SINGLE_Controller@ACTION_updateSsn')->name('pros_SINGLE-ACTION_updateSsn');
 Route::get('/pros/view/{uid}/ACTION_sendEmailAddressConfirmationMessage', 'pros_SINGLE_Controller@ACTION_sendEmailAddressConfirmationMessage')->name('pros_SINGLE-ACTION_sendEmailAddressConfirmationMessage');
+Route::get('/pros/view/{uid}/ACTION_setIsHcpToTrue', 'pros_SINGLE_Controller@ACTION_setIsHcpToTrue')->name('pros_SINGLE-ACTION_setIsHcpToTrue');
+Route::get('/pros/view/{uid}/ACTION_setIsHcpToFalse', 'pros_SINGLE_Controller@ACTION_setIsHcpToFalse')->name('pros_SINGLE-ACTION_setIsHcpToFalse');
 Route::get('/pros/view/{uid}/ACTION_setIsEnrolledAsHcpToTrue', 'pros_SINGLE_Controller@ACTION_setIsEnrolledAsHcpToTrue')->name('pros_SINGLE-ACTION_setIsEnrolledAsHcpToTrue');
 Route::get('/pros/view/{uid}/ACTION_setIsEnrolledAsHcpToFalse', 'pros_SINGLE_Controller@ACTION_setIsEnrolledAsHcpToFalse')->name('pros_SINGLE-ACTION_setIsEnrolledAsHcpToFalse');
 Route::get('/pros/view/{uid}/ACTION_setIsEnrolledAsMcpToTrue', 'pros_SINGLE_Controller@ACTION_setIsEnrolledAsMcpToTrue')->name('pros_SINGLE-ACTION_setIsEnrolledAsMcpToTrue');