reihanrere/sistem-akademik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing report

Browse Source
This commit is contained in:
reihanrere 2025-06-04 14:44:12 +07:00
parent 5189b49f1b
commit 0aa7b4e397
3 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
resources/views/filament/pages/report-preview.blade.php
View File

@ -28,9 +28,10 @@
</table> </table>
</div> </div>
<div class="text-sm"> <h1 class="font-bold">A. NILAI DAN CAPAIAN PEMBELAJARAN</h1>
<table class="w-full border border-black text-sm">
<div class="text-sm mt-3">
<table class="w-full border border-black text-sm">
<thead> <thead>
<tr class=""> <tr class="">
<th class="border border-black w-8">No</th> <th class="border border-black w-8">No</th>
@ -75,19 +76,19 @@
</tr> </tr>
@foreach($this->table['assessments']['seni'] as $subjects => $subject) @foreach($this->table['assessments']['seni'] as $subjects => $subject)
<tr> <tr>
<td class="border border-black text-center">a</td> <td class="border border-black text-center" rowspan="2">a</td>
<td class="border border-black">{{ $subject["subject"] }}</td> <td class="border border-black" rowspan="2">{{ $subject["subject"] }}</td>
<td class="border border-black text-center">{{ $subject["score"] }}</td> <td class="border border-black text-center" rowspan="2">{{ $subject["score"] }}</td>
<td class="border border-black"> <td class="border border-black p-2">
@if(!empty($subject["highest"])) @if(!empty($subject["highest"]))
<div class="border border-black p-2"> {{ $subject["highest"] }}
{{ $subject["highest"] }}
</div>
@endif @endif
</td>
</tr>
<tr>
<td class="border border-black p-2">
@if(!empty($subject["lower"])) @if(!empty($subject["lower"]))
<div class="border border-black p-2"> {{ $subject["lower"] }}
{{ $subject["lower"] }}
</div>
@endif @endif
</td> </td>
</tr> </tr>
@ -99,9 +100,9 @@
</tbody> </tbody>
</table> </table>
<h4 class="font-semibold mt-6 mb-2">Muatan Lokal</h4> <h1 class="font-bold mt-6">B. MUATAN LOKAL</h1>
<table class="w-full border border-black text-sm">
<table class="w-full border border-black text-sm mt-3">
<thead> <thead>
<tr class=""> <tr class="">
<th class="border border-black w-8">No</th> <th class="border border-black w-8">No</th>
@ -115,19 +116,19 @@
@if(!empty($this->table['assessments']['muatan lokal'])) @if(!empty($this->table['assessments']['muatan lokal']))
@foreach($this->table['assessments']['muatan lokal'] as $subjects => $subject) @foreach($this->table['assessments']['muatan lokal'] as $subjects => $subject)
<tr> <tr>
<td class="border border-black text-center">{{ $i }}</td> <td class="border border-black text-center" rowspan="2">{{ $i }}</td>
<td class="border border-black">{{ $subject["subject"] }}</td> <td class="border border-black" rowspan="2">{{ $subject["subject"] }}</td>
<td class="border border-black text-center">{{ $subject["score"] }}</td> <td class="border border-black text-center" rowspan="2">{{ $subject["score"] }}</td>
<td class="border border-black"> <td class="border border-black p-2">
@if(!empty($subject["highest"])) @if(!empty($subject["highest"]))
<div class="border border-black p-2"> {{ $subject["highest"] }}
{{ $subject["highest"] }}
</div>
@endif @endif
</td>
</tr>
<tr>
<td class="border border-black p-2">
@if(!empty($subject["lower"])) @if(!empty($subject["lower"]))
<div class="border border-black p-2"> {{ $subject["lower"] }}
{{ $subject["lower"] }}
</div>
@endif @endif
</td> </td>
</tr> </tr>
@ -139,7 +140,9 @@
</tbody> </tbody>
</table> </table>
<table style="table-layout: fixed" class="w-full border border-black text-sm mb-6 mt-6"> <h1 class="font-bold mt-6">C. EKSTRAKURIKULER</h1>
<table style="table-layout: fixed" class="w-full border border-black text-sm mb-6 mt-3">
<thead> <thead>
<tr class=""> <tr class="">
<th class="border border-black w-8">No</th> <th class="border border-black w-8">No</th>
@ -177,8 +180,9 @@
</tbody> </tbody>
</table> </table>
{{-- Table Ketidakhadiran --}} <h1 class="font-bold mt-6">D. KETIDAKHADIRAN</h1>
<table class="border text-sm mt-6">
<table class="border text-sm mt-3 w-72">
<tr> <tr>
<td class="border text-center" colspan="2">Ketidakhadiran</td> <td class="border text-center" colspan="2">Ketidakhadiran</td>
</tr> </tr>

62
resources/views/print/report.blade.php
View File

