update
This commit is contained in:
@@ -1,3 +1,14 @@
|
||||
@php
|
||||
$criticalNotificationCount = 0;
|
||||
$criticalNotificationItems = collect();
|
||||
if (Session::get('id') !== null) {
|
||||
$criticalNotificationCount = \App\CriticalValueSample::whereNull('followed_up_at')->count();
|
||||
$criticalNotificationItems = \App\CriticalValueSample::whereNull('followed_up_at')
|
||||
->orderBy('critical_set_at', 'asc')
|
||||
->limit(8)
|
||||
->get();
|
||||
}
|
||||
@endphp
|
||||
<header id="topnav">
|
||||
<div class="topbar-main">
|
||||
<div class="container-fluid">
|
||||
@@ -20,21 +31,40 @@
|
||||
</div>
|
||||
</a>
|
||||
</li>
|
||||
@if(Session::get('id') !== null)
|
||||
@if (isset($antrkrmsitu))
|
||||
<li class="dropdown notification-list">
|
||||
<a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#" role="button"
|
||||
aria-haspopup="false" aria-expanded="false">
|
||||
<i class="fi-bell noti-icon"></i>
|
||||
<span class="badge badge-danger badge-pill noti-icon-badge">{{$antrkrmsitu}}</span>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right dropdown-lg">
|
||||
<a href="checkout" class="dropdown-item text-center text-primary notify-item notify-all">
|
||||
Sync To INSITU <i class="fi-arrow-right"></i>
|
||||
</a>
|
||||
<li class="dropdown notification-list">
|
||||
<a class="nav-link dropdown-toggle arrow-none waves-effect" data-toggle="dropdown" href="#">
|
||||
<i class="fi-bell noti-icon" id="notification-bell-icon"></i>
|
||||
<span class="badge badge-danger badge-pill noti-icon-badge" id="notificationcount">{{ $criticalNotificationCount }}</span>
|
||||
</a>
|
||||
<div class="dropdown-menu dropdown-menu-right dropdown-lg" id="notifikasi-verifikasi-bell">
|
||||
<div class="dropdown-item noti-title">
|
||||
<h5 class="m-0">
|
||||
<span class="float-right">
|
||||
<a href="{{ route('criticalValueNotifications') }}" class="text-dark"><small>Lihat Semua</small></a>
|
||||
</span>
|
||||
Nilai Kritis
|
||||
</h5>
|
||||
</div>
|
||||
</li>
|
||||
@endif
|
||||
<div style="max-height: 320px; overflow-y: auto;">
|
||||
@if($criticalNotificationItems->isEmpty())
|
||||
<div class="dropdown-item text-muted">Tidak ada sample nilai kritis yang perlu dilaporkan.</div>
|
||||
@else
|
||||
@foreach($criticalNotificationItems as $criticalItem)
|
||||
<a href="{{ route('criticalValueNotificationOpen', $criticalItem->id) }}" class="dropdown-item notify-item">
|
||||
<div class="notify-icon bg-warning"><i class="fa fa-exclamation-triangle"></i></div>
|
||||
<p class="notify-details">
|
||||
{{ $criticalItem->nofoto ?? '-' }} - {{ $criticalItem->nmpasien ?? 'Tanpa Nama' }}
|
||||
<small class="text-muted">
|
||||
Set: {{ $criticalItem->critical_set_at ? \Carbon\Carbon::parse($criticalItem->critical_set_at)->format('d-m-Y H:i:s') : '-' }}
|
||||
</small>
|
||||
</p>
|
||||
</a>
|
||||
@endforeach
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
@if(Session::get('id') !== null)
|
||||
<li class="dropdown notification-list">
|
||||
<a class="nav-link dropdown-toggle waves-effect nav-user" data-toggle="dropdown" href="#" role="button"
|
||||
aria-haspopup="false" aria-expanded="false">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2367,19 +2367,30 @@
|
||||
<textarea id="addendumketerangan" style="width: 100%; height: 300px;"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-lg-3">
|
||||
<div class="form-row align-items-center">
|
||||
<div class="col-auto">
|
||||
<input type="hidden" id="periksa_id" name="periksa_id">
|
||||
<button type="button" id="btnkembali" class="btn btn-primary">Back</button>
|
||||
</div>
|
||||
<div class="form-group col-lg-9 setelahdipilihtemplate">
|
||||
@if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer')
|
||||
<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Final Result</button>
|
||||
@else
|
||||
<button type="button" id="btnSavePeriksa" class="btn btn-warning pull-right">Save and Send To SPV</button>
|
||||
@endif
|
||||
<div class="col-auto setelahdipilihtemplate">
|
||||
<button type="button" id="btnsavedraft" class="btn btn-success pull-right">Save as Draft</button>
|
||||
</div>
|
||||
@if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer')
|
||||
<div class="col-auto">
|
||||
<div class="form-check mb-2">
|
||||
<input class="form-check-input" type="checkbox" id="nilai_kritis" name="nilai_kritis">
|
||||
<label class="form-check-label" for="nilai_kritis">
|
||||
Nilai Kritis
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Final Result</button>
|
||||
@else
|
||||
<div class="col-auto">
|
||||
<button type="button" id="btnSavePeriksa" class="btn btn-warning pull-right">Save and Send To SPV</button>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group setelahdipilihtemplate">
|
||||
<div id="gridadendum"></div>
|
||||
@@ -6089,6 +6100,7 @@
|
||||
formdata.set('addendumketerangan', addendumketerangan);
|
||||
formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain);
|
||||
formdata.set('viralload', viralload);
|
||||
formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0');
|
||||
formdata.set('_token', '{{ csrf_token() }}');
|
||||
$.each(checkboxValues, (key, val) => formdata.set(key, val));
|
||||
$.ajax({
|
||||
|
||||
@@ -2423,19 +2423,30 @@
|
||||
<textarea id="addendumketerangan" style="width: 100%; height: 300px;"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-lg-3">
|
||||
<div class="form-row align-items-center">
|
||||
<div class="col-auto">
|
||||
<input type="hidden" id="periksa_id" name="periksa_id">
|
||||
<button type="button" id="btnkembali" class="btn btn-primary">Back</button>
|
||||
</div>
|
||||
<div class="form-group col-lg-9 setelahdipilihtemplate">
|
||||
@if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer')
|
||||
<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Final Result</button>
|
||||
@else
|
||||
<button type="button" id="btnSavePeriksa" class="btn btn-warning pull-right">Save and Send To SPV</button>
|
||||
@endif
|
||||
<div class="col-auto setelahdipilihtemplate">
|
||||
<button type="button" id="btnsavedraft" class="btn btn-success pull-right">Save as Draft</button>
|
||||
</div>
|
||||
@if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer')
|
||||
<div class="col-auto">
|
||||
<div class="form-check mb-2">
|
||||
<input class="form-check-input" type="checkbox" id="nilai_kritis" name="nilai_kritis">
|
||||
<label class="form-check-label" for="nilai_kritis">
|
||||
Nilai Kritis
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button type="button" id="btnsendexpertisetopacs" class="btn btn-warning pull-right">Save Final Result</button>
|
||||
@else
|
||||
<div class="col-auto">
|
||||
<button type="button" id="btnSavePeriksa" class="btn btn-warning pull-right">Save and Send To SPV</button>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group setelahdipilihtemplate">
|
||||
<div id="gridadendum"></div>
|
||||
@@ -6131,6 +6142,7 @@
|
||||
formdata.set('addendumketerangan', addendumketerangan);
|
||||
formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain);
|
||||
formdata.set('viralload', viralload);
|
||||
formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0');
|
||||
formdata.set('_token', '{{ csrf_token() }}');
|
||||
$.each(checkboxValues, (key, val) => formdata.set(key, val));
|
||||
$.ajax({
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
@extends('base.layout')
|
||||
|
||||
@section('content')
|
||||
<div class="wrapper">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box">
|
||||
<h4 class="page-title">Notifikasi Nilai Kritis</h4>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (session('success'))
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="alert alert-success">{{ session('success') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title mb-3">Sample Yang Belum Dilaporkan</h5>
|
||||
|
||||
@if($items->isEmpty())
|
||||
<div class="alert alert-info mb-0">Tidak ada sample nilai kritis yang perlu dilaporkan.</div>
|
||||
@else
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>No</th>
|
||||
<th>No Foto</th>
|
||||
<th>No Register</th>
|
||||
<th>Pasien</th>
|
||||
<th>Spesimen</th>
|
||||
<th>Waktu Set Nilai Kritis</th>
|
||||
<th>Waktu Ditindaklanjuti</th>
|
||||
<th>Aksi</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($items as $index => $item)
|
||||
<tr @if((string) $highlightId === (string) $item->id) class="table-warning" @endif>
|
||||
<td>{{ $index + 1 }}</td>
|
||||
<td>{{ $item->nofoto ?? '-' }}</td>
|
||||
<td>{{ $item->noregister ?? '-' }}</td>
|
||||
<td>{{ $item->nmpasien ?? '-' }}</td>
|
||||
<td>{{ $item->nm_spesimen ?? '-' }}</td>
|
||||
<td>
|
||||
{{ $item->critical_set_at ? \Carbon\Carbon::parse($item->critical_set_at)->format('d-m-Y H:i:s') : '-' }}
|
||||
@if(!empty($item->critical_set_by_name))
|
||||
<br><small>oleh {{ $item->critical_set_by_name }}</small>
|
||||
@endif
|
||||
</td>
|
||||
<td>-</td>
|
||||
<td>
|
||||
<form action="{{ route('criticalValueNotificationMarkRead', $item->id) }}" method="POST" class="mb-0">
|
||||
@csrf
|
||||
<button type="submit" class="btn btn-sm btn-warning">Mark as Read</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title mb-3">Riwayat Nilai Kritis Yang Sudah Ditindaklanjuti</h5>
|
||||
@if($followedItems->isEmpty())
|
||||
<div class="alert alert-secondary mb-0">Belum ada riwayat tindak lanjut.</div>
|
||||
@else
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>No</th>
|
||||
<th>No Foto</th>
|
||||
<th>No Register</th>
|
||||
<th>Pasien</th>
|
||||
<th>Spesimen</th>
|
||||
<th>Waktu Set Nilai Kritis</th>
|
||||
<th>Waktu Ditindaklanjuti</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($followedItems as $index => $item)
|
||||
<tr @if((string) $highlightId === (string) $item->id) class="table-warning" @endif>
|
||||
<td>{{ $index + 1 }}</td>
|
||||
<td>{{ $item->nofoto ?? '-' }}</td>
|
||||
<td>{{ $item->noregister ?? '-' }}</td>
|
||||
<td>{{ $item->nmpasien ?? '-' }}</td>
|
||||
<td>{{ $item->nm_spesimen ?? '-' }}</td>
|
||||
<td>{{ $item->critical_set_at ? \Carbon\Carbon::parse($item->critical_set_at)->format('d-m-Y H:i:s') : '-' }}</td>
|
||||
<td>
|
||||
{{ $item->followed_up_at ? \Carbon\Carbon::parse($item->followed_up_at)->format('d-m-Y H:i:s') : '-' }}
|
||||
@if(!empty($item->followed_up_by_name))
|
||||
<br><small>oleh {{ $item->followed_up_by_name }}</small>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
Reference in New Issue
Block a user