Browse Source

Updated tables

Samson Mutunga 3 years ago
parent
commit
5728faa93a

+ 1 - 1
resources/views/app/mcp/appointments.blade.php

@@ -30,7 +30,7 @@
                     @foreach($appointments as $appointment)
                     <tr>
                         <td>
-                            <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}" class="font-weight-bold text-nowrap">
+                            <a href="/patients/view/{{$appointment->client->uid}}/calendar/{{$appointment->uid}}">
                                 {{friendlier_date_time($appointment->raw_date . ' ' . $appointment->raw_start_time)}}
                             </a>
                         </td>

+ 12 - 10
resources/views/app/mcp/bills.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Bills
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.bills_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Service</th>
-                        <th class="px-3 border-0">Amount</th>
-                        <th class="px-3 border-0">Is Cancelled</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Service</th>
+                        <th class="border-0">Amount</th>
+                        <th class="border-0">Is Cancelled</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -48,10 +48,12 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $bills->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $bills->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

+ 15 - 14
resources/views/app/mcp/client_messages.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="far fa-comments"></i>
                 Client Messages
@@ -15,16 +15,16 @@
             <div class="p-3">
                 @include('app.mcp.client_messages_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Folder</th>
-                        <th class="px-3 border-0">To</th>
-                        <th class="px-3 border-0">From</th>
-                        <th class="px-3 border-0">Client</th>
-                        <th class="px-3 border-0">Message</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Folder</th>
+                        <th class="border-0">To</th>
+                        <th class="border-0">From</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Message</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -35,7 +35,7 @@
                         <td>{{$clientMessage->to_number}}</td>
                         <td>{{$clientMessage->from_number}}</td>
                         <td>{{ $clientMessage->client->displayName() }}</td>
-                        <td style="width:300px;"><?= nl2br($clientMessage->body) ?></td>                        
+                        <td style="width:300px;"><?= nl2br($clientMessage->body) ?></td>
                         <td>{{ $clientMessage->sms_status }} </td>
                     </tr>
                     @endforeach
@@ -48,10 +48,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $clientMessages->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $clientMessages->appends(request()->input())->links() }}
+    </div>
 </div>
-@endsection
+@endsection

+ 18 - 17
resources/views/app/mcp/clients_bdt_devices.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-weight"></i>
                 Clients BDT Devices
