Resolvedconflict

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

@@ -1,33 +1,5 @@
-<style>
-	td,
-	th {
-		text-align: center !important;
-	}
-</style>
-
-<<<<<<< HEAD
-<table class="table table-condensed p-0 m-0 table-sm table-bordered">
-	<thead class="bg-light">
-		<tr>
-			<th class="px-3 border-0x">#</th>
-			<th class="px-3 border-0x">Name</th>
-			<th class="px-3 border-0x">DOB</th>
-			<th class="px-3 border-0x">Age</th>
-			<th class="px-3 border-0x">Sex</th>
-			<th class="px-3 border-0x">Insurance</th>
-			<th class="px-3 border-0x">Last Visit</th>
-			<th class="px-3 border-0x">Next Appt.</th>
-			<th class="px-3 border-0x">Status</th>
-
-            <th class="px-3 border-0x">BP</th>
-            <th class="px-3 border-0x"> <i class="fa fa-heartbeat"></i> </th>
-            <th class="px-3 border-0x">Pulse</th>
-            <th class="px-3 border-0x d-none">BP/Pulse Timestamp</th>
-            <th class="px-3 border-0x">Weight</th>
-            <th class="px-3 border-0x d-none">Weight Timestamp</th>
-=======
 <div class="table-responsive">
-	<table class="table table-striped p-0 m-0 table-sm border-top text-nowrap">
+	<table class="table table-striped p-0 m-0 table-sm border-top border-bottom text-nowrap">
 		<thead class="bg-light">
 			<tr>
 				<th class="border-0">#</th>
@@ -47,7 +19,6 @@
 				<th class="border-0">BP/Pulse Timestamp</th>
 				<th class="border-0">Weight</th>
 				<th class="border-0">Weight Timestamp</th>
->>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
 				{{-- <th>Scale <i class="fa fa-battery"></i></th>--}}
 				{{-- <th class="border-0">RPM</th>--}}
@@ -56,28 +27,6 @@
 				{{-- <th class="border-0 d-none">Last BP</th>--}}
 				<th class="border-0">Assigned On</th>
 
-<<<<<<< HEAD
-        @if($pro->pro_type == 'ADMIN')
-                <th class="px-3 border-0x">MCP</th>
-            @endif
-		</tr>
-	</thead>
-	<tbody>
-		@foreach($patients as $patient)
-		<tr>
-			<td class="px-3 text-nowrap">
-				<a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
-					{{$patient->chart_number}}
-				</a>
-			</td>
-			<td class="text-nowrap">{{$patient->displayName()}}</td>
-			<td class="text-nowrap">{{ friendly_date_time($patient->dob, false) }}</td>
-			<td class="text-nowrap">{{ $patient->age_in_years ?  $patient->age_in_years : '-' }}</td>
-			<td class="text-nowrap">{{ $patient->sex }}</td>
-			<td class="d-none text-nowrap">
-				<div class="d-none d-dflex flex-column">
-					@if($patient->usual_bmi_min && $patient->usual_bmi_max)
-=======
 				@if($pro->pro_type == 'ADMIN')
 				<th class="border-0">MCP</th>
 				@endif
@@ -98,7 +47,6 @@
 				<td>
 					<div class="d-none d-dflex flex-column">
 						@if($patient->usual_bmi_min && $patient->usual_bmi_max)
->>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 						<small class="text-muted">BMI (Usual): <b>{{ $patient->usual_bmi_min }}</b> {{ $patient->usual_bmi_min_category }} to <b>{{ $patient->usual_bmi_max }}</b> {{ $patient->usual_bmi_max_category }}</small>
 						@endif
 						@if($patient->ideal_bmi)
@@ -139,19 +87,11 @@
 
 				<td>{{ $patient->most_recent_cellular_bp_value_pulse }}</td>
 
-<<<<<<< HEAD
-            <td class="text-nowrap d-none">{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
-=======
 				<td>{{ friendlier_date_time($patient->most_recent_cellular_bp_measurement_at, false) }}</td>
->>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
 				<td>{{ $patient->most_recent_cellular_weight_value ? round($patient->most_recent_cellular_weight_value, 2) : '--' }}</td>
 
-<<<<<<< HEAD
-            <td class="text-nowrap d-none">{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
-=======
 				<td>{{ friendlier_date_time($patient->most_recent_cellular_weight_measurement_at, false) }}</td>
->>>>>>> 5728faa93ac349dab39f7b515e7970bf1f20b8f6
 
 				{{-- <td>{{$patient->is_enrolled_in_cm ? 'Yes' : 'No'}}</td>--}}
 				{{-- <td>{{$patient->is_enrolled_in_rm ? 'Yes' : 'No'}}</td>--}}