Quellcode durchsuchen

Sort header UI tweaks

Vijayakrishnan vor 3 Jahren
Ursprung
Commit
714ad52953

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

@@ -7,13 +7,13 @@
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'DOB', 'key' => 'dob'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Age', 'key' => 'age_in_years'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Sex', 'key' => 'sex'])</th>
-				<th class="border-0">Insurance</th>
+				<th class="border-0 text-secondary">Insurance</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Last Visit', 'key' => 'most_recent_completed_mcp_note_date'])</th>
-				<th class="border-0">Next Appt.</th>
-				<th class="border-0">Status</th>
+				<th class="border-0 text-secondary">Next Appt.</th>
+				<th class="border-0 text-secondary">Status</th>
 
-				<th class="border-0">BP</th>
-				<th class="border-0"> <i class="fa fa-heartbeat"></i> @include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => '', 'key' => 'most_recent_cellular_bp_value_irregular'])</th>
+				<th class="border-0 text-secondary">BP</th>
+				<th class="border-0 text-nowrap">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => '<i class="fa fa-heartbeat text-secondary"></i>', 'key' => 'most_recent_cellular_bp_value_irregular'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Pulse', 'key' => 'most_recent_cellular_bp_value_pulse'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'BP/Pulse Timestamp', 'key' => 'most_recent_cellular_bp_measurement_at'])</th>
 				<th class="border-0">@include('app.practice-management._sort_header', ['route' => route("mcp.patients"), 'label' => 'Weight', 'key' => 'most_recent_cellular_weight_value'])</th>
@@ -23,11 +23,11 @@
 				{{-- <th class="border-0">RPM</th>--}}
 				{{-- <th class="border-0 d-none">Last Weight-In</th>--}}
 				{{-- <th class="border-0 d-none">Last BP</th>--}}
-				<th class="border-0">Assigned On</th>
+				<th class="border-0 text-secondary">Assigned On</th>
 
 				@if($pro->pro_type == 'ADMIN')
-				<th class="border-0">MCP</th>
-				<th class="border-0">Initiative</th>
+				<th class="border-0 text-secondary">MCP</th>
+				<th class="border-0 text-secondary">Initiative</th>
 				@endif
 			</tr>
 		</thead>

+ 10 - 3
resources/views/app/practice-management/_sort_header.blade.php

@@ -1,9 +1,16 @@
 <div class="d-flex align-items-end flex-wrap">
     <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'sort_dir'])}}&sort_by={{$key}}&sort_dir={{request()->input('sort_by') === $key && request()->input('sort_dir') === 'ASC' ? 'DESC' : 'ASC'}}" class="text-decoration-none">
         <b class="{{request()->input('sort_by') === $key ? 'text-primary' : 'text-secondary'}}">{!! $label !!}</b>
-        <span class="ml-1 d-inline-flex align-items-baseline">
-            <i class="text-sm fa fa-chevron-up {{request()->input('sort_by') === $key && request()->input('sort_dir') === 'DESC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
-            <i class="ml-1 text-sm fa fa-chevron-down {{request()->input('sort_by') === $key && request()->input('sort_dir') === 'ASC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
+        <span class="d-inline-flex align-items-baseline">
+            @if(request()->input('sort_by') !== $key)
+                <i class="ml-1 text-sm fa fa-chevron-down on-hover-opaque text-secondary"></i>
+            @else
+                @if(request()->input('sort_dir') === 'DESC')
+                    <i class="ml-1 text-sm fa fa-chevron-up"></i>
+                @else
+                    <i class="ml-1 text-sm fa fa-chevron-down"></i>
+                @endif
+            @endif
         </span>
     </a>
     @if(request()->input('sort_by') === $key)