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

app/Helpers/helpers.php

@@ -28,13 +28,42 @@ if(!function_exists('friendly_date_time')) {
     }
 }
 
-if(!function_exists('time_in_minsec')) {
-    function time_in_minsec($value, $default = '0s') {
+if(!function_exists('friendly_month')) {
+    function friendly_month($value) {
+        if(!$value || empty($value)) return "-";
+        try {
+            $result = strtotime($value);
+            $result = date("M o", $result);
+            return $result;
+        }
+        catch (Exception $e) {
+            return $value;
+        }
+    }
+}
+
+if(!function_exists('time_in_hrminsec')) {
+    function time_in_hrminsec($value, $default = '-') {
         if(!$value || empty($value)) return $default;
         $value = intval($value);
         $minutes = intval($value / 60);
         $seconds = $value % 60;
-        return "{$minutes}m, {$seconds}s";
+        $hours = 0;
+        if($minutes >= 60) {
+            $hours = intval($minutes / 60);
+            $minutes = $minutes % 60;
+        }
+        $output = [];
+        if($hours > 0) {
+            $output[] = "{$hours}h";
+        }
+        if($minutes > 0) {
+            $output[] = "{$minutes}m";
+        }
+        if($seconds > 0) {
+            $output[] = "{$seconds}s";
+        }
+        return implode(" ", $output);
     }
 }
 

app/Http/Controllers/PatientController.php

@@ -110,7 +110,7 @@ class PatientController extends Controller
 
     public function careMonths(Request $request, Client $patient )
     {
-        $careMonths = CareMonth::where('client_id', $patient->id)->get();
+        $careMonths = CareMonth::where('client_id', $patient->id)->orderBy('start_date', 'desc')->get();
         return view('app.patient.care-months', compact('patient', 'careMonths'));
     }
 }

public/css/style.css

@@ -100,7 +100,7 @@ hr.m-negator {
     text-decoration: underline;
 }
 .mcp-theme-1 .on-hover-opaque {
-    opacity: 0.5;
+    opacity: 0.6;
 }
 .mcp-theme-1 .on-hover-opaque:hover {
     opacity: 1;
@@ -119,3 +119,13 @@ hr.m-negator {
 .mcp-theme-1 .nav-link:hover {
     background: #e3e3e394;
 }
+.mcp-theme-1 .text-sm {
+    font-size: 85%;
+}
+.mcp-theme-1 .text-sm-incl-children,
+.mcp-theme-1 .text-sm-incl-children *:not(i) {
+    font-size: 0.8rem;
+}
+.mcp-theme-1 .minutes-label {
+    width: 40px;
+}

public/css/z.css

@@ -1,10 +1,11 @@
 .z {
     font-size: 0.81em;
-} .z button {
+} .z button:not(.btn) {
     background: #efefef;
     border: 1px solid #767676;
     font-size: 0.9em;
-    width: 64px;
+    min-width: 92px;
+    white-space: nowrap;
 } .z form input {
     display: block;
     margin-bottom: 3px;
@@ -62,4 +63,4 @@
     width: var(--size);
 } .z .thumbnail.online {
     --shadow-color: #50a746;
-}
+}

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

@@ -1,40 +1,65 @@
+<?php
+/** @var App\Models\CareMonth $careMonth */
+?>
 @extends ('layouts.patient')
 
 @section('inner-content')
     <div class="">
-        <div class="pt-2">
+        <div class="pt-2 d-flex align-items-start">
             <h6 class="my-0 text-secondary d-flex align-items-center">
                 <a href="/patients/view/{{ $patient->uid }}/care-months" class="small text-decoration-none mr-3">
                     <i class="fa fa-chevron-left"></i>
                 </a>
-                <span class="text-dark font-weight-bold">Care Month</span>&nbsp;starting&nbsp;<span class="text-dark font-weight-bold">{{ friendly_date_time($careMonth->start_date, false) }}</span>
-                <span class="d-inline-flex align-items-center ml-auto">
-                    <span class="mr-3">
-                        CM <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->cm_total_time_in_seconds_by_cm_pro, '0s')}}</span>
-                    </span>
-                    <span class="mr-3">
-                        MCP <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->cm_total_time_in_seconds_by_mcp, '0s')}}</span>
-                    </span>
-                    <span class="">
-                        Total <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->cm_total_time_in_seconds, '0s')}}</span>
-                    </span>
-                </span>
-                <span class="mx-4 text-secondary">|</span>
-                <span class="d-inline-flex align-items-center">
-                    <span class="mr-3">
-                        RMM <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->rm_total_time_in_seconds_by_rmm_pro, '0s')}}</span>
-                    </span>
-                    <span class="mr-3">
-                        RME <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->rm_total_time_in_seconds_by_rme_pro, '0s')}}</span>
-                    </span>
-                    <span class="mr-3">
-                        MCP <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->rm_total_time_in_seconds_by_mcp, '0s')}}</span>
-                    </span>
-                    <span class="">
-                        Total <span class="font-weight-bold text-dark">{{time_in_minsec($careMonth->rm_total_time_in_seconds, '0s')}}</span>
-                    </span>
-                </span>
+                <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>
             </h6>
