Browse Source

Programs UI [wip]

Vijayakrishnan 4 years ago
parent
commit
88230c3649

+ 4 - 1
app/Http/Controllers/PatientController.php

@@ -12,6 +12,7 @@ use App\Models\Facility;
 use App\Models\Handout;
 use App\Models\Handout;
 use App\Models\NoteTemplate;
 use App\Models\NoteTemplate;
 use App\Models\Pro;
 use App\Models\Pro;
+use App\Models\Program;
 use App\Models\SectionTemplate;
 use App\Models\SectionTemplate;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\File;
@@ -27,12 +28,14 @@ class PatientController extends Controller
             $matching = ClientBDTDevice::where('device_id', $record->id)->get();
             $matching = ClientBDTDevice::where('device_id', $record->id)->get();
             return count($matching) === 0;
             return count($matching) === 0;
         });
         });
+        $programs = Program::where('is_active', true)->orderBy('title', 'asc')->get();
         $dxInfoLines = ClientInfoLine::where('client_id', $patient->id)
         $dxInfoLines = ClientInfoLine::where('client_id', $patient->id)
             ->where('category', 'dx')
             ->where('category', 'dx')
             ->where('is_removed', false)
             ->where('is_removed', false)
             ->orderBy('content_text', 'asc')
             ->orderBy('content_text', 'asc')
             ->get();
             ->get();
-        return view('app.patient.dashboard', compact('patient', 'facilities', 'devices', 'dxInfoLines'));
+        return view('app.patient.dashboard',
+            compact('patient', 'facilities', 'devices', 'dxInfoLines', 'programs'));
     }
     }
 
 
     public function actionItems(Request $request, Client $patient )
     public function actionItems(Request $request, Client $patient )

+ 3 - 4
app/Models/Client.php

@@ -159,10 +159,9 @@ class Client extends Model
         return $this->hasOne(McpRequest::class, 'id', 'active_mcp_request_id');
         return $this->hasOne(McpRequest::class, 'id', 'active_mcp_request_id');
     }
     }
 
 
-    public function programs() {
-        return $this->hasMany(Program::class, 'client_id', 'id')
-            ->where('is_active', true)
-            ->orderBy('program_type', 'asc');
+    public function clientPrograms() {
+        return $this->hasMany(ClientProgram::class, 'client_id', 'id')
+            ->where('is_active', true);
     }
     }
 
 
 }
 }

+ 22 - 0
app/Models/ClientProgram.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+# use Illuminate\Database\Eloquent\Model;
+
+class ClientProgram extends Model
+{
+    protected $table = "client_program";
+
+    public function mcp() {
+        return $this->hasOne(Pro::class, 'id', 'mcp_pro_id');
+    }
+
+    public function manager() {
+        return $this->hasOne(Pro::class, 'id', 'manager_pro_id');
+    }
+
+    public function program() {
+        return $this->hasOne(Program::class, 'id', 'program_id');
+    }
+}

+ 5 - 0
app/Models/Measurement.php

@@ -7,4 +7,9 @@ namespace App\Models;
 class Measurement extends Model
 class Measurement extends Model
 {
 {
     protected $table = 'measurement';
     protected $table = 'measurement';
+
+    public function client()
+    {
+        return $this->hasOne(Client::class, 'id', 'client_id');
+    }
 }
 }

+ 25 - 0
app/Models/Pro.php

@@ -301,4 +301,29 @@ class Pro extends Model
             ->get();
             ->get();
     }
     }
 
 
+    public function canAddEntryForMeasurement(Measurement $measurement, Pro $pro)
+    {
+        // check if client has any programs where this measurement type is allowed
+        $allowed = false;
+        $client = $measurement->client;
+        $clientPrograms = $client->clientPrograms;
+
+        if($pro->pro_type !== 'ADMIN') {
+            $clientPrograms = $clientPrograms->filter(function($_clientProgram) use ($pro) {
+                return  $_clientProgram->manager_pro_id === $pro->id;
+            });
+        }
+
+        if(count($clientPrograms)) {
+            foreach ($clientPrograms as $clientProgram) {
+                $program = $clientProgram->program;
+                if(strpos(strtolower($program->measurements), '|' . strtolower($measurement->label) . '|') !== FALSE) {
+                    $allowed = true;
+                    break;
+                }
+            }
+        }
+
+        return $allowed ? $clientPrograms : FALSE;
+    }
 }
 }

