Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

app/Helpers/helpers.php

@@ -19,7 +19,7 @@ if(!function_exists('friendly_date_time')) {
         if(!$value || empty($value)) return "-";
         try {
             $result = strtotime($value);
-            $result = date("j M o" . ($includeTime ? ", H:i" : ""), $result);
+            $result = date("jS M o" . ($includeTime ? ", H:i" : ""), $result);
             return $result;
         }
         catch (Exception $e) {

app/Http/Controllers/LoginController.php

@@ -45,11 +45,11 @@ class LoginController extends Controller
 
             Cookie::queue('sessionKey', $data->data->sessionKey);
 
-            return redirect()->route('dashboard');
+            return redirect('/mc');
 
         } catch (\Exception $e) {
             //TODO: Redirect with message
-            return redirect()->back()->with('message', $e->getMessage()); 
+            return redirect()->back()->with('message', $e->getMessage());
         }
     }
 

app/Http/Controllers/NoteController.php

@@ -2,12 +2,9 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\Pro;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
-use App\HttpModels\ClientLobbyModel;
-use App\HttpModels\MeetingModel;
-use App\Models\AppSession;
-use Cookie;
 
 use App\Models\Note;
 use App\Models\Client;
@@ -16,6 +13,11 @@ use App\Models\SectionTemplate;
 
 class NoteController extends Controller
 {
+    public function dashboard(Request $request, Client $patient, Note $note )
+    {
+        $pros = Pro::all();
+        return view('app.patient.note.dashboard', compact('patient', 'note', 'pros'));
+    }
 
     public function renderNote($noteUid, Request $request)
     {
@@ -47,14 +49,14 @@ class NoteController extends Controller
         // for CREATE
         $note_uid =  $request->note_uid;
         $section_template_uid =  $request->section_template_uid;
-        
+
         // for UPDATE
         $section_uid =  $request->section_uid;
 
         $section = $section_uid ? Section::where('uid', $section_uid)->first() : null;
         $note = null;
         $sectionTemplate = null;
-        
+
         if($section == null){
             $note = Note::where('uid', $note_uid)->first();
             $sectionTemplate = SectionTemplate::where('uid', $section_template_uid)->first();
@@ -64,8 +66,8 @@ class NoteController extends Controller
         }
 
         $newContentData = [];
-        
-        // we wish to pass THESE arguments into this include: 
+
+        // we wish to pass THESE arguments into this include:
         // if CREATE, $note and $sectionTemplate, and $request
         // if UPDATE, $section, and $request
         include(storage_path('sections/' . $sectionTemplate->internal_name . '/processor.php'));
@@ -108,4 +110,4 @@ class NoteController extends Controller
         ->json();
         return $response;
     }
-}
+}

app/Http/Controllers/PracticeManagementController.php

@@ -60,9 +60,8 @@ class PracticeManagementController extends Controller
     // specific call handle (uid of client)
     public function meet(Request $request, $uid = false) {
         $session = AppSession::where('session_key', $request->cookie('sessionKey'))->first();
-        $pro = $session ? $session->pro : null;
         $client = !empty($uid) ? Client::where('uid', $uid)->first() : null;
-        return view('app.video.call', compact('session', 'pro', 'client'));
+        return view('app.video.call', compact('session', 'client'));
     }
 
     // ajax ep used by the video page

app/Models/Bill.php

@@ -11,4 +11,8 @@ class Bill extends Model
     public function careMonth() {
         return $this->belongsTo(CareMonth::class);
     }
+
+    public function note() {
+        return $this->belongsTo(Note::class);
+    }
 }

public/css/style.css

@@ -38,9 +38,12 @@
   width: var(--w-70);
 }
 .stag-primary-bg {
-  background-color: var(--primary-color);
+  background-color: var(--primary-color) !important;
   color: #fff;
 }