+            <div class="d-flex align-items-start ml-auto text-secondary">
+                <div class="d-inline-flex align-items-start">
+                    <div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">CM</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_cm_pro)}}
+                            </span>
+                        </div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">MCP</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->cm_total_time_in_seconds_by_mcp)}}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="ml-3 text-sm-incl-children">
+                        <div class="">CM Total</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
+                    </div>
+                </div>
+                <div class="d-inline-flex align-items-start border-left pl-3 ml-3">
+                    <div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">RMM</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rmm_pro)}}
+                            </span>
+                        </div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">RME</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_rme_pro)}}
+                            </span>
+                        </div>
+                        <div class="mr-3 text-sm-incl-children">
+                            <span class="d-inline-block minutes-label">MCP</span>
+                            <span class="font-weight-bold text-dark text-nowrap">
+                                {{time_in_hrminsec($careMonth->rm_total_time_in_seconds_by_mcp)}}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="ml-3 text-sm-incl-children">
+                        <div class="">RM Total</div>
+                        <div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->rm_total_time_in_seconds)}}</div>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <hr class="m-negator">
@@ -106,17 +131,18 @@
                     </thead>
                     <tbody>
                     @foreach($entries as $entry)
-                        @if($entry->cm_or_rm === "CM")
+                        @if(!$entry->is_removed && $entry->cm_or_rm === "CM")
                         <tr>
                             <td class="px-2">
-                                <div class="font-weight-bold">{{friendly_date_time($entry->created_at)}}</div>
-                                <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
+                                <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
                             </td>
                             <td class="px-2">
-                                {{time_in_minsec($entry->time_in_seconds)}}
+                                {{time_in_hrminsec($entry->time_in_seconds)}}
                             </td>
                             <td class="px-2">
-                                {{$entry->content_text}}
+                                <div>{{$entry->content_text}}</div>
+                                <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
                             </td>
                             <td class="px-2 text-center delete-column">
                                 <div moe relative>
@@ -199,17 +225,18 @@
                     </thead>
                     <tbody>
                     @foreach($entries as $entry)
-                        @if($entry->cm_or_rm === "RM")
+                        @if(!$entry->is_removed && $entry->cm_or_rm === "RM")
                             <tr>
                                 <td class="px-2">
-                                    <div class="font-weight-bold">{{friendly_date_time($entry->created_at)}}</div>
-                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
+                                    <div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</div>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
                                 </td>
                                 <td class="px-2">
-                                    {{time_in_minsec($entry->time_in_seconds)}}
+                                    {{time_in_hrminsec($entry->time_in_seconds)}}
                                 </td>
                                 <td class="px-2">
-                                    {{$entry->content_text}}
+                                    <div>{{$entry->content_text}}</div>
+                                    <div class="text-secondary text-sm">{{$entry->content_detail}}</div>
                                 </td>
                                 <td class="px-2 text-center delete-column">
                                     <div moe relative>
@@ -237,26 +264,36 @@
         <?php
         $cmBills = $careMonth->getBillsOfType('CM');
         $activeCMBill = false;
+        $cancelledCMBills = new \Illuminate\Support\Collection();
         foreach ($cmBills as $cmBill) {
             if(!$cmBill->is_cancelled && $careMonth->cm_bill_id === $cmBill->id) {
                 $activeCMBill = $cmBill;
                 break;
             }
+            else if($cmBill->is_cancelled) {
+                $cancelledCMBills->add($cmBill);
+            }
         }
         ?>
 
         <?php
         $rmBills = $careMonth->getBillsOfType('RM');
         $activeRMBill = false;