+ 1 - 8
app/Models/Program.php

@@ -6,13 +6,6 @@ namespace App\Models;
 
 
 class Program extends Model
 class Program extends Model
 {
 {
-    protected $table = "client_program";
+    protected $table = "program";
 
 
-    public function mcp() {
-        return $this->hasOne(Pro::class, 'id', 'mcp_pro_id');
-    }
-
-    public function manager() {
-        return $this->hasOne(Pro::class, 'id', 'manager_pro_id');
-    }
 }
 }

+ 16 - 6
resources/views/app/patient/dashboard.blade.php

@@ -30,9 +30,6 @@
                 {{-- appointments --}}
                 {{-- appointments --}}
                 @include('app/patient/partials/appointments')
                 @include('app/patient/partials/appointments')
 
 
-                {{-- allergies --}}
-                {{--@include('app/patient/partials/allergies')--}}
-
                 {{-- canvas based allergies --}}
                 {{-- canvas based allergies --}}
                 <div class="pt-2 mt-2 border-top">
                 <div class="pt-2 mt-2 border-top">
                     <div class="d-flex align-items-center pb-2">
                     <div class="d-flex align-items-center pb-2">
@@ -45,9 +42,6 @@
                     </div>
                     </div>
                 </div>
                 </div>
 
 
-                {{-- rx --}}
-                {{--@include('app/patient/partials/rx')--}}
-
                 {{-- canvas based rx --}}
                 {{-- canvas based rx --}}
                 <div class="pt-2 mt-2 border-top">
                 <div class="pt-2 mt-2 border-top">
                     <div class="d-flex align-items-center pb-2">
                     <div class="d-flex align-items-center pb-2">
@@ -313,11 +307,26 @@
                                             <span>{{ $measurement->label }}:</span>
                                             <span>{{ $measurement->label }}:</span>
                                             <span class="font-weight-bold ml-1">{{ $measurement->value }}</span>
                                             <span class="font-weight-bold ml-1">{{ $measurement->value }}</span>
                                             <span class="font-weight-normal text-secondary ml-2 text-sm">(as on {{ friendly_date_time($measurement->effective_date, false) }})</span>
                                             <span class="font-weight-normal text-secondary ml-2 text-sm">(as on {{ friendly_date_time($measurement->effective_date, false) }})</span>
+                                            @php $matchingClientPrograms = $pro->canAddEntryForMeasurement($measurement, $pro); @endphp
+                                            @if($matchingClientPrograms && count($matchingClientPrograms))
                                             <div moe>
                                             <div moe>
                                                 <a href="#" class="ml-2 font-weight-bold" start show><i class="fa fa-clock"></i> + Entry</a>
                                                 <a href="#" class="ml-2 font-weight-bold" start show><i class="fa fa-clock"></i> + Entry</a>
                                                 <form url="/api/clientProgramMonthEntry/create">
                                                 <form url="/api/clientProgramMonthEntry/create">
                                                     <input type="hidden" name="measurementUid" value="{{ $measurement->uid }}">
                                                     <input type="hidden" name="measurementUid" value="{{ $measurement->uid }}">
                                                     <input type="hidden" name="proUid" value="{{ $pro->uid }}">
                                                     <input type="hidden" name="proUid" value="{{ $pro->uid }}">
