diff --git a/app/Http/Controllers/HasilController.php b/app/Http/Controllers/HasilController.php index 8452877..64ddcf8 100644 --- a/app/Http/Controllers/HasilController.php +++ b/app/Http/Controllers/HasilController.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use App\Models\User; +use Illuminate\Support\Facades\Validator; class HasilController extends Controller { @@ -47,9 +48,7 @@ public function index(Request $request) }); } - if ($request->kandang) { - $query->where('kandang_id', $request->kandang); - } + if ($request->bulan) { $query->whereMonth('tanggal_produksi', $request->bulan); @@ -79,7 +78,7 @@ public function index(Request $request) public function store(Request $request) { - $request->validate([ + $validator = Validator::make($request->all(), [ 'kandang_id' => 'required|exists:kandang,id', 'shift' => 'required|in:pagi,sore', 'berat_telur_layak' => 'required|regex:/^\d{1,6}(\.\d{1,2})?$/', @@ -103,15 +102,23 @@ public function store(Request $request) 'tanggal_produksi.before_or_equal' => 'Tanggal tidak boleh melebihi hari ini.', ]); + if ($validator->fails()) { + return redirect()->route('hasil') + ->withErrors($validator) + ->withInput() + ->with('form', 'tambah'); + } - $total = $request->berat_telur_layak + $request->berat_telur_rusak; + $layak = (float) $request->berat_telur_layak; + $rusak = (float) $request->berat_telur_rusak; + $total = $layak + $rusak; ProduksiTelur::create([ 'kandang_id' => $request->kandang_id, 'user_id' => Auth::id(), 'shift' => $request->shift, - 'berat_telur_layak' => $request->berat_telur_layak, - 'berat_telur_rusak' => $request->berat_telur_rusak, + 'berat_telur_layak' => $layak, + 'berat_telur_rusak' => $rusak, 'berat_telur_total' => $total, 'tanggal_produksi' => $request->tanggal_produksi, ]); @@ -123,7 +130,7 @@ public function store(Request $request) public function update(Request $request, $id) { - $request->validate([ + $validator = Validator::make($request->all(), [ 'kandang_id' => 'required|exists:kandang,id', 'shift' => 'required|in:pagi,sore', 'berat_telur_layak' => 'required|regex:/^\d{1,6}(\.\d{1,2})?$/', @@ -150,20 +157,29 @@ public function update(Request $request, $id) 'tanggal_produksi.before_or_equal' => 'Tanggal tidak boleh melebihi hari ini.', ]); + if ($validator->fails()) { + return redirect()->route('hasil') + ->withErrors($validator) + ->withInput() + ->with('form', 'edit') + ->with('edit_id', $id); + } - $total = $request->berat_telur_layak + $request->berat_telur_rusak; + $layak = (float) $request->berat_telur_layak; + $rusak = (float) $request->berat_telur_rusak; + $total = $layak + $rusak; ProduksiTelur::findOrFail($id)->update([ 'kandang_id' => $request->kandang_id, 'shift' => $request->shift, - 'berat_telur_layak' => $request->berat_telur_layak, - 'berat_telur_rusak' => $request->berat_telur_rusak, + 'berat_telur_layak' => $layak, + 'berat_telur_rusak' => $rusak, 'berat_telur_total' => $total, 'tanggal_produksi' => $request->tanggal_produksi, ]); return redirect()->route('hasil') - ->with('success', 'Data produksi berhasil diperbarui.'); + ->with('success', 'Data berhasil diupdate.'); } diff --git a/bootstrap/app.php b/bootstrap/app.php index c183276..4f42cc1 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -3,16 +3,32 @@ use Illuminate\Foundation\Application; use Illuminate\Foundation\Configuration\Exceptions; use Illuminate\Foundation\Configuration\Middleware; +use Illuminate\Support\Facades\Auth; +use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; return Application::configure(basePath: dirname(__DIR__)) ->withRouting( - web: __DIR__.'/../routes/web.php', - commands: __DIR__.'/../routes/console.php', + web: __DIR__ . '/../routes/web.php', + commands: __DIR__ . '/../routes/console.php', health: '/up', ) ->withMiddleware(function (Middleware $middleware): void { // }) ->withExceptions(function (Exceptions $exceptions): void { - // + + // 405 - Method tidak sesuai + $exceptions->render(function (MethodNotAllowedHttpException $e, $request) { + if (!Auth::check()) { + return redirect()->route('login'); + } + }); + + // 404 - URL tidak ditemukan / diisengi + $exceptions->render(function (NotFoundHttpException $e, $request) { + if (!Auth::check()) { + return redirect()->route('login'); + } + }); })->create(); diff --git a/resources/views/produksi-hasil.blade.php b/resources/views/produksi-hasil.blade.php index 61d19e6..c1df21f 100644 --- a/resources/views/produksi-hasil.blade.php +++ b/resources/views/produksi-hasil.blade.php @@ -288,44 +288,78 @@ class="form-control @error('tanggal_produksi') is-invalid @enderror"
+
- + @foreach ($kandang as $k) - + @endforeach + + @error('kandang_id') + {{ $message }} + @enderror
+
- + + + + + @error('shift') + {{ $message }} + @enderror
+
- + + @error('berat_telur_layak') + {{ $message }} + @enderror
+
- + + @error('berat_telur_rusak') + {{ $message }} + @enderror
+
- + + + @error('tanggal_produksi') + {{ $message }} + @enderror
@@ -391,52 +425,73 @@ function autoSubmit() { $('#formFilter').submit(); }); -function formatBerat(angka) { - if (!angka && angka !== 0) return ''; + function formatBerat(angka) { + if (!angka && angka !== 0) return ''; - let num = Number(angka); + let num = Number(angka); - if (Number.isInteger(num)) { - return num.toString(); // contoh: 10 tetap 10 - } + if (Number.isInteger(num)) { + return num.toString(); // contoh: 10 tetap 10 + } - return num.toFixed(2).replace(/\.?0+$/, ''); // contoh: 10.50 → 10.5 -} + return num.toFixed(2).replace(/\.?0+$/, ''); // contoh: 10.50 → 10.5 + } /* MODAL EDIT */ $('#modalEditProduksi').on('show.bs.modal', function(e) { - let btn = $(e.relatedTarget); - let id = btn.data('id'); + let btn = $(e.relatedTarget); + let id = btn.data('id'); - let url = "{{ route('hasil.update', ':id') }}"; - url = url.replace(':id', id); + let url = "{{ route('hasil.update', ':id') }}"; + url = url.replace(':id', id); - $('#formEdit').attr('action', url); + $('#formEdit').attr('action', url); - $('#formEdit [name=kandang_id]').val(btn.data('kandang')); - $('#formEdit [name=shift]').val(btn.data('shift')); - $('#formEdit [name=berat_telur_layak]').val(formatBerat(btn.data('layak') ?? 0)); - $('#formEdit [name=berat_telur_rusak]').val(formatBerat(btn.data('rusak') ?? 0)); - $('#formEdit [name=tanggal_produksi]').val(btn.data('tanggal')); -}); + $('#formEdit [name=kandang_id]').val(btn.data('kandang')); + $('#formEdit [name=shift]').val(btn.data('shift')); + $('#formEdit [name=berat_telur_layak]').val(formatBerat(btn.data('layak') ?? 0)); + $('#formEdit [name=berat_telur_rusak]').val(formatBerat(btn.data('rusak') ?? 0)); + $('#formEdit [name=tanggal_produksi]').val(btn.data('tanggal')); + }); /* MODAL HAPUS */ $('#modalHapusProduksi').on('show.bs.modal', function(e) { - let btn = $(e.relatedTarget); - let id = btn.data('id'); + let btn = $(e.relatedTarget); + let id = btn.data('id'); - let url = "{{ route('hasil.destroy', ':id') }}"; - url = url.replace(':id', id); + let url = "{{ route('hasil.destroy', ':id') }}"; + url = url.replace(':id', id); - $('#formHapus').attr('action', url); -}); + $('#formHapus').attr('action', url); + }); /*AUTO OPEN MODAL JIKA ERROR */ @if ($errors->any()) $(document).ready(function() { - $('#modalTambahProduksi').modal('show'); + + let form = "{{ session('form') }}"; + + if (form === 'edit') { + let editId = "{{ session('edit_id') }}"; + $('#modalEditProduksi').modal('show'); + + // langsung pakai old() untuk isi form + $('#formEdit [name=kandang_id]').val("{{ old('kandang_id') }}"); + $('#formEdit [name=shift]').val("{{ old('shift') }}"); + $('#formEdit [name=berat_telur_layak]').val("{{ old('berat_telur_layak') }}"); + $('#formEdit [name=berat_telur_rusak]').val("{{ old('berat_telur_rusak') }}"); + $('#formEdit [name=tanggal_produksi]').val("{{ old('tanggal_produksi') }}"); + + // set action form edit + let url = "{{ route('hasil.update', ':id') }}".replace(':id', editId); + $('#formEdit').attr('action', url); + + } else { + $('#modalTambahProduksi').modal('show'); + } + }); @endif diff --git a/resources/views/template.blade.php b/resources/views/template.blade.php index fabfbf4..24ee85d 100644 --- a/resources/views/template.blade.php +++ b/resources/views/template.blade.php @@ -6,12 +6,12 @@ - + - - - + + + @@ -224,19 +224,19 @@ class="d-none d-sm-inline font-weight-bold text-dark">{{ auth()->user()->name }} @yield('content') - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/routes/web.php b/routes/web.php index 04293b8..198c52a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -99,3 +99,8 @@ Route::get('/laporan/export', [LaporanController::class, 'export'])->name('laporan.export'); }); }); +Route::fallback(function () { + return Auth::check() + ? abort(404) + : redirect()->route('login'); +});