+        $cancelledRMBills = new \Illuminate\Support\Collection();
         foreach ($rmBills as $rmBill) {
             if(!$rmBill->is_cancelled && $careMonth->rm_bill_id === $rmBill->id) {
                 $activeRMBill = $rmBill;
                 break;
             }
+            else if($rmBill->is_cancelled) {
+                $cancelledRMBills->add($rmBill);
+            }
         }
         ?>
 
         <div class="row">
+
+            {{-- active cm bill --}}
             <div class="col-6">
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">CM Bill
@@ -318,10 +355,10 @@
                     @endif
                 </div>
                 @if($activeCMBill !== false)
-                    <div class="border bg-light p-2 mt-2">
+                    <div class="border bg-white p-2 mt-2">
                         <div class="">
                             Code: <span class="font-weight-bold text-dark">{{ $activeCMBill->code }}</span>
-                            <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
+                            <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
                         </div>
                         <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
                         @if(1) {{-- check if auther user is hcp pro --}}
@@ -349,6 +386,8 @@
                     </div>
                 @endif
             </div>
+
+            {{-- active rm bill --}}
             <div class="col-6">
                 <div class="d-flex align-items-center">
                     <h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
@@ -410,10 +449,10 @@
                     @endif
                 </div>
                 @if($activeRMBill !== false)
-                    <div class="border bg-light p-2 mt-2">
+                    <div class="border bg-white p-2 mt-2">
                         <div class="">
                             Code: <span class="font-weight-bold text-dark">{{ $activeRMBill->code }}</span>
-                            <div class="small text-secondary">Created: {{friendly_date_time($entry->effective_date)}}</div>
+                            <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
                         </div>
                         <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
                         @if(1) {{-- check if auther user is hcp pro --}}
@@ -452,6 +491,102 @@
                     </div>
                 @endif
             </div>
+
+        </div>
+
+        <div class="row">
+
+            {{-- cancelled cm bills --}}
+            <div class="col-6">
+                @if(count($cancelledCMBills))
+                    @foreach($cancelledCMBills as $cancelledBill)
+                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                            <div class="d-flex">
+                                <div class="">
+                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                                </div>
+                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                            </div>
+                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
+                            @if(1) {{-- check if auther user is hcp pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_hcp_been_paid)
+                                    <span class="text-dark">Received HCP Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected HCP Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->hcp_expected_payment_amount }}</span>
+                                @endif
+                            </div>
+                            @endif
+                            @if(1) {{-- check if auther user is cm pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_cm_been_paid)
+                                    <span class="text-dark">Received CM Pro Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->cm_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected CM Pro Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->cm_expected_payment_amount }}</span>
+                                @endif
+                            </div>
+                            @endif
+                        </div>
+                    @endforeach
+                @endif
+            </div>
+
+            {{-- cancelled rm bills --}}
+            <div class="col-6">
+                @if(count($cancelledRMBills))
+                    @foreach($cancelledRMBills as $cancelledBill)
+                        <div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
+                            <div class="d-flex">
+                                <div class="">
+                                    Code: <span class="font-weight-bold text-dark">{{ $cancelledBill->code }}</span>
+                                    <div class="small text-secondary">Created: {{friendly_date_time($entry->created_at)}}</div>
+                                </div>
+                                <div class="ml-auto text-secondary font-weight-bold">CANCELLED BILL</div>
+                            </div>
+                            <div class="font-weight-bold text-dark mt-2 mb-1">Transactions</div>
+                            @if(1) {{-- check if auther user is hcp pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_hcp_been_paid)
+                                    <span class="text-dark">Received HCP Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->hcp_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected HCP Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->hcp_expected_payment_amount }}</span>
+                                @endif
+                            </div>
+                            @endif
+                            @if(1) {{-- check if auther user is rmm pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_rmm_been_paid)
+                                    <span class="text-dark">Received RMM Pro Amount: </span>
+                                    <span class="font-weight-bold text-success ml-2">${{ $cancelledBill->rmm_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected RMM Pro Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rmm_expected_payment_amount }}</span>
+                                @endif
+                            </div>
+                            @endif
+                            @if(1) {{-- check if auther user is rme pro --}}
+                            <div class="d-flex align-items-center">
+                                @if($cancelledBill->has_rme_been_paid)
+                                    <span class="text-success">Received RME Pro Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_payment_amount }}</span>
+                                @else
+                                    <span class="text-dark">Expected RME Pro Amount: </span>
+                                    <span class="font-weight-bold text-dark ml-2">${{ $cancelledBill->rme_expected_payment_amount }}</span>
+                                @endif
+                            </div>
+                            @endif
+                        </div>
+                    @endforeach
+                @endif
+            </div>
+
         </div>
 
     </div>

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