@@ -15,21 +15,21 @@
             <div class="p-3">
                 @include('app.mcp.clients_bdt_devices_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">IMEI</th>
-                        <th class="px-3 border-0">Client</th>
-                        <th class="px-3 border-0">Created</th>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Last Measurement</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">IMEI</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Created</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Last Measurement</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($devices as $device)
                     <tr>
-                        <td class="px-2">
+                        <td>
                             <pre class="m-0">{{ $device->device->imei }}</pre>
                         </td>
                         <td>
@@ -37,9 +37,9 @@
                                 {{$device->client->displayName()}}
                             </a>
                         </td>
-                        <td class="px-2 text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
-                        <td class="px-2">{{ $device->device->category }}</td>
-                        <td class="px-2 d-flex align-items-center">
+                        <td class="text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
+                        <td>{{ $device->device->category }}</td>
+                        <td class="d-flex align-items-center">
                             <?php $lastMeasurement = $device->lastDeviceMeasurement(); ?>
                             @if($lastMeasurement)
                             @if($lastMeasurement->is_cellular_zero)
@@ -60,9 +60,9 @@
                         </td>
                         <td>
                             @if($device->is_active)
-                                <span class="text-success">Active</span>
+                            <span class="text-success">Active</span>
                             @else
-                                <span class="text-danger">Deactivated</span>
+                            <span class="text-danger">Deactivated</span>
                             @endif
                         </td>
                     </tr>
@@ -76,10 +76,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $devices->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $devices->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

+ 34 - 33
resources/views/app/mcp/erx_and_orders.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-prescription"></i>
                 ERx & Orders
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.erx_and_orders_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="border-bottom-0">Category</th>
-                        <th class="px-3 border-0">Content</th>
-                        <th class="px-3 border-0">Status</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Content</th>
+                        <th class="border-0">Status</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -38,33 +38,33 @@
                         <td>
                             <?php $parsed = @$row->clinical_detail_json ? json_decode($row->clinical_detail_json) : false; ?>
                             @if($row->erx_category === 'DRUG')
-                                <?php
-                                $drugs = ($parsed && @$parsed->items) ? $parsed->items : [];
-                                ?>
-                                @foreach($drugs as $drug)
-                                    <div class="d-flex align-items-baseline mb-1">
-                                        <b class="mr-2">{{$drug->medication ?? '-'}}</b>
-                                        <span class="text-secondary mr-1">{{$drug->frequency ?? ''}}</span>
-                                    </div>
-                                @endforeach
+                            <?php
+                            $drugs = ($parsed && @$parsed->items) ? $parsed->items : [];
+                            ?>
+                            @foreach($drugs as $drug)
+                            <div class="d-flex align-items-baseline mb-1">
+                                <b class="mr-2">{{$drug->medication ?? '-'}}</b>
+                                <span class="text-secondary mr-1">{{$drug->frequency ?? ''}}</span>
+                            </div>
+                            @endforeach
                             @elseif($row->erx_category === 'LAB' || $row->erx_category === 'IMAGING')
-                                <?php
-                                $tests = ($parsed && @$parsed->tests) ? $parsed->tests : [];
-                                ?>
-                                @foreach($tests as $test)
-                                    <div class="d-flex align-items-baseline mb-1">
-                                        <b class="mr-2">{{$test ?? '-'}}</b>
-                                    </div>
-                                @endforeach
+                            <?php
+                            $tests = ($parsed && @$parsed->tests) ? $parsed->tests : [];
+                            ?>
+                            @foreach($tests as $test)
+                            <div class="d-flex align-items-baseline mb-1">
+                                <b class="mr-2">{{$test ?? '-'}}</b>
+                            </div>
+                            @endforeach
                             @elseif($row->erx_category === 'REFERRAL')
-                                <b class="mr-2">{{@$parsed->to ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->to ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
                             @elseif($row->erx_category === 'SUPPLY')
-                                <b class="mr-2">{{@$parsed->item ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->quantity ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->item ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->quantity ?? '-'}}</span>
                             @elseif($row->erx_category === 'OTHER')
-                                <b class="mr-2">{{@$parsed->title ?? '-'}}</b>
-                                <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
+                            <b class="mr-2">{{@$parsed->title ?? '-'}}</b>
+                            <span class="text-secondary mr-1">{{@$parsed->memo ?? '-'}}</span>
                             @endif
                         </td>
                         <td>{{ $row->pro_declared_status ?: '-' }}</td>
@@ -79,10 +79,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $erxAndOrders->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $erxAndOrders->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

+ 17 - 15
resources/views/app/mcp/memos.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-notes-medical"></i>
                 Memos
@@ -15,30 +15,30 @@
             <div class="p-3">
                 @include('app.mcp.memos_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0 w-25">Summary</th>
-                        <th class="px-3 border-0">Created</th>
-                        <th class="px-3 border-0 delete-column">&nbsp;</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0 w-25">Summary</th>
+                        <th class="border-0">Created</th>
+                        <th class="border-0 delete-column">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($memos as $memo)
                     <tr>
-                        <td class="px-2">{{ $memo->category }}</td>
+                        <td>{{ $memo->category }}</td>
                         <td>
                             <a target="_blank" native href="{{route('patients.view.dashboard', $memo->client)}}">
                                 {{$memo->client->displayName()}}
                             </a>
                         </td>
-                        <td class="px-2">
+                        <td>
                             <pre class="m-0 break-spaces">{{ $memo->content }}</pre>
                         </td>
-                        <td class="px-2">{{ friendly_date_time($memo->created_at) }}</td>
-                        <td class="px-2 text-center delete-column">
+                        <td>{{ friendly_date_time($memo->created_at) }}</td>
+                        <td class="text-center delete-column">
                             <div moe wide relative class="mr-2">
                                 <a class="on-hover-opaque" start show title="Edit">
                                     <i class="font-size-11 fa fa-edit"></i>
@@ -80,16 +80,18 @@
 
                     @if(count($memos) === 0)
                     <tr>
-                        <td colspan="4">No records found!</td>
+                        <td colspan="5">No records found!</td>
                     </tr>
                     @endif
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $memos->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $memos->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

+ 19 - 17
resources/views/app/mcp/notes.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-notes-medical"></i>
                 Notes
@@ -15,23 +15,23 @@
             <div class="p-3">
                 @include('app.mcp.notes_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Effective Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">New Patient / FU</th>
+                        <th class="border-0">Effective Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">New Patient / FU</th>
 
-                        <th class="px-3 border-0">HCP</th>
+                        <th class="border-0">HCP</th>
 
-                        <th class="px-3 border-0">HCP Signed</th>
-                        <th class="px-3 border-0">&nbsp;</th>
+                        <th class="border-0">HCP Signed</th>
+                        <th class="border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach ($notes as $note)
                     <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
-                        <td class="px-2">
+                        <td>
                             <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">
                                 {{ friendly_date_time($note->effective_dateest, false) }}
                             </a>
@@ -40,22 +40,22 @@
                             @endif
                             <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
                         </td>
-                        <td class="px-2">
+                        <td>
                             {{ $note->client->displayName() }}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {{ $note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na }}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {{$note->hcpPro ? $note->hcpPro->name_display: '-'}}
                         </td>
 
-                        <td class="px-2">
+                        <td>
                             {!! $note->hcpPro && $note->is_signed_by_hcp ? '<b class="text-success">Yes</b>' : 'No' !!}
                         </td>
-                        <td class="px-2">
+                        <td>
                             <div class="position-relative c-pointer text-center stag-tooltip">
                                 <i class="fa fa-info-circle"></i>
                                 <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
@@ -75,10 +75,12 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $notes->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $notes->appends(request()->input())->links() }}
+    </div>
+
 </div>
 @endsection

+ 21 - 20
resources/views/app/mcp/patients-accounts-invites.blade.php

@@ -5,48 +5,48 @@
 <div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-user"></i>
                 Accounts Invites ({{ $accountInvites->total() }})
             </strong>
         </div>
         <div class="card-body p-0">
-        <div class="p-3">
+            <div class="p-3">
                 @include('app.practice-management.patients-accounts-invites-filters')
             </div>
-            <table class="table table-sm table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-2 text-secondary border-bottom-0">Created At</th>
-                        <th class="px-2 text-secondary border-bottom-0">Client</th>
-                        <th class="px-2 text-secondary border-bottom-0">Name</th>
-                        <th class="px-2 text-secondary border-bottom-0">Email</th>
-                        <th class="px-2 text-secondary border-bottom-0">Cell Number</th>
-                        <th class="px-2 text-secondary border-bottom-0">Status</th>
-                        <th class="px-2 text-secondary border-bottom-0">&nbsp;</th>
+                        <th class="border-0">Created At</th>
+                        <th class="border-0">Client</th>
+                        <th class="border-0">Name</th>
+                        <th class="border-0">Email</th>
+                        <th class="border-0">Cell Number</th>
+                        <th class="border-0">Status</th>
+                        <th class="border-0">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach($accountInvites as $accountInvite)
                     <tr>
-                        <td class="px-2">
+                        <td>
                             {{ friendlier_date_time($accountInvite->created_at) }}
                             @if($accountInvite->status === 'CANCELLED')
                             <span class="text-sm text-secondary">(CANCELLED)</span>
                             @endif
                         </td>
-                        <td class="px-2">{{ $accountInvite->client->displayName() }}</td>
-                        <td class="px-2">{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
+                        <td>{{ $accountInvite->client->displayName() }}</td>
+                        <td>{{ $accountInvite->first_name }} {{ $accountInvite->last_name }}</pre>
                         </td>
-                        <td class="px-2">{{ $accountInvite->to_email_address }}</td>
-                        <td class="px-2">{{ $accountInvite->cell_number }}</td>
-                        <td class="px-2">{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
+                        <td>{{ $accountInvite->to_email_address }}</td>
+                        <td>{{ $accountInvite->cell_number }}</td>
+                        <td>{{ $accountInvite->status }} <span class="text-sm text-secondary">(Updated: {{friendlier_date_time($accountInvite->status_updated_at)}})</span>
                             @if($accountInvite->status_memo)
                             <div class="py-1 font-italic text-secondary text-sm">{{$accountInvite->status_memo}}</div>
                             @endif
                         </td>
-                        <td class="px-2">
+                        <td>
                             <div class="d-flex">
                                 @if($accountInvite->status === 'PENDING')
                                 <span moe class="ml-1" relative>
@@ -80,11 +80,12 @@
                     @endforeach
                 </tbody>
             </table>
-            <div class="ml-2 mt-2">
-                {{ $accountInvites->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $accountInvites->appends(request()->input())->links() }}
+    </div>
 </div>
 
 @endsection

+ 1 - 1
resources/views/app/mcp/patients-table.blade.php

@@ -6,7 +6,7 @@
 </style>
 
 <div class="table-responsive">
-	<table class="table table-striped p-0 m-0 table-sm table-bordered text-nowrap">
+	<table class="table table-striped p-0 m-0 table-sm border-top text-nowrap">
 		<thead class="bg-light">
 			<tr>
 				<th class="border-0">#</th>

+ 11 - 10
resources/views/app/mcp/reports.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Reports Pending Signature
@@ -15,14 +15,14 @@
             <div class="p-3">
                 @include('app.mcp.reports_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Title</th>
-                        <th class="px-3 border-0">Category</th>
-                        <th class="px-3 border-0">Report Date</th>
-                        <th class="px-3 border-0">Sign</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Title</th>
+                        <th class="border-0">Category</th>
+                        <th class="border-0">Report Date</th>
+                        <th class="border-0">Sign</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -63,10 +63,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $reports->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $reports->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

+ 12 - 11
resources/views/app/mcp/supply_orders.blade.php

@@ -4,7 +4,7 @@
 <div class="p-3 mcp-theme-1" id="patients-list">
     <div class="card">
 
-        <div class="card-header px-3 py-2 d-flex align-items-center">
+        <div class="card-header px-2 py-1 d-flex align-items-center">
             <strong class="mr-4">
                 <i class="fas fa-file-invoice-dollar"></i>
                 Supply Orders
@@ -15,15 +15,15 @@
             <div class="p-3">
                 @include('app.mcp.supply_orders_filters')
             </div>
-            <table class="table table-condensed p-0 m-0">
+            <table class="table table-sm table-striped border-top p-0 m-0">
                 <thead class="bg-light">
                     <tr>
-                        <th class="px-3 border-0">Date</th>
-                        <th class="px-3 border-0">Patient</th>
-                        <th class="px-3 border-0">Product</th>
-                        <th class="px-3 border-0">Reason</th>
-                        <th class="px-3 border-0">Is Cancelled</th>
-                        <th class="px-3 border-0">Shipment</th>
+                        <th class="border-0">Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">Product</th>
+                        <th class="border-0">Reason</th>
+                        <th class="border-0">Is Cancelled</th>
+                        <th class="border-0">Shipment</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -61,10 +61,11 @@
                 </tbody>
 
             </table>
-            <div class="ml-2 mt-2">
-                {{ $supplyOrders->appends(request()->input())->links() }}
-            </div>
+
         </div>
     </div>
+    <div class="mt-3">
+        {{ $supplyOrders->appends(request()->input())->links() }}
+    </div>
 </div>
 @endsection

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

@@ -96,7 +96,7 @@
                                 <td>
                                     @if($transaction->client)
                                     <a href="/patients/view/{{ $transaction->client->uid }}">
-                                        <b>{{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}</b>
+                                        {{ implode(", ", [$transaction->client->name_last, $transaction->client->name_first]) }}
                                     </a>
                                     @else
                                         -