@ -126,7 +126,8 @@
@php @php
$i = 1; $i = 1;
@endphp @endphp
<table> <h3 style="font-weight: bold; margin-top: 1.5rem">A. NILAI DAN CAPAIAN PEMBELAJARAN</h3>
<table style="margin-top: 0.75rem">
<tr> <tr>
<th style="width: 2rem">No</th> <th style="width: 2rem">No</th>
<th style="width: 185px">Muatan Pelajaran</th> <th style="width: 185px">Muatan Pelajaran</th>
@ -136,7 +137,7 @@
@if(!empty($table['assessments']['umum'])) @if(!empty($table['assessments']['umum']))
@foreach($table['assessments']['umum'] as $subjects => $subject) @foreach($table['assessments']['umum'] as $subjects => $subject)
<tr> <tr>
<td rowspan="2">{{ $i }}</td> <td rowspan="2" class="text-center">{{ $i }}</td>
<td rowspan="2">{{ $subject["subject"] }}</td> <td rowspan="2">{{ $subject["subject"] }}</td>
<td rowspan="2" class="text-center">{{ $subject["score"] }}</td> <td rowspan="2" class="text-center">{{ $subject["score"] }}</td>
<td class=""> <td class="">
@ -162,28 +163,30 @@
@if(!empty($table['assessments']['seni'])) @if(!empty($table['assessments']['seni']))
<tr> <tr>
<td>{{ $i }}</td> <td class="text-center">{{ $i }}</td>
<td colspan="3">Seni</td> <td colspan="3">Seni</td>
</tr> </tr>
@php $charIndex = 0; @endphp @php $charIndex = 0; @endphp
@foreach($table['assessments']['seni'] as $subjects => $subject) @foreach($table['assessments']['seni'] as $subjects => $subject)
<tr> <tr>
<td>{{ chr(97 + $charIndex) }}</td> <td rowspan="2" class="text-center">{{ chr(97 + $charIndex) }}</td>
<td>{{ $subject["subject"] }}</td> <td rowspan="2">{{ $subject["subject"] }}</td>
<td class="text-center">{{ $subject["score"] }}</td> <td rowspan="2" class="text-center">{{ $subject["score"] }}</td>
<td class="custom-cell"> <td class="">
@if(!empty($subject["highest"])) @if(!empty($subject["highest"]))
<div class="p-2"> <div class="p-2">
{{ $subject["highest"] }} {{ $subject["highest"] }}
</div> </div>
@endif @endif
@if(!empty($subject["lower"]))
<div class="p-2">
{{ $subject["lower"] }}
</div>
@endif
</td> </td>
</tr> </tr>
<tr>
@if(!empty($subject["lower"]))
<div class="p-2">
{{ $subject["lower"] }}
</div>
@endif
</tr>
@php @php
$i++; $i++;
@endphp @endphp
@ -192,8 +195,8 @@
</table> </table>
<br><strong>Muatan Lokal</strong> <h3 style="font-weight: bold; margin-top: 1.5rem">B. MUATAN LOKAL</h3>
<table> <table style="margin-top: 0.75rem">
<tr> <tr>
<th style="width: 2rem">No</th> <th style="width: 2rem">No</th>
<th style="width: 185px">Muatan Pelajaran</th> <th style="width: 185px">Muatan Pelajaran</th>
@ -203,22 +206,24 @@
@if(!empty($table['assessments']['muatan lokal'])) @if(!empty($table['assessments']['muatan lokal']))
@foreach($table['assessments']['muatan lokal'] as $subjects => $subject) @foreach($table['assessments']['muatan lokal'] as $subjects => $subject)
<tr> <tr>
<td>{{ $i }}</td> <td rowspan="2" class="text-center">{{ $i }}</td>
<td>{{ $subject["subject"] }}</td> <td rowspan="2">{{ $subject["subject"] }}</td>
<td class="text-center">{{ $subject["score"] }}</td> <td rowspan="2" class="text-center">{{ $subject["score"] }}</td>
<td class=""> <td class="">
@if(!empty($subject["highest"])) @if(!empty($subject["highest"]))
<div class="p-2"> <div class="p-2">
{{ $subject["highest"] }} {{ $subject["highest"] }}
</div> </div>
@endif @endif
@if(!empty($subject["lower"]))
<div class="p-2">
{{ $subject["lower"] }}
</div>
@endif
</td> </td>
</tr> </tr>
<tr>
@if(!empty($subject["lower"]))
<div class="p-2">
{{ $subject["lower"] }}
</div>
@endif
</tr>
@php @php
$i++; $i++;
@endphp @endphp
@ -226,7 +231,8 @@
@endif @endif
</table> </table>
<table> <h3 style="font-weight: bold; margin-top: 1.5rem">C. EKSTRAKURIKULER</h3>
<table style="margin-top: 0.75rem">
<tr> <tr>
<th style="width: 2rem">No</th> <th style="width: 2rem">No</th>
<th style="width: 185px">Ekstrakurikuler</th> <th style="width: 185px">Ekstrakurikuler</th>
@ -259,15 +265,17 @@
@endif @endif
</table> </table>
<table class="no-full"> <h3 style="font-weight: bold; margin-top: 1.5rem">D. KETIDAKHADIRAN</h3>
<table class="no-full" style="margin-top: 0.75rem">
<tr> <tr>
<td colspan="2" style="text-align: center"> <td colspan="2" style="text-align: center">
Ketidakhadiran Ketidakhadiran
</td> </td>
</tr> </tr>
<tr><td>Sakit</td><td>: {{ $sakit ?? 0 }} hari</td></tr> <tr><td>Sakit</td><td> {{ $sakit ?? 0 }} hari</td></tr>
<tr><td>Izin</td><td>: {{ $izin ?? 0 }} hari</td></tr> <tr><td>Izin</td><td> {{ $izin ?? 0 }} hari</td></tr>
<tr><td>Tanpa Keterangan</td><td>: {{ $tanpa_keterangan ?? 0 }} hari</td></tr> <tr><td>Tanpa Keterangan</td><td> {{ $tanpa_keterangan ?? 0 }} hari</td></tr>
</table> </table>
<br> <br>

2
routes/web.php
View File

@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Route;
use App\Http\Controllers\ReportPDFController; use App\Http\Controllers\ReportPDFController;
Route::get('/', function () { Route::get('/', function () {
return view('welcome'); return redirect('/admin/login');
}); });
Route::get('/report-pdf', [ReportPDFController::class, 'reportPDF'])->name('report.pdf'); Route::get('/report-pdf', [ReportPDFController::class, 'reportPDF'])->name('report.pdf');