@@ -10,12 +10,37 @@
                 <form url="/api/careMonth/create">
                     <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
                     <div class="mb-2">
-                        <input type="number" min="1" max="12" class="form-control form-control-sm" name="startMonth"
-                               value="" placeholder="Start Month">
+                        <select name="startMonth" class="form-control form-control-sm">
+                            <option value="">-- Start Month --</option>
+                            <option value="1">January</option>
+                            <option value="2">February</option>
+                            <option value="3">March</option>
+                            <option value="4">April</option>
+                            <option value="5">May</option>
+                            <option value="6">June</option>
+                            <option value="7">July</option>
+                            <option value="8">August</option>
+                            <option value="9">September</option>
+                            <option value="10">October</option>
+                            <option value="11">November</option>
+                            <option value="12">December</option>
+                        </select>
                     </div>
                     <div class="mb-2">
-                        <input type="number" min="2020" max="2100" class="form-control form-control-sm" name="startYear"
-                               value="" placeholder="Start Year">
+                        <select name="startYear" class="form-control form-control-sm">
+                            <option value="">-- Start Year --</option>
+                            <option value="2020">2020</option>
+                            <option value="2021">2021</option>
+                            <option value="2022">2022</option>
+                            <option value="2023">2023</option>
+                            <option value="2024">2024</option>
+                            <option value="2025">2025</option>
+                            <option value="2026">2026</option>
+                            <option value="2027">2027</option>
+                            <option value="2028">2028</option>
+                            <option value="2029">2029</option>
+                            <option value="2030">2030</option>
+                        </select>
                     </div>
                     <div class="d-flex align-items-center">
                         <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
@@ -31,31 +56,19 @@
                 <th class="px-2 text-secondary border-bottom-0">CM Total Time</th>
                 <th class="px-2 text-secondary border-bottom-0">MCP</th>
                 <th class="px-2 text-secondary border-bottom-0">Created</th>
-                <th class="px-2 text-secondary border-bottom-0 delete-column">&nbsp;</th>
             </tr>
             </thead>
             <tbody>
             @foreach($careMonths as $careMonth)
                 <tr>
                     <td class="px-2">
-                        <a href="/patients/view/{{ $patient->uid }}/care-months/view/{{ $careMonth->uid }}">{{friendly_date_time($careMonth->start_date, false)}}</a>
+                        <a href="/patients/view/{{ $patient->uid }}/care-months/view/{{ $careMonth->uid }}">
+                            {{friendly_month($careMonth->start_date)}}
+                        </a>
                     </td>
-                    <td class="px-2">{{$careMonth->cm_total_time_in_seconds}} seconds</td>
+                    <td class="px-2">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</td>
                     <td class="px-2">{{$careMonth->mcp ? $careMonth->mcp->name_display : '-'}}</td>
                     <td class="px-2">{{friendly_date_time($careMonth->created_at)}}</td>
-                    <td class="px-2 text-center delete-column">
-                        <div moe relative>
-                            <a start show><i class="fa fa-trash text-danger"></i></a>
-                            <form url="/api/careMonth/remove" right>
-                                <input type="hidden" name="uid" value="{{ $careMonth->uid }}">
-                                <p class="small">Are you sure you want to delete this care-month?</p>
-                                <div class="d-flex align-items-center">
-                                    <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    </td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -86,7 +86,10 @@
                             </form>
                         </div>
                         <span class="mx-2 text-secondary">|</span>
-                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
+                        <a start show class="py-0 font-weight-normal"
+                           href="/patients/view/{{ $patient->uid }}/medications">
+                            View All
+                        </a>
                     </div>
                     <table class="table table-sm border-0 m-0">
                         <tbody>
@@ -97,18 +100,22 @@
                                     <?php $itemCount++; ?>
                                     <tr>
                                         <td class="text-black p-0 border-0">
-                                            <span class="font-weight-bold">{{$line->contentText}}</span>
-                                            <span moe relative class="ml-1">
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="font-weight-bold">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -154,7 +161,10 @@
                             </form>
                         </div>
                         <span class="mx-2 text-secondary">|</span>
-                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
+                        <a start show class="py-0 font-weight-normal"
+                           href="/patients/view/{{ $patient->uid }}/dx-and-focus-areas">
+                            View All
+                        </a>
                     </div>
                     <table class="table table-sm border-0 m-0">
                         <tbody>