+.stag-primary-border {
+    border-color: var(--primary-color) !important;
+}
 .navbar-brand {
   font-size: 25px;
   font-weight: 900;
@@ -162,3 +165,21 @@ body>nav.navbar {
 .stag-content {
     height: calc(100% - 55px);
 }
+.moe-disabled[moe] {
+    cursor: not-allowed;
+}
+.moe-disabled[moe] [start][show] {
+    opacity: 0.5;
+    pointer-events: none;
+}
+.mcp-theme-1 .stag-no-wrap-td {
+    max-width: 260px;
+}
+.mcp-theme-1 .stag-no-wrap {
+    max-width: 250px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    display: block;
+}
+

public/js/mc.js

@@ -94,6 +94,7 @@ $(document).ready(function () {
     if (body.is('.stag_rhs_collapsed')) {
         icon.removeClass().addClass('fa fa-arrow-left');
     }
+    initPrimaryForm();
     initFastLoad();
     if(typeof initializeCalendar !== 'undefined') {
         initializeCalendar();
@@ -166,11 +167,9 @@ function initFastLoad(_parent = false) {
                 showMask();
                 console.log('ALIX: showed mask');
                 fastLoad(this.href, true, true);
-                if (_menuItem) {
-                    $(this).closest('.dropdown-menu')
-                        .removeClass('show')
-                        .prev('.dropdown-toggle').attr('aria-expanded', 'false');
-                }
+                $('.dropdown-menu[aria-labelledby="practice-management"]')
+                    .removeClass('show')
+                    .prev('.dropdown-toggle').attr('aria-expanded', 'false');
                 return false;
             });
         // console.info('FastLoad enabled for ' + _a.innerText + ' [' + _a.href + ']');
@@ -193,9 +192,10 @@ function onFastLoaded(_data, _href, _history) {
     var content = $(_data).find('.stag-content');
     if (content && content.length) {
         content = content.html();
-        content += '<script src="/js/yemi.js?_=2"></script>';
+        content += '<script src="/js/yemi.js?_=3"></script>';
         targetParent.html(content);
         window.setTimeout(function() {
+            initPrimaryForm();
             initFastLoad(targetParent);
         }, 50);
         if(typeof initializeCalendar !== 'undefined') {
@@ -230,6 +230,12 @@ function fastLoad(_href, _history = true, _useCache = true) {
     }
 }
 
+function initPrimaryForm() {
+    if($('.primary-form:visible').length) {
+        $('.primary-form:visible').first().find('input, textarea, select').first().focus().select();
+    }
+}
+
 function openInRHS(_url) {
     window.top.showRHS();
     var icon = $('.stag_rhs_toggle i');

public/js/yemi.js

@@ -280,6 +280,9 @@ jQuery(document).ready(function () {
 
         if (start) {
             $(start).click(function () {
+                $('.dropdown-menu[aria-labelledby="practice-management"]')
+                    .removeClass('show')
+                    .prev('.dropdown-toggle').attr('aria-expanded', 'false');
                 if ($(realForm).attr('show') == null) {
                     if (!formToggle && $(realForm).attr('liner') != null) {
                         $(realForm).css('display', 'inline');

resources/views/app/dashboard.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3">
     <div class="container m-0 mt-4">
         <div class="row">
-            <div class="col-md-4">
+            <div class="col-md-4 mcp-theme-1">
                 <div class="card">
                     <div class="card-header">
                         <strong>
@@ -75,7 +75,7 @@
 <script>
     var events = JSON.parse('{!! json_encode($appointments) !!}')
     function initializeCalendar() {
-        if (!$("#calendar").length) 
+        if (!$("#calendar").length)
             return;
         var calendarEl = document.getElementById("calendar");
         var calendar = new FullCalendar.Calendar(calendarEl, {
@@ -91,4 +91,4 @@
     }
     initializeCalendar();
 </script>
-@endsection
+@endsection

resources/views/app/new-patient.blade.php

@@ -4,9 +4,9 @@
 
     <?php $patients = [1,2,3,4]; ?>
 
-    <div class="row">
-        <div class="col-6">
-            <div class="card mt-3 d-block mb-3" moe="">
+    <div class="p-3 mcp-theme-1">
+        <div class="col-12 col-lg-6 px-0">
+            <div class="card d-block mb-3" moe="">
 
                 <div class="card-header">
                     <strong>
@@ -15,16 +15,16 @@
                     </strong>
                 </div>
                 <div class="card-body">
-                    <form show url="/api/client/create" class="px-3 pt-3 pb-1" redir="patients/view/[data]">
+                    <form show url="/api/client/create" class="px-3 pt-3 pb-1 primary-form" redir="patients/view/[data]">
                         @if (session('message'))
                             <div class="alert alert-danger">{{ session('message') }}</div>
                         @endif
                         <div class='form-group mb-3'>
-                            <label class='control-label'>Name First *</label>
+                            <label class='control-label'>First Name *</label>
                             <input class='form-control' type='text' name='nameFirst' required>
                         </div>
                         <div class='form-group mb-3'>
-                            <label class='control-label'>Name Last *</label>
+                            <label class='control-label'>Last Name *</label>
                             <input class='form-control' type='text' name='nameLast' value='' required>
                         </div>
                         <div class='form-group mb-3'>

resources/views/app/patient/care-month/dashboard.blade.php

@@ -4,6 +4,67 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
+    @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+        <div class="pt-2 d-flex align-items-start">
+            <h6 class="my-0 text-secondary d-flex align-items-start">
+                <a href="/patients/view/{{ $patient->uid }}/care-months" class="small text-decoration-none mr-3">
+                    <i class="fa fa-chevron-left"></i>
+                </a>
+                <div>
+                    <div>
+                        <span class="text-dark font-weight-bold">Care Month</span>&nbsp;for&nbsp;<span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
+                    </div>
+                    <div class="text-dark d-inline-flex align-items-center mt-2">
+                                    <span class="mr-2">
+                                        <i class="fa fa-exclamation-triangle"></i>
+                                        MCP Onboarding Visit Pending
+                                    </span>
+                        <div moe>
+                            <a start show>Update</a>
+                            <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <select name="hasMcpDoneOnboardingVisit"
+                                            class="form-control form-control-sm"
+                                            onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+                                        <option value="">-- Select Status --</option>
+                                        <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+                                        <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+                                        <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" max="{{ date('Y-m-d') }}">
+                                </div>
+                                <div class="mb-2">
+                                    <select name="mcpOnboardingVisitNoteUid" disabled
+                                            class="form-control form-control-sm if-visit-done"
+                                            onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
+                                        <option value="">-- Visit Note --</option>
+                                        @foreach ($notes as $note)
+                                            @if(!empty($note->title))
+                                                <option value="{{$note->uid}}">{{$note->title}}</option>
+                                            @endif
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-2 if-note-outside-system">
+                                                <textarea class="form-control form-control-sm"
+                                                          name="reasonOnboardingVisitNoteOutsideSystem"
+                                                          placeholder="Visit note outside the system reason"></textarea>
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </h6>
+        </div>
+    @else
+
     <div class="">
         <div class="pt-2 d-flex align-items-start">
             <h6 class="my-0 text-secondary d-flex align-items-start">
@@ -165,8 +226,8 @@
                                         <div class="mb-2">
                                             <select class="form-control form-control-sm" name="proUid">
                                                 <option value="">-- Select Pro --</option>
-                                                @foreach($pros as $pro)
-                                                    <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
+                                                @foreach($pros as $iPro)
+                                                    <option value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
                                                 @endforeach
                                             </select>
                                         </div>
@@ -316,8 +377,8 @@
                                 <div class="mb-2">
                                     <select class="form-control form-control-sm" name="proUid">
                                         <option value="">-- Select Pro --</option>
-                                        @foreach($pros as $pro)
-                                            <option value="{{ $pro->uid }}">{{ $pro->displayName() }}</option>
+                                        @foreach($pros as $iPro)
+                                            <option value="{{ $iPro->uid }}">{{ $iPro->displayName() }}</option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -876,4 +937,6 @@
         </div>
 
     </div>
+
+    @endif
 @endsection

resources/views/app/patient/care-months.blade.php

@@ -1,6 +1,65 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
+
+    @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+        <div class="pt-2 d-flex align-items-start">
+            <h6 class="my-0 text-secondary d-flex align-items-start">
+                <div>
+                    <div>
+                        <span class="text-dark font-weight-bold">Care Months</span>
+                    </div>
+                    <div class="text-dark d-inline-flex align-items-center mt-2">
+                                    <span class="mr-2">
+                                        <i class="fa fa-exclamation-triangle"></i>
+                                        MCP Onboarding Visit Pending
+                                    </span>
+                        <div moe>
+                            <a start show>Update</a>
+                            <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <select name="hasMcpDoneOnboardingVisit"
+                                            class="form-control form-control-sm"
+                                            onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+                                        <option value="">-- Select Status --</option>
+                                        <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+                                        <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+                                        <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" max="{{ date('Y-m-d') }}">
+                                </div>
+                                <div class="mb-2">
+                                    <select name="mcpOnboardingVisitNoteUid" disabled
+                                            class="form-control form-control-sm if-visit-done"
+                                            onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
+                                        <option value="">-- Visit Note --</option>
+                                        @foreach ($notes as $note)
+                                            @if(!empty($note->title))
+                                                <option value="{{$note->uid}}">{{$note->title}}</option>
+                                            @endif
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-2 if-note-outside-system">
+                                                <textarea class="form-control form-control-sm"
+                                                          name="reasonOnboardingVisitNoteOutsideSystem"
+                                                          placeholder="Visit note outside the system reason"></textarea>
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </h6>
+        </div>
+    @else
+
     <div class="">
         <div class="d-flex align-items-center pt-2">
             <h6 class="my-0 font-weight-bold text-secondary">Care Months</h6>
@@ -74,4 +133,6 @@
             </tbody>
         </table>
     </div>
+
+    @endif
 @endsection

resources/views/app/patient/note/dashboard.blade.php

@@ -0,0 +1,275 @@
+<?php
+/** @var App\Models\Note $note */
+?>
+@extends ('layouts.patient')
+
+@section('inner-content')
+
+    <div class="pt-2 pb-3 d-flex align-items-start">
+        <h6 class="my-0 text-secondary d-flex align-items-start">
+            <a href="/patients/view/{{ $patient->uid }}/notes" class="small text-decoration-none mr-3">
+                <i class="fa fa-chevron-left"></i>
+            </a>
+            <div>
+                <span class="text-dark font-weight-bold">{{$note->title}}</span>
+            </div>
+        </h6>
+    </div>
+
+    <div class="card mb-0">
+        <div class="card-header d-flex align-items-start px-3">
+            <div class="pr-2">
+                {{$note->title}}
+                <div moe>
+                    <a href="" show start><i class="fa fa-edit"></i></a>
+                    <form url="/api/note/putTitle">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <input type="text" name="title" value="{{$note->title}}" class="form-control form-control-sm"
+                                   placeholder="Title">
+                        </div>
+                        <div class="form-group mb-0">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <div class="px-2 border-left">
+                <div class="d-flex">
+                    <span class="mr-2">{{friendly_date_time($note->effective_dateest, false)}}</span>
+                    <span moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-calendar"></i></a>
+                    <form url="/api/note/putEffectiveDateEST">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <label for="" class="text-secondary text-sm">Effective date EST</label>
+                            <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-0">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </span>
+                </div>
+                <div class="d-flex">
+                    <span class="mr-2">{{friendly_time($note->effective_time)}}</span>
+                    <span moe class="ml-auto">
+                    <a href="" show start><i class="fa fa-clock"></i></a>
+                    <form url="/api/note/putEffectiveTime">
+                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <label for="" class="text-secondary text-sm">Effective time </label>
+                            <input type="time" name="effectiveTime" value="{{ date("H:i", strtotime($note->effective_time)) }}" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-0">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </span>
+                </div>
+            </div>
+
+            <div class="px-2 border-left">
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
+                    <div moe class="ml-auto">
+                        <a href="" show start><i class="fa fa-edit"></i></a>
+                        <form url="/api/note/putHcp">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <select name="hcpProUid" class="form-control form-control-sm">
+                                    <option value="">-- Select HCP Pro --</option>
+                                    @foreach ($pros as $iPro)
+                                        <option value="{{$iPro->uid}}" {{ $iPro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                            <div class="mb-0">
+                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Ally:</span> {{$note->allyPro->name_display}}</span>
+                    <div moe class="ml-auto">
+                        <a href="" show start><i class="fa fa-edit"></i></a>
+                        <form url="/api/note/putAlly">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <select name="allyProUid" class="form-control form-control-sm">
+                                    <option value="">-- Select Ally Pro --</option>
+                                    @foreach ($pros as $iPro)
+                                        <option value="{{$iPro->uid}}" {{ $iPro->id === $note->allyPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                            <div class="mb-0">
+                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <div class="ml-auto d-flex align-items-start">
+                <div class="pr-2 border-right">
+                    <div>
+                        @if($note->is_signed_by_hcp)
+                            <span class="text-secondary">
+                        <i class="fa fa-check"></i>
+                        HCP Signed
+                    </span>
+                        @else
+                            <div moe
+                                 class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                 title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
+                                <a class="" href="" show start>Sign as HCP</a>
+                                <form url="/api/note/signAsHcp">
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Sign this note as HCP?</p>
+                                    <div class="mb-0">
+                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                    <div>
+                        @if($note->is_signed_by_ally)
+                            <span class="text-secondary">
+                        <i class="fa fa-check"></i>
+                        Ally Signed
+                    </span>
+                        @else
+                            <div moe
+                                 class="{{ $note->ally_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                 title="{{ $note->ally_pro_id !== $pro->id ? 'Only the note\'s Ally can sign' : '' }}">
+                                <a class="" href="" show start>Sign as Ally</a>
+                                <form url="/api/note/signAsAlly">
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Sign this note as Ally?</p>
+                                    <div class="mb-0">
+                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                </div>
+                <div moe relatve class="pl-2">
+                    <a class="" href="" show start>Create Bill</a>
+                    <form url="/api/bill/createForNote" right>
+                        <input type="hidden" name="noteUid" value="{{$note->uid}}">
+                        <div class="mb-2">
+                            <label for="" class="text-secondary text-sm">Effective Date</label>
+                            <input type="date" name="effectiveDate" class="form-control form-control-sm" required>
+                        </div>
+                        <div class="mb-2">
+                            <input type="text" name="code" placeholder="Code" class="form-control form-control-sm" required>
+                        </div>
+                        <div class="mb-2">
+                            <input type="text" name="reason1" placeholder="Reason 1" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <input type="text" name="reason2" placeholder="Reason 2" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <input type="text" name="serviceLocation" placeholder="Service Location" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <input type="text" name="modifier" placeholder="Modifier" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <input type="number" name="numberOfUnits" placeholder="Number of Units" class="form-control form-control-sm">
+                        </div>
+                        <div class="">
+                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+        <div class="card-body p-3">
+            <div>
+
+                <div class="mb-2">
+                    <div>
+                        {!! $note->free_text_html !!}
+                    </div>
+                </div>
+
+                @if($note->bills->count())
+                    <div class="mt-2">
+                        <table class="table table-sm tabe-striped mb-0">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-bottom-0 w-25">Code</th>
+                                <th class="border-bottom-0"></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach ($note->bills as $bill)
+                                <tr>
+                                    <td class="{{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
+                                    <td>
+                                        <div class="d-flex align-items-center">
+                                            @if(!$bill->is_cancelled)
+                                                @if($bill->is_signed_by_hcp)
+                                                    <span class="text-secondary">
+                                                <i class="fa fa-check"></i>
+                                                HCP Signed
+                                            </span>
+                                                @else
+                                                    <div moe
+                                                         class="{{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                         title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                        <a class="" href="" show start>Sign as HCP</a>
+                                                        <form url="/api/bill/signAsHcp">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Sign this bill as HCP?</p>
+                                                            <div class="mb-0">
+                                                                <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @endif
+                                                <span class="mx-2 text-secondary">|</span>
+                                            @endif
+                                            @if($bill->is_cancelled)
+                                                <span class="text-secondary">
+                                            Cancelled
+                                        </span>
+                                            @else
+                                                <div moe>
+                                                    <a class="" href="" show start>Cancel</a>
+                                                    <form url="/api/bill/markCancelled">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Cancel this bill?</p>
+                                                        <div class="mb-0">
+                                                            <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>No</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+                                        </div>
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                @endif
+            </div>
+        </div>
+    </div>
+@endsection

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

@@ -1,256 +1,144 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
-@foreach ($patient->notes as $note)
-<div class="card mb-3">
-    <div class="card-header d-flex align-items-start px-3">
-        <div class="pr-2">
-            {{$note->title}}
-            <div moe>
-                <a href="" show start><i class="fa fa-edit"></i></a>
-                <form url="/api/note/putTitle">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <input type="text" name="title" value="{{$note->title}}" class="form-control form-control-sm"
-                               placeholder="Title">
-                    </div>
-                    <div class="form-group mb-0">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+
+    @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+        <div class="pt-2 d-flex align-items-start">
+            <h6 class="my-0 text-secondary d-flex align-items-start">
+                <div>
+                    <div>
+                        <span class="text-dark font-weight-bold">Notes</span>
                     </div>
-                </form>
-            </div>
-        </div>
-        <div class="px-2 border-left">
-            <div class="d-flex">
-                <span class="mr-2">{{friendly_date_time($note->effective_dateest, false)}}</span>
-                <span moe class="ml-auto">
-                    <a href="" show start><i class="fa fa-calendar"></i></a>
-                    <form url="/api/note/putEffectiveDateEST">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <div class="mb-2">
-                            <label for="" class="text-secondary text-sm">Effective date EST</label>
-                            <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}" class="form-control form-control-sm">
-                        </div>
-                        <div class="mb-0">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                        </div>
-                    </form>
-                </span>
-            </div>
-            <div class="d-flex">
-                <span class="mr-2">{{friendly_time($note->effective_time)}}</span>
-                <span moe class="ml-auto">
-                    <a href="" show start><i class="fa fa-clock"></i></a>
-                    <form url="/api/note/putEffectiveTime">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
-                        <div class="mb-2">
-                            <label for="" class="text-secondary text-sm">Effective time </label>
-                            <input type="time" name="effectiveTime" value="{{ date("H:i", strtotime($note->effective_time)) }}" class="form-control form-control-sm">
-                        </div>
-                        <div class="mb-0">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                    <div class="text-dark d-inline-flex align-items-center mt-2">
+                                    <span class="mr-2">
+                                        <i class="fa fa-exclamation-triangle"></i>
+                                        MCP Onboarding Visit Pending
+                                    </span>
+                        <div moe>
+                            <a start show>Update</a>
+                            <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <div class="mb-2">
+                                    <select name="hasMcpDoneOnboardingVisit"
+                                            class="form-control form-control-sm"
+                                            onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+                                        <option value="">-- Select Status --</option>
+                                        <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+                                        <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+                                        <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                    </select>
+                                </div>
+                                <div class="mb-2">
+                                    <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" max="{{ date('Y-m-d') }}">
+                                </div>
+                                <div class="mb-2">
+                                    <select name="mcpOnboardingVisitNoteUid" disabled
+                                            class="form-control form-control-sm if-visit-done"
+                                            onchange="toggleVisibilityAsNeeded(this, '', 'if-note-outside-system')">
+                                        <option value="">-- Visit Note --</option>
+                                        @foreach ($notes as $note)
+                                            @if(!empty($note->title))
+                                                <option value="{{$note->uid}}">{{$note->title}}</option>
+                                            @endif
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-2 if-note-outside-system">
+                                                <textarea class="form-control form-control-sm"
+                                                          name="reasonOnboardingVisitNoteOutsideSystem"
+                                                          placeholder="Visit note outside the system reason"></textarea>
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
                         </div>
-                    </form>
-                </span>
-            </div>
+                    </div>
+                </div>
+            </h6>
         </div>
+    @else
 
-        <div class="px-2 border-left">
-            <div class="d-flex">
-                <span class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</span>
-                <div moe class="ml-auto">
-                    <a href="" show start><i class="fa fa-edit"></i></a>
-                    <form url="/api/note/putHcp">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
+        <div class="pt-2 d-flex align-items-start">
+            <h6 class="my-0 text-secondary d-flex align-items-start">
+                <span class="font-weight-bold text-secondary">Notes</span>
+                <span class="mx-2 text-secondary">|</span>
+                <div moe>
+                    <a start show class="py-0 mb-3">Add</a>
+                    <form url="/api/note/createUsingFreeTextHtml" class="mcp-theme-1">
+                        <input type="hidden" name="clientUid" value="{{$patient->uid}}">
                         <div class="mb-2">
                             <select name="hcpProUid" class="form-control form-control-sm">
                                 <option value="">-- Select HCP Pro --</option>
-                                @foreach ($pros as $pro)
-                                <option value="{{$pro->uid}}" {{ $pro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$pro->name_display}}</option>
+                                @foreach ($pros as $iPro)
+                                    <option
+                                        value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                 @endforeach
                             </select>
                         </div>
-                        <div class="mb-0">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div class="d-flex">
-                <span class="mr-2"><span class="text-secondary">Ally:</span> {{$note->allyPro->name_display}}</span>
-                <div moe class="ml-auto">
-                    <a href="" show start><i class="fa fa-edit"></i></a>
-                    <form url="/api/note/putAlly">
-                        <input type="hidden" name="uid" value="{{$note->uid}}">
                         <div class="mb-2">
                             <select name="allyProUid" class="form-control form-control-sm">
                                 <option value="">-- Select Ally Pro --</option>
-                                @foreach ($pros as $pro)
-                                    <option value="{{$pro->uid}}" {{ $pro->id === $note->allyPro->id ? 'selected' : '' }}>{{$pro->name_display}}</option>
+                                @foreach ($pros as $iPro)
+                                    <option
+                                        value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                 @endforeach
                             </select>
                         </div>
-                        <div class="mb-0">
-                            <button class="btn btn-primary btn-sm" submit>Submit</button>
-                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        <div class="mb-2">
+                            <input type="text" name="title" placeholder="Title" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Effective Date</label>
+                            <input type="date" name="effectiveDateEST" placeholder="Effective Date" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Effective Time</label>
+                            <input type="time" name="effectiveTime" placeholder="Effective Time" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <textarea name="freeTextHtml" id="" cols="30" rows="5" placeholder="Content" class="form-control form-control-sm"></textarea>
+                        </div>
+                        <div>
+                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
                         </div>
                     </form>
                 </div>
-            </div>
-        </div>
-        <div class="ml-auto d-flex align-items-start">
-            <div class="pr-2 border-right">
-                <div>
-                @if($note->is_signed_by_hcp)
-                    <span class="text-secondary">
-                        <i class="fa fa-check"></i>
-                        HCP Signed
-                    </span>
-                @else
-                    <div moe>
-                        <a class="" href="" show start>Sign as HCP</a>
-                        <form url="/api/note/signAsHcp">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <p>Sign this note as HCP?</p>
-                            <div class="mb-0">
-                                <button class="btn btn-success btn-sm" submit>Sign</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                @endif
-                </div>
-                <div>
-                @if($note->is_signed_by_ally)
-                    <span class="text-secondary">
-                        <i class="fa fa-check"></i>
-                        Ally Signed
-                    </span>
-                @else
-                    <div moe>
-                        <a class="" href="" show start>Sign as Ally</a>
-                        <form url="/api/note/signAsAlly">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <p>Sign this note as Ally?</p>
-                            <div class="mb-0">
-                                <button class="btn btn-success btn-sm" submit>Sign</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                @endif
-                </div>
-            </div>
-            <div moe relatve class="pl-2">
-                <a class="" href="" show start>Create Bill</a>
-                <form url="/api/bill/createForNote" right>
-                    <input type="hidden" name="noteUid" value="{{$note->uid}}">
-                    <div class="mb-2">
-                        <label for="" class="text-secondary text-sm">Effective Date</label>
-                        <input type="date" name="effectiveDate" class="form-control form-control-sm" required>
-                    </div>
-                    <div class="mb-2">
-                        <input type="text" name="code" placeholder="Code" class="form-control form-control-sm" required>
-                    </div>
-                    <div class="mb-2">
-                        <input type="text" name="reason1" placeholder="Reason 1" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text" name="reason2" placeholder="Reason 2" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text" name="serviceLocation" placeholder="Service Location" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-2">
-                        <input type="text" name="modifier" placeholder="Modifier" class="form-control form-control-sm">
-                    </div>
-                    <div class="mb-2">
-                        <input type="number" name="numberOfUnits" placeholder="Number of Units" class="form-control form-control-sm">
-                    </div>
-                    <div class="">
-                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
-            </div>
+            </h6>
         </div>
-    </div>
-    <div class="card-body p-3">
-        <div>
 
-            <div class="mb-2">
-                <div>
-                    {!! $note->free_text_html !!}
-                </div>
-            </div>
+        <table class="table table-sm table-striped table-bordered mb-0 mt-2">
+            <thead>
+            <tr>
+                <th class="px-2 text-secondary border-bottom-0">Created</th>
+                <th class="px-2 text-secondary border-bottom-0">Title</th>
+                <th class="px-2 text-secondary border-bottom-0">HCP</th>
+                <th class="px-2 text-secondary border-bottom-0">Ally</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach ($patient->notes as $note)
+                <tr>
+                    <td class="px-2">
+                        {{ friendly_date_time($note->created_at, true) }}
+                    </td>
+                    <td class="px-2">
+                        <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
+                            {{ $note->title }}
+                        </a>
+                    </td>
+                    <td class="px-2">
+                        {{$note->hcpPro->name_display}}
+                    </td>
+                    <td class="px-2">
+                        {{$note->allyPro->name_display}}
+                    </td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
 
-            @if($note->bills->count())
-            <div class="mt-2">
-                <table class="table table-sm tabe-striped mb-0">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="border-bottom-0 w-25">Code</th>
-                            <th class="border-bottom-0"></th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        @foreach ($note->bills as $bill)
-                        <tr>
-                            <td class="{{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
-                            <td>
-                                <div class="d-flex align-items-center">
-                                    @if(!$bill->is_cancelled)
-                                        @if($bill->is_signed_by_hcp)
-                                            <span class="text-secondary">
-                                                <i class="fa fa-check"></i>
-                                                HCP Signed
-                                            </span>
-                                        @else
-                                            <div moe>
-                                                <a class="" href="" show start>Sign as HCP</a>
-                                                <form url="/api/bill/signAsHcp">
-                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                    <p>Sign this bill as HCP?</p>
-                                                    <div class="mb-0">
-                                                        <button class="btn btn-success btn-sm" submit>Sign</button>
-                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        @endif
-                                        <span class="mx-2 text-secondary">|</span>
-                                    @endif
-                                    @if($bill->is_cancelled)
-                                        <span class="text-secondary">
-                                            Cancelled
-                                        </span>
-                                    @else
-                                        <div moe>
-                                            <a class="" href="" show start>Cancel</a>
-                                            <form url="/api/bill/markCancelled">
-                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                <p>Cancel this bill?</p>
-                                                <div class="mb-0">
-                                                    <button class="btn btn-danger btn-sm" submit>Yes</button>
-                                                    <button class="btn btn-default border btn-sm" cancel>No</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    @endif
-                                </div>
-                            </td>
-                        </tr>
-                        @endforeach
-                    </tbody>
-                </table>
-            </div>
-            @endif
-        </div>
-    </div>
-</div>
-@endforeach
+    @endif
 @endsection

resources/views/app/patients.blade.php

@@ -13,16 +13,16 @@
         </div>
         <div class="card-body p-0">
             <table class="table table-condensed p-0 m-0">
-                <thead>
+                <thead class="bg-light">
                 <tr>
-                    <th class="px-3">#</th>
-                    <th>Name</th>
-                    <th>DOB</th>
-                    <th>Sex</th>
-                    <th>Ins.</th>
-                    <th>PCP</th>
-                    <th>Assistant</th>
-                    <th>Next E&M</th>
+                    <th class="px-3 border-0">#</th>
+                    <th class="border-0">Name</th>
+                    <th class="border-0">DOB</th>
+                    <th class="border-0">Sex</th>
+                    <th class="border-0">Ins.</th>
+                    <th class="border-0">PCP</th>
+                    <th class="border-0">Assistant</th>
+                    <th class="border-0">Next E&M</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -71,9 +71,6 @@
                 </tbody>
             </table>
         </div>
-        <div class="card-footer px-3">
-            Pagination Later
-        </div>
     </div>
     </div>
 

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

@@ -6,14 +6,15 @@
 
 @section('inner-content')
     <div class="mcp-theme-1">
-        <table class="table table-sm">
+        <table class="table table-sm" style="table-layout: fixed">
             <thead>
                 <tr>
                     <th>Date</th>
                     <th>Type</th>
                     <th>Client</th>
-                    <th>Care Month</th>
-                    <th>Bill/Code</th>
+                    {{--<th>Care Month</th>
+                    <th>Bill/Code</th>--}}
+                    <th>Reason</th>
                     <th>Memo</th>
                     <th>Amount</th>
                     <th>Balance</th>
@@ -33,7 +34,7 @@
                                 <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
                             </a>
                         </td>
-                        <td>
+                        {{--<td>
                             <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
                                 <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
                             </a>
@@ -41,6 +42,24 @@
                         <td>
                             <b>{{ $transaction->bill->code }}</b>
                             <div class="text-secondary text-sm">Created: {{ friendly_date_time($transaction->bill->created_at, true) }}</div>
+                        </td>--}}
+                        <td class="stag-no-wrap-td">
+                            @if($transaction->bill->careMonth)
+                                <b>{{ $transaction->bill->code }}</b>
+                                -
+                                <a href="/patients/view/{{ $transaction->client->uid }}/care-months/view/{{ $transaction->bill->careMonth->uid }}">
+                                    <b>{{ friendly_month($transaction->bill->careMonth->start_date) }}</b>
+                                </a>
+                            @elseif($transaction->bill->note)
+                                <b>{{ $transaction->bill->code }}</b>
+                                -
+                                <a href="/patients/view/{{ $transaction->client->uid }}/notes/view/{{ $transaction->bill->note->uid }}">
+                                    <b>{{ $transaction->bill->note->title }}</b>
+                                </a>
+                            @endif
+                            @if(!empty($transaction->bill->reason1))
+                            <div class="text-secondary text-sm stag-no-wrap" title="{{ $transaction->bill->reason1 }}">{{ $transaction->bill->reason1 }}</div>
+                            @endif
                         </td>
                         <td>{{ $transaction->custom_memo ? $transaction->custom_memo : '-' }}</td>
                         <td>${{ $transaction->amount }}</td>

resources/views/app/video/call.blade.php

@@ -9,6 +9,7 @@
     <link href="/css/app.css" rel="stylesheet">
     <link rel="stylesheet" href="/fontawesome-free/css/all.min.css">
     <link href="/css/meeting.css" rel="stylesheet">
+    <link href="/css/style.css" rel="stylesheet">
     <script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
     <script src="https://static.opentok.com/v2/js/opentok.js"></script>
 </head>
@@ -21,13 +22,13 @@
             <span class="mr-3">
                 {{ $pro->name_display }} | PRO
             </span>
-            <button class="btn btn-sm btn-primary px-4 font-weight-bold"
+            <button class="btn btn-sm btn-primary px-4 font-weight-bold stag-primary-bg stag-primary-border"
                     v-on:click.prevent="nextPatient()"
                     :disabled="client || checkingForNextPatient || started">Next Patient</button>
-            <span v-if="patientInQueue && !started" class="patient-in-q-alert text-warning text-sm ml-2 small">
+            <span v-if="patientInQueue && !started" class="patient-in-q-alert text-warning text-sm ml-3 small">
                 <i class="fa fa-circle"></i>
             </span>
-            <span v-if="!patientInQueue && !started" class="text-success text-sm ml-2 small">
+            <span v-if="!patientInQueue && !started" class="text-success text-sm ml-3 small">
                 <i class="fa fa-circle"></i>
             </span>
         </div>

resources/views/layouts/patient.blade.php

@@ -112,7 +112,7 @@
                                         <i class=chart>[#{{$patient->chart_number}}]</i>
                                     </div>
                                     <div class=separators>
-                                        <div>{{$patient->dob}} ({{$patient->age_in_years}} y.o {{$patient->sex}})</div>
+                                        <div>{{friendly_date_time($patient->dob, false)}} ({{$patient->age_in_years}} y.o {{$patient->sex}})</div>
                                         <div>
                                             <label>MCN:</label>
                                             @if($patient->was_medicare_validation_successful)
@@ -236,7 +236,9 @@
                                     </div>
                                 </section>
                                 <section class=vbox>
-                                    <div moe relative>
+                                    <div moe relative
+                                         class="{{ $patient->has_mcp_done_onboarding_visit !== 'YES' ? 'moe-disabled' : '' }}"
+                                         title="{{ $patient->has_mcp_done_onboarding_visit !== 'YES' ? 'MCP Onboarding Visit Pending' : 'Create Note' }}">
                                         <a start show>
                                             <!-- <i class="fa fa-plus-circle"></i> -->
                                             <button>+ Note</button>
@@ -246,18 +248,18 @@
                                             <div class="mb-2">
                                                 <select name="hcpProUid" class="form-control form-control-sm">
                                                     <option value="">-- Select HCP Pro --</option>
-                                                    @foreach ($pros as $pro)
+                                                    @foreach ($pros as $iPro)
                                                         <option
-                                                            value="{{$pro->uid}}">{{$pro->name_display}}</option>
+                                                            value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                     @endforeach
                                                 </select>
                                             </div>
                                             <div class="mb-2">
                                                 <select name="allyProUid" class="form-control form-control-sm">
                                                     <option value="">-- Select Ally Pro --</option>
-                                                    @foreach ($pros as $pro)
+                                                    @foreach ($pros as $iPro)
                                                         <option
-                                                            value="{{$pro->uid}}">{{$pro->name_display}}</option>
+                                                            value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                     @endforeach
                                                 </select>
                                             </div>
@@ -421,9 +423,9 @@
                                                     <div class="form-group">
                                                         <select name="mcpProUid" class="form-control">
                                                             <option value="">-- select mcp --</option>
-                                                            @foreach ($pros as $pro)
+                                                            @foreach ($pros as $iPro)
                                                                 <option
-                                                                    value="{{$pro->uid}}">{{$pro->name_display}}</option>
+                                                                    value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                             @endforeach
                                                         </select>
                                                     </div>
@@ -527,9 +529,9 @@
                                                     <label for="" class="control-label">HCP Pro</label>
                                                     <select name="hcpProUid" class="form-control">
                                                         <option value="">-- select hcp pro --</option>
-                                                        @foreach ($pros as $pro)
+                                                        @foreach ($pros as $iPro)
                                                             <option
-                                                                value="{{$pro->uid}}">{{$pro->name_display}}</option>
+                                                                value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                         @endforeach
                                                     </select>
                                                 </div>
@@ -537,9 +539,9 @@
                                                     <label for="" class="control-label">Ally Pro</label>
                                                     <select name="allyProUid" class="form-control">
                                                         <option value="">-- select ally pro --</option>
-                                                        @foreach ($pros as $pro)
+                                                        @foreach ($pros as $iPro)
                                                             <option
-                                                                value="{{$pro->uid}}">{{$pro->name_display}}</option>
+                                                                value="{{$iPro->uid}}">{{$iPro->name_display}}</option>
                                                         @endforeach
                                                     </select>
                                                 </div>

resources/views/layouts/practice-management.blade.php

@@ -24,7 +24,7 @@
 
             {{--<main role="main" class="col-md-9 ml-sm-auto col-lg-10 px-md-4">--}}
             <main role="main" class="col-12">
-                <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+                <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 mb-2">
                     <h1 class="h2">@yield('section-title')</h1>
                     <div class="mb-2 mb-md-0">
                         <span class="">

resources/views/layouts/template.blade.php

@@ -24,7 +24,7 @@
     <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
     <script src="{{ asset('fullcalendar/main.min.js') }}" type="application/javascript"></script>
     <script src="{{ asset('js/toastr.min.js') }}" type="application/javascript"></script>
-    <script src="/js/yemi.js?_=2" type="application/javascript"></script>
+    <script src="/js/yemi.js?_=3" type="application/javascript"></script>
 
     @yield('head')
 </head>
@@ -82,7 +82,7 @@
     </main><!-- /.container -->
 
     <!-- script to handle history & back/forward for mc/xxx pages -->
-    <script src="/js/mc.js?_=2" type="application/javascript"></script>
+    <script src="/js/mc.js?_=3" type="application/javascript"></script>
 
 </body>
 

routes/web.php

@@ -57,6 +57,9 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('immunizations', 'PatientController@immunizations')->name('immunizations');
         Route::get('allergies', 'PatientController@allergies')->name('allergies');
         Route::get('notes', 'PatientController@notes')->name('notes');
+        Route::name('notes.view.')->prefix('notes/view/{note}')->group(function () {
+            Route::get('', 'NoteController@dashboard')->name('dashboard');
+        });
         Route::get('flowsheets', 'PatientController@flowSheets')->name('flowsheets');
         Route::get('demographics', 'PatientController@demographics')->name('demographics');
         Route::get('account', 'PatientController@account')->name('account');