+                                                    @if(count($matchingClientPrograms) === 1)
+                                                        <input type="hidden" name="clientProgramUid" value="{{ $matchingClientPrograms->first()->uid }}">
+                                                    @else
+                                                        <div class="mb-2">
+                                                            <label class="text-sm mb-1 text-secondary">Program</label>
+                                                            <select autofocus class="form-control form-control-sm" name="clientProgramUid" required>
+                                                                <option value="">-- select --</option>
+                                                                @foreach($matchingClientPrograms as $clientProgram)
+                                                                    <option value="{{$clientProgram->uid}}">{{$clientProgram->program->title}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                    @endif
                                                     <div class="mb-2">
                                                     <div class="mb-2">
                                                         <label class="text-sm mb-1 text-secondary">Effective Date</label>
                                                         <label class="text-sm mb-1 text-secondary">Effective Date</label>
                                                         <input required type="date" class="form-control form-control-sm" name="effectiveDate" value="{{ date('Y-m-d') }}">
                                                         <input required type="date" class="form-control form-control-sm" name="effectiveDate" value="{{ date('Y-m-d') }}">
@@ -344,6 +353,7 @@
                                                     </div>
                                                     </div>
                                                 </form>
                                                 </form>
                                             </div>
                                             </div>
+                                            @endif
                                         </div>
                                         </div>
                                     </td>
                                     </td>
                                 </tr>
                                 </tr>

+ 56 - 41
resources/views/app/patient/partials/programs.blade.php

@@ -7,12 +7,11 @@
             <form url="/api/clientProgram/create">
             <form url="/api/clientProgram/create">
                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                 <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                 <div class="mb-2">
                 <div class="mb-2">
-                    <select class="form-control form-control-sm bg-light" name="programType" required>
+                    <select class="form-control form-control-sm" name="programUid" required>
                         <option value="">-- select --</option>
                         <option value="">-- select --</option>
-                        <option value="BP_ACTIVITY">Blood Pressure / Exercise</option>
-                        <option value="WEIGHT">Weight Management</option>
-                        <option value="BLOOD_GLUCOSE">Blood Glucose</option>
-                        {{--<option value="MENTAL_HEALTH">Mental Health</option>--}}
+                        @foreach($programs as $program)
+                            <option value="{{$program->uid}}">{{$program->title}}</option>
+                        @endforeach
                     </select>
                     </select>
                 </div>
                 </div>
                 <div class="d-flex align-items-center">
                 <div class="d-flex align-items-center">
@@ -25,23 +24,39 @@
     <table class="table table-bordered table-sm table-striped m-0">
     <table class="table table-bordered table-sm table-striped m-0">
         <tbody>
         <tbody>
         <?php $programNumber = 1; ?>
         <?php $programNumber = 1; ?>
-        @foreach($patient->programs as $program)
+        @foreach($patient->clientPrograms as $clientProgram)
+            <?php $program = $clientProgram->program; ?>
             <tr>
             <tr>
                 <td class="text-black p-2">
                 <td class="text-black p-2">
-                    <div class="font-weight-bold">{{ $programNumber }}. {{ $program->program_type }}</div>
+                    <div class="d-flex align-items-center">
+                        <div moe relative class="mr-2">
+                            <a class="on-hover-opaque" start show title="Delete">
+                                <i class="font-size-11 fa fa-trash-alt text-danger"></i>
+                            </a>
+                            <form url="/api/clientProgram/deactivate">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
+                                <p class="small min-width-200px">Are you sure you want to deactivate this client program?</p>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-danger mr-2" submit>Deactivate</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                        <span class="font-weight-bold">{{ $program->title }}</span>
+                    </div>
                     <?php $programNumber++; ?>
                     <?php $programNumber++; ?>
                     <div class="mt-1 pl-3 d-flex align-items-center flex-wrap">
                     <div class="mt-1 pl-3 d-flex align-items-center flex-wrap">
-                        <span class="pr-1">MCP: <b class="text-secondary">{{ $program->mcp ? $program->mcp->displayName() : '' }}</b></span>
+                        <span class="pr-1">MCP: <b class="text-secondary">{{ $clientProgram->mcp ? $clientProgram->mcp->displayName() : '' }}</b></span>
                         <span moe>
                         <span moe>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <form url="/api/clientProgram/changeMcp">
                             <form url="/api/clientProgram/changeMcp">
-                                <input type="hidden" name="uid" value="{{ $program->uid }}">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">MCP</label>
                                     <label class="text-sm mb-1 text-secondary">MCP</label>
                                     <select class="form-control form-control-sm bg-light" name="newMcpProUid" required>
                                     <select class="form-control form-control-sm bg-light" name="newMcpProUid" required>
                                         <option value="">-- select --</option>
                                         <option value="">-- select --</option>
                                         @foreach($pros as $iPro)
                                         @foreach($pros as $iPro)
-                                            <option value="{{$iPro->uid}}" {{ $program->mcp_pro_id === $iPro->id ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                            <option value="{{$iPro->uid}}" {{ $clientProgram->mcp_pro_id === $iPro->id ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
                                         @endforeach
                                         @endforeach
                                     </select>
                                     </select>
                                 </div>
                                 </div>
@@ -58,17 +73,17 @@
                             </form>
                             </form>
                         </span>
                         </span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
-                        <span class="pr-1">Manager: <b class="text-secondary">{{ $program->manager ? $program->manager->displayName() : '' }}</b></span>
+                        <span class="pr-1">Manager: <b class="text-secondary">{{ $clientProgram->manager ? $clientProgram->manager->displayName() : '' }}</b></span>
                         <span moe>
                         <span moe>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <form url="/api/clientProgram/changeManager">
                             <form url="/api/clientProgram/changeManager">
-                                <input type="hidden" name="uid" value="{{ $program->uid }}">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Manager</label>
                                     <label class="text-sm mb-1 text-secondary">Manager</label>
                                     <select class="form-control form-control-sm bg-light" name="newManagerProUid" required>
                                     <select class="form-control form-control-sm bg-light" name="newManagerProUid" required>
                                         <option value="">-- select --</option>
                                         <option value="">-- select --</option>
                                         @foreach($pros as $iPro)
                                         @foreach($pros as $iPro)
-                                            <option value="{{$iPro->uid}}" {{ $program->manager_pro_id === $iPro->id ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                                            <option value="{{$iPro->uid}}" {{ $clientProgram->manager_pro_id === $iPro->id ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
                                         @endforeach
                                         @endforeach
                                     </select>
                                     </select>
                                 </div>
                                 </div>
@@ -85,23 +100,23 @@
                             </form>
                             </form>
                         </span>
                         </span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
-                        <span class="pr-1">OB Visit: <b class="text-secondary">{{ $program->has_mcp_done_onboarding_visit }}</b></span>
+                        <span class="pr-1">OB Visit: <b class="text-secondary">{{ $clientProgram->has_mcp_done_onboarding_visit }}</b></span>
                         <span moe>
                         <span moe>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <form url="/api/clientProgram/editMcpOnboardingVisitInfo">
                             <form url="/api/clientProgram/editMcpOnboardingVisitInfo">
-                                <input type="hidden" name="uid" value="{{ $program->uid }}">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">OB Visit Done?</label>
                                     <label class="text-sm mb-1 text-secondary">OB Visit Done?</label>
                                     <select class="form-control form-control-sm bg-light" name="hasMcpDoneOnboardingVisit" required>
                                     <select class="form-control form-control-sm bg-light" name="hasMcpDoneOnboardingVisit" required>
                                         <option value="">-- select --</option>
                                         <option value="">-- select --</option>
-                                        <option value="YES" {{ $program->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>Yes</option>
-                                        <option value="NO" {{ $program->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>No</option>
-                                        <option value="UNKNOWN" {{ $program->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>Unknown</option>
+                                        <option value="YES" {{ $clientProgram->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>Yes</option>
+                                        <option value="NO" {{ $clientProgram->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>No</option>
+                                        <option value="UNKNOWN" {{ $clientProgram->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>Unknown</option>
                                     </select>
                                     </select>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Date</label>
                                     <label class="text-sm mb-1 text-secondary">Date</label>
-                                    <input type="date" class="form-control form-control-sm" name="mcpOnboardingVisitDate" value="{{ $program->mcp_onboarding_visit_date }}" placeholder="">
+                                    <input type="date" class="form-control form-control-sm" name="mcpOnboardingVisitDate" value="{{ $clientProgram->mcp_onboarding_visit_date }}" placeholder="">
                                 </div>
                                 </div>
                                 <div class="d-flex align-items-center">
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" submit>Ok</button>
                                     <button class="btn btn-sm btn-primary mr-2" submit>Ok</button>
@@ -111,31 +126,31 @@
                         </span>
                         </span>
                     </div>
                     </div>
                     <div class="mt-1 pl-3 d-flex align-items-center flex-wrap">
                     <div class="mt-1 pl-3 d-flex align-items-center flex-wrap">
-                        <span class="pr-1">Setup: <b class="text-secondary">{{ $program->is_setup_complete }}</b></span>
+                        <span class="pr-1">Setup: <b class="text-secondary">{{ $clientProgram->is_setup_complete }}</b></span>
                         <span moe>
                         <span moe>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <form url="/api/clientProgram/editSetupInfo">
                             <form url="/api/clientProgram/editSetupInfo">
-                                <input type="hidden" name="uid" value="{{ $program->uid }}">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Setup Status</label>
                                     <label class="text-sm mb-1 text-secondary">Setup Status</label>
                                     <select class="form-control form-control-sm bg-light" name="isSetupComplete" required>
                                     <select class="form-control form-control-sm bg-light" name="isSetupComplete" required>
                                         <option value="">-- select --</option>
                                         <option value="">-- select --</option>
-                                        <option value="YES" {{ $program->is_setup_complete === 'YES' ? 'selected' : '' }}>Yes</option>
-                                        <option value="NO" {{ $program->is_setup_complete === 'NO' ? 'selected' : '' }}>No</option>
-                                        <option value="UNKNOWN" {{ $program->is_setup_complete === 'UNKNOWN' ? 'selected' : '' }}>Unknown</option>
+                                        <option value="YES" {{ $clientProgram->is_setup_complete === 'YES' ? 'selected' : '' }}>Yes</option>
+                                        <option value="NO" {{ $clientProgram->is_setup_complete === 'NO' ? 'selected' : '' }}>No</option>
+                                        <option value="UNKNOWN" {{ $clientProgram->is_setup_complete === 'UNKNOWN' ? 'selected' : '' }}>Unknown</option>
                                     </select>
                                     </select>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Setup Status Memo</label>
                                     <label class="text-sm mb-1 text-secondary">Setup Status Memo</label>
-                                    <textarea class="form-control form-control-sm" rows="2" name="setupStatusMemo" value="{{ $program->setup_status_memo }}" placeholder="Memo"></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" name="setupStatusMemo" value="{{ $clientProgram->setup_status_memo }}" placeholder="Memo"></textarea>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Setup Detail</label>
                                     <label class="text-sm mb-1 text-secondary">Setup Detail</label>
-                                    <textarea class="form-control form-control-sm" rows="2" name="setupDetail" value="{{ $program->setup_detail }}" placeholder="Detail"></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" name="setupDetail" value="{{ $clientProgram->setup_detail }}" placeholder="Detail"></textarea>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Device Identifier</label>
                                     <label class="text-sm mb-1 text-secondary">Device Identifier</label>
-                                    <input type="text" class="form-control form-control-sm" name="deviceIdentifier" value="{{ $program->device_identifier }}" placeholder="History">
+                                    <input type="text" class="form-control form-control-sm" name="deviceIdentifier" value="{{ $clientProgram->device_identifier }}" placeholder="History">
                                 </div>
                                 </div>
                                 <div class="d-flex align-items-center">
                                 <div class="d-flex align-items-center">
                                     <button class="btn btn-sm btn-primary mr-2" submit>Ok</button>
                                     <button class="btn btn-sm btn-primary mr-2" submit>Ok</button>
@@ -144,30 +159,30 @@
                             </form>
                             </form>
                         </span>
                         </span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
                         <span class="mx-2 text-secondary on-hover-opaque">|</span>
-                        <span class="pr-1">Work Spec: <b class="text-secondary">{{ $program->min_monthly_time_in_minutes }}m - {{ $program->max_monthly_time_in_minutes }}m</b></span>
+                        <span class="pr-1">Work Spec: <b class="text-secondary">{{ $clientProgram->min_monthly_time_in_minutes }}m - {{ $clientProgram->max_monthly_time_in_minutes }}m</b></span>
                         <span moe>
                         <span moe>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <a start show class="py-0 font-weight-normal"><i class="fa fa-pencil-alt"></i></a>
                             <form url="/api/clientProgram/editWorkSpec">
                             <form url="/api/clientProgram/editWorkSpec">
-                                <input type="hidden" name="uid" value="{{ $program->uid }}">
+                                <input type="hidden" name="uid" value="{{ $clientProgram->uid }}">
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Min Monthly Time (minutes)</label>
                                     <label class="text-sm mb-1 text-secondary">Min Monthly Time (minutes)</label>
-                                    <input type="number" class="form-control form-control-sm" name="minMonthlyTimeInMinutes" value="{{ $program->min_monthly_time_in_minutes }}" placeholder="">
+                                    <input type="number" class="form-control form-control-sm" name="minMonthlyTimeInMinutes" value="{{ $clientProgram->min_monthly_time_in_minutes }}" placeholder="">
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Max Monthly Time (minutes)</label>
                                     <label class="text-sm mb-1 text-secondary">Max Monthly Time (minutes)</label>
-                                    <input type="number" class="form-control form-control-sm" name="maxMonthlyTimeInMinutes" value="{{ $program->max_monthly_time_in_minutes }}" placeholder="">
+                                    <input type="number" class="form-control form-control-sm" name="maxMonthlyTimeInMinutes" value="{{ $clientProgram->max_monthly_time_in_minutes }}" placeholder="">
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Time In Minutes Memo</label>
                                     <label class="text-sm mb-1 text-secondary">Time In Minutes Memo</label>
-                                    <textarea class="form-control form-control-sm" rows="2" name="timeInMinutesMemo" value="{{ $program->time_in_minutes_memo }}" placeholder=""></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" name="timeInMinutesMemo" value="{{ $clientProgram->time_in_minutes_memo }}" placeholder=""></textarea>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Goal</label>
                                     <label class="text-sm mb-1 text-secondary">Goal</label>
-                                    <textarea class="form-control form-control-sm" rows="2" name="goal" value="{{ $program->goal }}" placeholder=""></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" name="goal" value="{{ $clientProgram->goal }}" placeholder=""></textarea>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="text-sm mb-1 text-secondary">Sticky Note</label>
                                     <label class="text-sm mb-1 text-secondary">Sticky Note</label>
-                                    <textarea class="form-control form-control-sm" rows="2" name="stickyNote" value="{{ $program->sticky_note }}" placeholder=""></textarea>
+                                    <textarea class="form-control form-control-sm" rows="2" name="stickyNote" value="{{ $clientProgram->sticky_note }}" placeholder=""></textarea>
                                 </div>
                                 </div>
                                 <div class="mb-2">
                                 <div class="mb-2">
                                     <label class="mb-1 text-secondary d-flex align-items-center">
                                     <label class="mb-1 text-secondary d-flex align-items-center">
@@ -185,14 +200,14 @@
                 </td>
                 </td>
             </tr>
             </tr>
         @endforeach
         @endforeach
-        @if(!$patient->programs || count($patient->programs) === 0)
-            <tr>
-                <td class="text-secondary p-0 border-0">
-                    No programs
-                </td>
-            </tr>
-        @endif
         </tbody>
         </tbody>
     </table>
     </table>
+    @if(!$patient->clientPrograms || count($patient->clientPrograms) === 0)
+        <div class="p-2 border-top">
+            <span class="text-secondary">
+                No programs
+            </span>
+        </div>
+    @endif
 </div>
 </div>