@@ -165,22 +175,26 @@
                                     <?php $itemCount++; ?>
                                     <tr>
                                         <td class="text-black p-0 border-0">
-                                            <span class="font-weight-bold">{{$line->contentText}}</span>
-                                            /
-                                            <span class="text-secondary">{{ $line->contentDetail->{"Chronic or Acute"} }}</span>
-                                            /
-                                            <span class="text-secondary">ICD: {{ $line->contentDetail->{"ICD"} ? $line->contentDetail->{"ICD"} : '-' }}</span>
-                                            <span moe relative class="ml-1">
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="font-weight-bold">{{$line->contentText}}</span>
+                                                <span class="text-secondary mx-1">/</span>
+                                                <span class="text-secondary">{{ $line->contentDetail->{"Chronic or Acute"} }}</span>
+                                                <span class="text-secondary mx-1">/</span>
+                                                <span class="text-secondary">ICD: {{ $line->contentDetail->{"ICD"} ? $line->contentDetail->{"ICD"} : '-' }}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -221,7 +235,10 @@
                             </form>
                         </div>
                         <span class="mx-2 text-secondary">|</span>
-                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
+                        <a start show class="py-0 font-weight-normal"
+                           href="/patients/view/{{ $patient->uid }}/care-team">
+                            View All
+                        </a>
                     </div>
                     <table class="table table-sm border-0 m-0">
                         <tbody>
@@ -232,22 +249,26 @@
                                     <?php $itemCount++; ?>
                                     <tr>
                                         <td class="text-black p-0 border-0">
-                                            <span class="font-weight-bold">{{$line->contentText}}</span>
-                                            /
-                                            <span class="text-secondary">{{ $line->contentDetail->{"Specialty"} }}</span>
-                                            /
-                                            <span class="text-secondary">Next Apt: {{ $line->contentDetail->{"Next Appointment"} ? $line->contentDetail->{"Next Appointment"} : '-' }}</span>
-                                            <span moe relative class="ml-1">
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="font-weight-bold">{{$line->contentText}}</span>
+                                                <span class="text-secondary mx-1">/</span>
+                                                <span class="text-secondary">{{ $line->contentDetail->{"Specialty"} }}</span>
+                                                <span class="text-secondary mx-1">/</span>
+                                                <span class="text-secondary">Next Apt: {{ $line->contentDetail->{"Next Appointment"} ? $line->contentDetail->{"Next Appointment"} : '-' }}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -270,7 +291,10 @@
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
                         <h6 class="my-0 font-weight-bold text-secondary">History</h6>
                         <span class="mx-2 text-secondary">|</span>
-                        <a start show class="py-0 font-weight-normal" href="#">View All</a>
+                        <a start show class="py-0 font-weight-normal"
+                           href="/patients/view/{{ $patient->uid }}/history">
+                            View All
+                        </a>
                     </div>
                 </div>
 
@@ -299,18 +323,20 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         <td class="pl-4 py-0 border-0">
-                                            {{$line->contentText}}
-                                            <span moe relative class="ml-1">
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash-alt text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -344,18 +370,21 @@
                             @if($category === "history_surgical")
                                 @foreach ($lines as $line)
                                     <tr>
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -390,18 +419,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -436,18 +468,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -482,18 +517,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -528,18 +566,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -574,18 +615,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -620,18 +664,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach
@@ -666,18 +713,21 @@
                                 @foreach ($lines as $line)
                                     <tr>
                                         {{--<td class="px-2">{{$category}}</td>--}}
-                                        <td class="pl-4 py-0 border-0">{{$line->contentText}}
-                                            <span moe relative>
-                                                <a class="on-hover-opaque" start show><i class="font-size-11 fa fa-trash text-danger"></i></a>
-                                                <form url="/api/clientInfoLine/remove" right>
-                                                    <input type="hidden" name="uid" value="{{ $line->uid }}">
-                                                    <p class="small">Are you sure you want to delete this entry?</p>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                                    </div>
-                                                </form>
-                                            </span>
+                                        <td class="pl-4 py-0 border-0">
+                                            <div class="d-flex">
+                                                <span 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/clientInfoLine/remove" right>
+                                                        <input type="hidden" name="uid" value="{{ $line->uid }}">
+                                                        <p class="small">Are you sure you want to delete this entry?</p>
+                                                        <div class="d-flex align-items-center">
+                                                            <button class="btn btn-sm btn-danger mr-2" submit>Delete</button>
+                                                            <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                                <span class="">{{$line->contentText}}</span>
+                                            </div>
                                         </td>
                                     </tr>
                                 @endforeach

