Pagination and Searching Riwayat
This commit is contained in:
parent
fba20e68c5
commit
79626e28b2
|
@ -245,8 +245,11 @@ public function perangkingan(Request $request)
|
||||||
return view('perhitungan.perangkingan', compact('criterias', 'extracuricullars', 'nilaiAkhir', 'totalNilaiAkhir', 'totalNilaiAkhirPersen', 'peringkat'));
|
return view('perhitungan.perangkingan', compact('criterias', 'extracuricullars', 'nilaiAkhir', 'totalNilaiAkhir', 'totalNilaiAkhirPersen', 'peringkat'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getRiwayatHasil()
|
public function getRiwayatHasil(Request $request)
|
||||||
{
|
{
|
||||||
|
// Ambil data riwayat hasil dengan pagination
|
||||||
|
$logsQuery = LogActivity::query();
|
||||||
|
|
||||||
// Periksa apakah pengguna telah login
|
// Periksa apakah pengguna telah login
|
||||||
if (auth()->check()) {
|
if (auth()->check()) {
|
||||||
// Jika pengguna adalah admin, ambil semua aktivitas log
|
// Jika pengguna adalah admin, ambil semua aktivitas log
|
||||||
|
@ -262,6 +265,20 @@ public function getRiwayatHasil()
|
||||||
$logs = collect();
|
$logs = collect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($request->has('search')) {
|
||||||
|
$search = $request->search;
|
||||||
|
$logsQuery->where(function ($query) use ($search) {
|
||||||
|
$query->whereHas('user', function ($query) use ($search) {
|
||||||
|
$query->where('name', 'like', '%' . $search . '%');
|
||||||
|
})->orWhereHas('extracuricullar', function ($query) use ($search) {
|
||||||
|
$query->where('nama', 'like', '%' . $search . '%');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lakukan pagination dengan 10 item per halaman
|
||||||
|
$logs = $logsQuery->paginate(10);
|
||||||
|
|
||||||
// Ambil data dari formulir atau perhitungan Anda
|
// Ambil data dari formulir atau perhitungan Anda
|
||||||
$nilaiUtility = session('nilaiUtility', []);
|
$nilaiUtility = session('nilaiUtility', []);
|
||||||
|
|
||||||
|
@ -335,7 +352,7 @@ public function getRiwayatHasil()
|
||||||
|
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
//
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -33,7 +33,19 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="card-box mb-30">
|
<div class="card-box mb-30">
|
||||||
<div class="pd-20">
|
<div class="pd-20">
|
||||||
<h4 class="text-blue h4 mb-0">Hasil Riwayat</h4>
|
<h4 class="text-blue h4 mb-0">Hasil Riwayat Penilaian</h4>
|
||||||
|
</div>
|
||||||
|
<div class="card-header d-flex align-items-center">
|
||||||
|
<form class="form-inline ml-auto" action="{{ route('riwayat.hasil') }}" method="GET">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="search" class="form-control" name="search" placeholder="Search">
|
||||||
|
<div class="input-group-append">
|
||||||
|
<button class="btn btn-primary" type="submit">
|
||||||
|
<i class="icon dw dw-search"></i>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<form method="POST" action="">
|
<form method="POST" action="">
|
||||||
@csrf
|
@csrf
|
||||||
|
@ -49,9 +61,9 @@
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@forelse ($logs as $log)
|
@forelse ($logs as $index => $log)
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{ $loop->iteration }}</td>
|
<td>{{ $index + $logs->firstItem() }}</td>
|
||||||
<td>{{ $log->user->name }}</td>
|
<td>{{ $log->user->name }}</td>
|
||||||
<td>{{ $log->extracuricullar->nama }}</td>
|
<td>{{ $log->extracuricullar->nama }}</td>
|
||||||
<td>{{ $log->final_score }}</td>
|
<td>{{ $log->final_score }}</td>
|
||||||
|
@ -63,6 +75,14 @@
|
||||||
@endforelse
|
@endforelse
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<div>
|
||||||
|
<div style="display: flex; justify-content: space-between; align-items: center; margin: 0 20px;">
|
||||||
|
<div style="font-size: 14px;">
|
||||||
|
Showing data {{ $logs->firstItem() }} to {{ $logs->lastItem() }} of {{ $logs->total() }} entries
|
||||||
|
</div>
|
||||||
|
<div style="font-size: 14px;">{{ $logs->links() }}</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
Loading…
Reference in New Issue