Update transactions listing, notes listing and add note-single page

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/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

@@ -172,3 +172,14 @@ body>nav.navbar {
     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;
+}
+

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

@@ -60,274 +60,85 @@
         </div>
     @else
 
-        <div class="pt-2 pb-3 d-flex align-items-start">
+        <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>
-                </div>
-            </h6>
-        </div>
-
-@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>
-                    </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}}">
+                <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 $iPro)
-                                <option value="{{$iPro->uid}}" {{ $iPro->id === $note->hcpPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                    <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 $iPro)
-                                    <option value="{{$iPro->uid}}" {{ $iPro->id === $note->allyPro->id ? 'selected' : '' }}>{{$iPro->name_display}}</option>
+                                    <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
-                         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>
+            </h6>
         </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>
-@endforeach
+        <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>
 
     @endif
 @endsection

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>

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');