resources/views/layouts/patient.blade.php

@@ -160,83 +160,80 @@
                                     <div><label>Next Appt:</label> {{$patient->mcp_onboarding_visit_date}}</div>
                                 </section>
                                 <section class=vbox>
-                                    <div moe>
+                                    <div moe relative>
                                         <a start show>
                                             <!-- <i class="fa fa-plus-circle"></i> -->
                                             <button>+ Note</button>
                                         </a>
-                                        <form url="/api/note/createUsingFreeTextHtml" right>
+                                        <form url="/api/note/createUsingFreeTextHtml" right class="mcp-theme-1">
                                             <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <div>
-                                                <label for="" class="control-label">HCP Pro</label>
-                                                <select name="hcpProUid">
-                                                    <option value="">-- select hcp pro --</option>
+                                            <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->name_display}}</option>
                                                     @endforeach
                                                 </select>
                                             </div>
-                                            <div>
-                                                <label for="">Ally Pro</label>
-                                                <select name="allyProUid">
-                                                    <option value="">-- select ally pro --</option>
+                                            <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->name_display}}</option>
                                                     @endforeach
                                                 </select>
                                             </div>
-                                            <div>
-                                                <label for="" class="control-label text-left">Title</label>
-                                                <input type="text" name="title">
+                                            <div class="mb-2">
+                                                <input type="text" name="title" placeholder="Title" class="form-control form-control-sm">
                                             </div>
-                                            <div>
-                                                <label for="" class="control-label text-left">Effective date</label>
-                                                <input type="date" name="effectiveDateEST">
+                                            <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>
-                                                <label for="" class="control-label text-left">Effective time</label>
-                                                <input type="time" name="effectiveTime">
+                                            <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>
-                                                <label for="" class="control-label text-left">Content</label>
-                                                <textarea name="freeTextHtml" id="" cols="30" rows="10"></textarea>
+                                            <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>Submit</button>
-                                                <button cancel>Cancel</button>
+                                                <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>
                                     <button>Pt. Ed.</button>
                                     <button>Video</button>
-                                    <div moe>
+                                    <div moe relative>
                                         <a start show>
                                             <!-- <i class="fa fa-plus-circle"></i> -->
-                                            <button>+ Next Appointment</button>
+                                            <button>+ Appointment</button>
                                         </a>
-                                        <form url="/api/client/setNextAppointment" right>
+                                        <form url="/api/client/setNextAppointment" right class="mcp-theme-1">
                                             <input type="hidden" name="uid" value="{{$patient->uid}}">
 
-                                            <div>
-                                                <label for="" class="control-label text-left">Date</label>
-                                                <input type="date" name="date">
+                                            <div class="mb-2">
+                                                <label class="text-secondary text-sm">Date</label>
+                                                <input type="date" name="date" class="form-control form-control-sm">
                                             </div>
 
-                                            <div>
-                                                <label for="" class="control-label text-left">Is time specific</label>
-                                                <input type="checkbox" name="isTimeSpecific">
+                                            <div class="my-1 py-1">
+                                                <label class="text-dar d-flex align-items-center">
+                                                    <span>Is time specific</span>
+                                                    <input type="checkbox" name="isTimeSpecific" class="my-0 ml-1">
+                                                </label>
                                             </div>
 
-                                            <div>
-                                                <label for="" class="control-label text-left">Time</label>
-                                                <input type="time" name="time">
+                                            <div class="mb-2">
+                                                <label class="text-secondary text-sm">Time</label>
+                                                <input type="time" name="time" class="form-control form-control-sm">
                                             </div>
                                             <div>
-                                                <button submit>Submit</button>
-                                                <button cancel>Cancel</button>
+                                                <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>

resources/views/layouts/template.blade.php

@@ -59,11 +59,11 @@
                 </li>
             </ul>
             <div class="d-flex align-items-center">
-                <p class="text-white m-0">Hello, <b>{{ $pro->cell_number }}!</b></p>
+                <p class="text-white my-0 mr-3">Hello, <b>{{ $pro->name_first }}!</b></p>
                 <form action="{{ route('logout') }}" method="post" target="_top">
                     @csrf
-                    <button class="btn btn-link text-white">
-                        <i class="fas fa-sign-out-alt"></i> Logout
+                    <button class="btn btn-link text-light">
+                        <i class="fas fa-sign-out-alt"></i> Log Out
                     </button>
                 </form>
             </div>