|
@@ -76,7 +76,7 @@
|
|
<div>
|
|
<div>
|
|
<span class="text-dark font-weight-bold">Care Month</span> for <span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
|
|
<span class="text-dark font-weight-bold">Care Month</span> for <span class="text-dark font-weight-bold">{{friendly_month($careMonth->start_date)}}</span>
|
|
</div>
|
|
</div>
|
|
- @if(!$careMonth->is_tm_this_month)
|
|
|
|
|
|
+ {{--@if(!$careMonth->is_tm_this_month)
|
|
<div moe class="mt-2">
|
|
<div moe class="mt-2">
|
|
<a start show>Mark as Transitional Month</a>
|
|
<a start show>Mark as Transitional Month</a>
|
|
<form url="/api/careMonth/setIsTmThisMonthToTrue">
|
|
<form url="/api/careMonth/setIsTmThisMonthToTrue">
|
|
@@ -88,10 +88,10 @@
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
- @endif
|
|
|
|
|
|
+ @endif--}}
|
|
</div>
|
|
</div>
|
|
</h6>
|
|
</h6>
|
|
- <div class="d-flex align-items-start ml-auto text-secondary">
|
|
|
|
|
|
+ {{--<div class="d-flex align-items-start ml-auto text-secondary">
|
|
<div class="d-inline-flex align-items-start">
|
|
<div class="d-inline-flex align-items-start">
|
|
<div>
|
|
<div>
|
|
<div class="mr-3 text-sm-incl-children">
|
|
<div class="mr-3 text-sm-incl-children">
|
|
@@ -138,7 +138,7 @@
|
|
<div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
|
|
<div class="font-weight-bold text-dark text-nowrap">{{time_in_hrminsec($careMonth->cm_total_time_in_seconds)}}</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- </div>
|
|
|
|
|
|
+ </div>--}}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<hr class="m-negator mb-0">
|
|
<hr class="m-negator mb-0">
|
|
@@ -156,10 +156,10 @@
|
|
<span class="text-secondary">RME:</span>
|
|
<span class="text-secondary">RME:</span>
|
|
<span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
|
|
<span class="text-nowrap">{{ $careMonth->rmePro ? $careMonth->rmePro->displayName() : '-' }}</span>
|
|
</div>
|
|
</div>
|
|
- <div class="col-3">
|
|
|
|
|
|
+ {{--<div class="col-3">
|
|
<span class="text-secondary">CM:</span>
|
|
<span class="text-secondary">CM:</span>
|
|
<span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
|
|
<span class="text-nowrap">{{ $careMonth->cmPro ? $careMonth->cmPro->displayName() : '-' }}</span>
|
|
- </div>
|
|
|
|
|
|
+ </div>--}}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
<hr class="m-negator mt-0">
|
|
<hr class="m-negator mt-0">
|
|
@@ -192,12 +192,250 @@
|
|
}
|
|
}
|
|
?>
|
|
?>
|
|
|
|
|
|
|
|
+ <?php $vitalLabels = ['Ht. (in.)','Wt. (lbs.)','Temp. (F)','Pulse','Resp.','Pulse Ox.','SBP','DBP','Smoking Status', 'BMI']; ?>
|
|
|
|
+
|
|
|
|
+ <div class="row mb-3">
|
|
|
|
+ <div class="col-12">
|
|
|
|
+ <div class="mt-0 pb-1">
|
|
|
|
+ <div class="d-flex align-items-center mb-2">
|
|
|
|
+ <h6 class="my-0 font-weight-bold text-dark">Measurements</h6>
|
|
|
|
+ <span class="mx-2 text-secondary">|</span>
|
|
|
|
+ <div moe>
|
|
|
|
+ <a start show class="py-0 font-weight-normal">Add</a>
|
|
|
|
+ <form url="/api/measurement/create">
|
|
|
|
+ <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input autofocus type="text" class="form-control form-control-sm" name="label" value="" placeholder="Type">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="text" class="form-control form-control-sm" name="value" value="" placeholder="Value">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="date" class="form-control form-control-sm" name="effectiveDate" max="{{ date('Y-m-d') }}" value="{{ date('Y-m-d') }}">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
|
|
+ <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
|
|
+ </div>
|
|
|
|
+ </form>
|
|
|
|
+ </div>
|
|
|
|
+ {{--<span class="mx-2 text-secondary">|</span>
|
|
|
|
+ <a start show class="py-0 font-weight-normal"
|
|
|
|
+ href="/patients/view/{{ $patient->uid }}/measurements">
|
|
|
|
+ View All
|
|
|
|
+ </a>--}}
|
|
|
|
+ </div>
|
|
|
|
+ <table class="table table-striped table-sm table-bordered mt-2 mb-0">
|
|
|
|
+ <thead>
|
|
|
|
+ <tr>
|
|
|
|
+ <th class="px-2 text-secondary">Created</th>
|
|
|
|
+ <th class="px-2 text-secondary w-25">Category</th>
|
|
|
|
+ <th class="px-2 text-secondary w-25">Value</th>
|
|
|
|
+ <th class="px-2 text-secondary">Status</th>
|
|
|
|
+ <th class="px-2 text-secondary">Memo</th>
|
|
|
|
+ </tr>
|
|
|
|
+ </thead>
|
|
|
|
+ <tbody>
|
|
|
|
+ @foreach($patient->measurements as $measurement)
|
|
|
|
+ @if(!empty($measurement->label) && !in_array($measurement->label, $vitalLabels))
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="px-2">{{ friendly_date_time($measurement->created_at) }}</td>
|
|
|
|
+ <td class="px-2">{{ $measurement->label }}</td>
|
|
|
|
+ <td class="px-2">{{ $measurement->value }}</td>
|
|
|
|
+ <td></td>
|
|
|
|
+ <td></td>
|
|
|
|
+
|
|
|
|
+ {{--<td class="text-black p-0 border-0">
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <div moe relative class="mr-2">
|
|
|
|
+ <a class="on-hover-opaque" start show title="Delete">
|
|
|
|
+ <i class="font-size-11 fa fa-trash-alt text-danger"></i>
|
|
|
|
+ </a>
|
|
|
|
+ <form url="/api/measurement/remove">
|
|
|
|
+ <input type="hidden" name="uid" value="{{ $measurement->uid }}">
|
|
|
|
+ <p class="small min-width-200px">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>
|
|
|
|
+ </div>
|
|
|
|
+ <div moe class="mr-2">
|
|
|
|
+ <a class="on-hover-opaque" start show title="Update">
|
|
|
|
+ <i class="font-size-11 fa fa-edit text-primary"></i>
|
|
|
|
+ </a>
|
|
|
|
+ <form url="/api/measurement/create">
|
|
|
|
+ <input type="hidden" name="clientUid" value="{{ $patient->uid }}">
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="text" class="form-control form-control-sm" name="label" value="{{ $measurement->label }}" placeholder="Type">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input autofocus type="text" class="form-control form-control-sm" name="value" value="{{ $measurement->value }}" placeholder="Value">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="date" class="form-control form-control-sm" name="effectiveDate" max="{{ date('Y-m-d') }}" value="{{ date('Y-m-d') }}">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
|
|
+ <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
|
|
+ </div>
|
|
|
|
+ </form>
|
|
|
|
+ </div>
|
|
|
|
+ <span>{{ $measurement->label }}:</span>
|
|
|
|
+ <span class="font-weight-bold ml-1">{{ $measurement->value }}</span>
|
|
|
|
+ <span class="font-weight-normal text-secondary ml-2 text-sm">(as on {{ friendly_date_time($measurement->effective_date, false) }})</span>
|
|
|
|
+ </div>
|
|
|
|
+ </td>--}}
|
|
|
|
+ </tr>
|
|
|
|
+ @endif
|
|
|
|
+ @endforeach
|
|
|
|
+ @if(!$patient->measurements || !count($patient->measurements) === 0)
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="text-secondary p-0 border-0">
|
|
|
|
+ No items to show
|
|
|
|
+ </td>
|
|
|
|
+ </tr>
|
|
|
|
+ @endif
|
|
|
|
+ </tbody>
|
|
|
|
+ </table>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+ <hr class="m-negator mt-4 mb-3">
|
|
|
|
+
|
|
|
|
+ <div class="row mb-3">
|
|
|
|
+ {{-- BDT Measurements --}}
|
|
|
|
+ <div class="col-12">
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">Cellular Measurements</h6>
|
|
|
|
+ </div>
|
|
|
|
+ {{--<div class="mt-2 pb-1">
|
|
|
|
+ <table class="table table-sm border-0 m-0">
|
|
|
|
+ <tbody>
|
|
|
|
+ @foreach($patient->deviceMeasurements as $measurement)
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="text-black p-0 border-0">
|
|
|
|
+ <div class="pb-1 d-flex align-items-center">
|
|
|
|
+ <span class="text-secondary mr-2">{{ $measurement->measurement->device_category }}:</span>
|
|
|
|
+ @if($measurement->measurement->device_category === 'WEIGHT')
|
|
|
|
+ <b class="text-nowrap">{{ round($measurement->measurement->value_weight / 1000, 1) }} Kg</b>
|
|
|
|
+ @elseif($measurement->measurement->device_category === 'BP')
|
|
|
|
+ <b class="text-nowrap">{{ $measurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->measurement->diastolic_bp_in_mm_hg }} mmHg</b>
|
|
|
|
+ @endif
|
|
|
|
+ <span class="font-weight-normal text-secondary ml-2 text-sm">({{ friendly_date_time_short($measurement->measurement->created_at, true) }})</span>
|
|
|
|
+ <span class="ml-2 text-sm {{$measurement->status === 'NEW' ? 'text-info' : ($measurement->status === 'ACCEPTED' ? 'text-success' : 'text-sacondary')}}">{{$measurement->status}}</span>
|
|
|
|
+ <span>
|
|
|
|
+ <span moe class="ml-2" relative>
|
|
|
|
+ <a href="#" start show><i class="on-hover-opaque font-size-11 fa fa-edit text-primary"></i></a>
|
|
|
|
+ <form url="/api/clientBdtMeasurement/updateStatus" right>
|
|
|
|
+ <input type="hidden" name="uid" value="{{ $measurement->uid }}">
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <select name="status" class="form-control form-control-sm" required>
|
|
|
|
+ <option value="">-- select --</option>
|
|
|
|
+ <option {{$measurement->status === 'NEW' ? 'selected' : '' }} value="NEW">NEW</option>
|
|
|
|
+ <option {{$measurement->status === 'ACCEPTED' ? 'selected' : '' }} value="ACCEPTED">ACCEPTED</option>
|
|
|
|
+ <option {{$measurement->status === 'REJECTED' ? 'selected' : '' }} value="REJECTED">REJECTED</option>
|
|
|
|
+ </select>
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="text" name="statusMemo" placeholder="Status memo" class="form-control form-control-sm">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
|
|
+ <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
|
|
+ </div>
|
|
|
|
+ </form>
|
|
|
|
+ </span>
|
|
|
|
+ </span>
|
|
|
|
+ </div>
|
|
|
|
+ </td>
|
|
|
|
+ </tr>
|
|
|
|
+ @endforeach
|
|
|
|
+ @if(!$patient->deviceMeasurements || count($patient->deviceMeasurements) === 0)
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="text-secondary p-0 border-0">
|
|
|
|
+ No measurements
|
|
|
|
+ </td>
|
|
|
|
+ </tr>
|
|
|
|
+ @endif
|
|
|
|
+ </tbody>
|
|
|
|
+ </table>
|
|
|
|
+ </div>--}}
|
|
|
|
+ <table class="table table-striped table-sm table-bordered mt-2 mb-0">
|
|
|
|
+ @if($patient->measurements && count($patient->measurements))
|
|
|
|
+ <thead>
|
|
|
|
+ <tr>
|
|
|
|
+ <th class="px-2 text-secondary">Created</th>
|
|
|
|
+ <th class="px-2 text-secondary w-25">Category</th>
|
|
|
|
+ <th class="px-2 text-secondary w-25">Value</th>
|
|
|
|
+ <th class="px-2 text-secondary">Status</th>
|
|
|
|
+ <th class="px-2 text-secondary">Memo</th>
|
|
|
|
+ </tr>
|
|
|
|
+ </thead>
|
|
|
|
+ <tbody>
|
|
|
|
+ @foreach($patient->deviceMeasurements as $measurement)
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="px-2">{{ friendly_date_time($measurement->created_at) }}</td>
|
|
|
|
+ <td class="px-2">{{ $measurement->measurement->device_category }}</td>
|
|
|
|
+ <td class="px-2">
|
|
|
|
+ @if($measurement->measurement->device_category === 'WEIGHT')
|
|
|
|
+ <b>{{ round($measurement->measurement->value_weight / 1000, 1) }} Kg</b>
|
|
|
|
+ @elseif($measurement->measurement->device_category === 'BP')
|
|
|
|
+ <b>{{ $measurement->measurement->systolic_bp_in_mm_hg }}/{{ $measurement->measurement->diastolic_bp_in_mm_hg }} mmHg</b>
|
|
|
|
+ @endif
|
|
|
|
+ </td>
|
|
|
|
+ <td class="px-2">
|
|
|
|
+ <span>
|
|
|
|
+ <span>{{ $measurement->status }}</span>
|
|
|
|
+ <span moe class="ml-2" relative>
|
|
|
|
+ <a href="#" start show><i class="fa fa-edit text-primary"></i></a>
|
|
|
|
+ <form url="/api/clientBdtMeasurement/updateStatus" right>
|
|
|
|
+ <input type="hidden" name="uid" value="{{ $measurement->uid }}">
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <select name="status" class="form-control form-control-sm" required>
|
|
|
|
+ <option value="">-- select --</option>
|
|
|
|
+ <option {{$measurement->status === 'NEW' ? 'selected' : '' }} value="NEW">NEW</option>
|
|
|
|
+ <option {{$measurement->status === 'ACCEPTED' ? 'selected' : '' }} value="ACCEPTED">ACCEPTED</option>
|
|
|
|
+ <option {{$measurement->status === 'REJECTED' ? 'selected' : '' }} value="REJECTED">REJECTED</option>
|
|
|
|
+ </select>
|
|
|
|
+ </div>
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <input type="text" name="statusMemo" placeholder="Status memo" class="form-control form-control-sm">
|
|
|
|
+ </div>
|
|
|
|
+ <div class="d-flex align-items-center">
|
|
|
|
+ <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
|
|
+ <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
|
|
+ </div>
|
|
|
|
+ </form>
|
|
|
|
+ </span>
|
|
|
|
+ </span>
|
|
|
|
+ </td>
|
|
|
|
+ <td class="px-2">
|
|
|
|
+ {{ $measurement->status_memo }}
|
|
|
|
+ </td>
|
|
|
|
+ </tr>
|
|
|
|
+ @endforeach
|
|
|
|
+ </tbody>
|
|
|
|
+ @else
|
|
|
|
+ <tbody>
|
|
|
|
+ <tr>
|
|
|
|
+ <td class="text-secondary p-3">No device measurements for this patient</td>
|
|
|
|
+ </tr>
|
|
|
|
+ </tbody>
|
|
|
|
+ @endif
|
|
|
|
+ </table>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+ <hr class="m-negator mt-4 mb-3">
|
|
|
|
+
|
|
{{-- RM --}}
|
|
{{-- RM --}}
|
|
<div class="row">
|
|
<div class="row">
|
|
- @if($careMonth->is_client_enrolled_in_rm)
|
|
|
|
- <div class="col-8">
|
|
|
|
|
|
+ <div class="col-12">
|
|
|
|
+ @if($careMonth->is_client_enrolled_in_rm)
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
- <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">RM Time Entries</h6>
|
|
|
|
|
|
+ <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">Time Entries</h6>
|
|
@if(!$activeRMBill)
|
|
@if(!$activeRMBill)
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<span moe large>
|
|
<span moe large>
|
|
@@ -223,21 +461,24 @@
|
|
$d = date('t', $sD);
|
|
$d = date('t', $sD);
|
|
$yCurrent = date('Y');
|
|
$yCurrent = date('Y');
|
|
$mCurrent = date('m');
|
|
$mCurrent = date('m');
|
|
|
|
+ $isToday = false;
|
|
if($y === $yCurrent && $m === $mCurrent) {
|
|
if($y === $yCurrent && $m === $mCurrent) {
|
|
$d = date('d');
|
|
$d = date('d');
|
|
|
|
+ $isToday = true;
|
|
}
|
|
}
|
|
?>
|
|
?>
|
|
<input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
|
|
<input autofocus type="date" min="{{ date($y . '-' . $m . '-01') }}" max="{{ date($y . '-' . $m . '-' . $d) }}"
|
|
|
|
+ {{ $isToday ? 'value="' . date('Y-m-d') . '"' : '' }}
|
|
class="form-control form-control-sm w-100" name="effectiveDate"
|
|
class="form-control form-control-sm w-100" name="effectiveDate"
|
|
placeholder="Effective Date">
|
|
placeholder="Effective Date">
|
|
</div>
|
|
</div>
|
|
<div class="col-4">
|
|
<div class="col-4">
|
|
- <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInSeconds"
|
|
|
|
- value="" placeholder="Time in Seconds">
|
|
|
|
|
|
+ <input type="number" min="0" max="5400" class="form-control form-control-sm w-100 cm-time-value" name="timeInMinutes"
|
|
|
|
+ value="" placeholder="Time (mins.)">
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <div class="mb-2">
|
|
|
|
|
|
+ {{--<div class="mb-2">
|
|
<div class="row">
|
|
<div class="row">
|
|
<div class="col-4 pr-0 d-flex align-items-center">
|
|
<div class="col-4 pr-0 d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
@@ -255,15 +496,22 @@
|
|
value="" placeholder="Ending Time" disabled>
|
|
value="" placeholder="Ending Time" disabled>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
+ </div>--}}
|
|
|
|
+ {{--@include('app/entry-templates/rm/default')--}}
|
|
|
|
+ <div class="mb-2">
|
|
|
|
+ <div class="row">
|
|
|
|
+ <div class="col-12">
|
|
|
|
+ <input type="text" name="contentText" class="form-control form-control-sm" rows="5" placeholder="Reviewed/managed patient measurements" value="Reviewed/managed patient measurements">
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
</div>
|
|
</div>
|
|
- @include('app/entry-templates/rm/default')
|
|
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
<button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
<button class="btn btn-sm btn-primary mr-2" submit>Save</button>
|
|
<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</form>
|
|
</span>
|
|
</span>
|
|
- <span class="mx-2 text-secondary">|</span>
|
|
|
|
|
|
+ {{--<span class="mx-2 text-secondary">|</span>
|
|
<span moe>
|
|
<span moe>
|
|
<a start show class="py-0 mb-3 text-danger">Un-Enroll</a>
|
|
<a start show class="py-0 mb-3 text-danger">Un-Enroll</a>
|
|
<form url="/api/careMonth/setIsClientEnrolledInRmToFalse">
|
|
<form url="/api/careMonth/setIsClientEnrolledInRmToFalse">
|
|
@@ -274,7 +522,7 @@
|
|
<button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
|
|
<button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</form>
|
|
- </span>
|
|
|
|
|
|
+ </span>--}}
|
|
@else
|
|
@else
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<span class="mx-2 text-secondary">|</span>
|
|
<span class="text-secondary">Can't modify since a bill exists</span>
|
|
<span class="text-secondary">Can't modify since a bill exists</span>
|
|
@@ -285,7 +533,7 @@
|
|
<tr>
|
|
<tr>
|
|
<th class="px-2 text-secondary border-bottom-0">Effective Date</th>
|
|
<th class="px-2 text-secondary border-bottom-0">Effective Date</th>
|
|
<th class="px-2 text-secondary border-bottom-0">Time</th>
|
|
<th class="px-2 text-secondary border-bottom-0">Time</th>
|
|
- <th class="px-2 text-secondary border-bottom-0 w-50">Details</th>
|
|
|
|
|
|
+ {{--<th class="px-2 text-secondary border-bottom-0 w-50">Details</th>--}}
|
|
<th class="px-2 text-secondary border-bottom-0 delete-column"> </th>
|
|
<th class="px-2 text-secondary border-bottom-0 delete-column"> </th>
|
|
</tr>
|
|
</tr>
|
|
</thead>
|
|
</thead>
|
|
@@ -295,15 +543,18 @@
|
|
<tr>
|
|
<tr>
|
|
<td class="px-2">
|
|
<td class="px-2">
|
|
<div class="font-weight-bold">{{friendly_date_time($entry->effective_date, false)}}</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>
|
|
|
|
|
|
+ <div class="small text-secondary">
|
|
|
|
+ Created:
|
|
|
|
+ <div>{{friendly_date_time($entry->created_at)}}</div>
|
|
|
|
+ </div>
|
|
</td>
|
|
</td>
|
|
<td class="px-2">
|
|
<td class="px-2">
|
|
{{time_in_hrminsec($entry->time_in_seconds)}}
|
|
{{time_in_hrminsec($entry->time_in_seconds)}}
|
|
</td>
|
|
</td>
|
|
- <td class="px-2">
|
|
|
|
|
|
+ {{--<td class="px-2">
|
|
<div class="text-secondary text-s">{!! $entry->content_text !!}</div>
|
|
<div class="text-secondary text-s">{!! $entry->content_text !!}</div>
|
|
- {{--<div class="text-secondary text-sm">{{$entry->content_detail}}</div>--}}
|
|
|
|
- </td>
|
|
|
|
|
|
+ --}}{{--<div class="text-secondary text-sm">{{$entry->content_detail}}</div>--}}{{--
|
|
|
|
+ </td>--}}
|
|
<td class="px-2 text-center delete-column">
|
|
<td class="px-2 text-center delete-column">
|
|
@if(!$activeRMBill)
|
|
@if(!$activeRMBill)
|
|
<div moe relative>
|
|
<div moe relative>
|
|
@@ -326,10 +577,8 @@
|
|
@endforeach
|
|
@endforeach
|
|
</tbody>
|
|
</tbody>
|
|
</table>
|
|
</table>
|
|
- </div>
|
|
|
|
- @else
|
|
|
|
- <div class="col-8">
|
|
|
|
- <h6 class="mb-2 text-secondary font-weight-bold text-dark lh-24px">RM Time Entries</h6>
|
|
|
|
|
|
+ @else
|
|
|
|
+ <h6 class="mb-2 text-secondary font-weight-bold text-dark lh-24px">Time Entries</h6>
|
|
<div class="alert alert-secondary mt-2 mb-0">
|
|
<div class="alert alert-secondary mt-2 mb-0">
|
|
<b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>RM</b>.
|
|
<b>{{ $patient->displayName() }}</b> is currently not enrolled in <b>RM</b>.
|
|
<span moe class="">
|
|
<span moe class="">
|
|
@@ -344,8 +593,8 @@
|
|
</form>
|
|
</form>
|
|
</span>
|
|
</span>
|
|
</div>
|
|
</div>
|
|
- </div>
|
|
|
|
- @endif
|
|
|
|
|
|
+ @endif
|
|
|
|
+ </div>
|
|
|
|
|
|
{{-- CM --}}
|
|
{{-- CM --}}
|
|
<?php /*
|
|
<?php /*
|
|
@@ -524,74 +773,12 @@
|
|
@endif
|
|
@endif
|
|
@endif
|
|
@endif
|
|
*/ ?>
|
|
*/ ?>
|
|
-
|
|
|
|
- {{-- BDT Measurements --}}
|
|
|
|
- <div class="col-4">
|
|
|
|
- <div class="d-flex align-items-center">
|
|
|
|
- <h6 class="my-0 text-secondary font-weight-bold text-dark lh-24px">Device Measurements</h6>
|
|
|
|
- </div>
|
|
|
|
- <table class="table table-striped table-sm table-bordered mt-2 mb-0">
|
|
|
|
- @if($patient->measurements && count($patient->measurements))
|
|
|
|
- <thead>
|
|
|
|
- <tr>
|
|
|
|
- <th class="px-2 text-secondary">Created</th>
|
|
|
|
- <th class="px-2 text-secondary w-25">Category</th>
|
|
|
|
- <th class="px-2 text-secondary w-50">Value</th>
|
|
|
|
- </tr>
|
|
|
|
- </thead>
|
|
|
|
- <tbody>
|
|
|
|
- <?php $numMeasurementsInCareMonth = 0; ?>
|
|
|
|
- @foreach($patient->deviceMeasurements as $measurement)
|
|
|
|
- <?php
|
|
|
|
- $m = date("m", strtotime($measurement->created_at));
|
|
|
|
- $y = date("Y", strtotime($measurement->created_at));
|
|
|
|
- $cmM = date("m", strtotime($careMonth->start_date));
|
|
|
|
- $cmY = date("Y", strtotime($careMonth->start_date));
|
|
|
|
- if($m === $cmM && $y === $cmY) {
|
|
|
|
- $numMeasurementsInCareMonth++;
|
|
|
|
- ?>
|
|
|
|
- <tr>
|
|
|
|
- <td class="px-2">{{ friendly_date_time($measurement->created_at) }}</td>
|
|
|
|
- <td class="px-2">{{ $measurement->measurement->device_category }}</td>
|
|
|
|
- <td class="px-2">
|
|
|
|
- @if($measurement->measurement->device_category === 'WEIGHT')
|
|
|
|
- <b>{{ round($measurement->measurement->value_weight / 1000, 1) }} Kg</b>
|
|
|
|
- @elseif($measurement->measurement->device_category === 'BP')
|
|
|
|
- <b>{{ $measurement->measurement->value_systolic }}/{{ $measurement->measurement->value_diastolic }} mmHg</b>
|
|
|
|
- @endif
|
|
|
|
- </td>
|
|
|
|
- </tr>
|
|
|
|
- <?php
|
|
|
|
- }
|
|
|
|
- ?>
|
|
|
|
- @endforeach
|
|
|
|
- @if(!$numMeasurementsInCareMonth)
|
|
|
|
- <tr>
|
|
|
|
- <td colspan="3" class="p-2">
|
|
|
|
- No device measurements in {{ friendly_month($careMonth->start_date) }}
|
|
|
|
- </td>
|
|
|
|
- </tr>
|
|
|
|
- </tbody>
|
|
|
|
- @endif
|
|
|
|
- @else
|
|
|
|
- <tbody>
|
|
|
|
- <tr>
|
|
|
|
- <td class="text-secondary p-3">No device measurements for this patient</td>
|
|
|
|
- </tr>
|
|
|
|
- </tbody>
|
|
|
|
- @endif
|
|
|
|
- </table>
|
|
|
|
- </div>
|
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- @if(!$careMonth->is_tm_this_month && $careMonth->is_client_enrolled_in_rm)
|
|
|
|
- <hr class="m-negator mt-4 mb-3">
|
|
|
|
- @endif
|
|
|
|
-
|
|
|
|
<div class="row">
|
|
<div class="row">
|
|
|
|
|
|
{{-- rm bills --}}
|
|
{{-- rm bills --}}
|
|
- <div class="col-8">
|
|
|
|
|
|
+ {{--<div class="col-6">
|
|
@if($careMonth->is_client_enrolled_in_rm)
|
|
@if($careMonth->is_client_enrolled_in_rm)
|
|
<div class="d-flex align-items-center">
|
|
<div class="d-flex align-items-center">
|
|
<h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
|
|
<h6 class="my-0 text-secondary font-weight-bold text-dark">RM Bill
|
|
@@ -767,7 +954,7 @@
|
|
@endif
|
|
@endif
|
|
</div>
|
|
</div>
|
|
@endif
|
|
@endif
|
|
- {{-- cancelled rm bills --}}
|
|
|
|
|
|
+ --}}{{-- cancelled rm bills --}}{{--
|
|
@if(count($cancelledRMBills))
|
|
@if(count($cancelledRMBills))
|
|
@foreach($cancelledRMBills as $cancelledBill)
|
|
@foreach($cancelledRMBills as $cancelledBill)
|
|
<div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
|
|
<div class="border bg-light p-2 mt-2 on-hover-opaque mb-3">
|
|
@@ -817,7 +1004,7 @@
|
|
@endforeach
|
|
@endforeach
|
|
@endif
|
|
@endif
|
|
@endif
|
|
@endif
|
|
- </div>
|
|
|
|
|
|
+ </div>--}}
|
|
|
|
|
|
{{-- cm bills --}}
|
|
{{-- cm bills --}}
|
|
<?php /*
|
|
<?php /*
|