perbaikan filter kesehatan

app/Exports/ExportAKIAKB.php

@@ -109,7 +109,7 @@ public function map($akiAkb): array
 
         return [
             $akiAkb->id,
-            $akiAkb->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($akiAkb->desa_id) ?? 'Tidak Diketahui',
             $akiAkb->desa_id,
             $akiAkb->aki,
             $akiAkb->akb,

app/Exports/ExportEpidemiPenyakit.php

@@ -80,7 +80,7 @@ public function map($epidemiPenyakit): array
     {
         return [
             $epidemiPenyakit->id,
-            $epidemiPenyakit->desa->nama ?? '',
+            nama_desa($epidemiPenyakit->desa_id) ?? '',
             $epidemiPenyakit->penyakit->nama ?? '',
             $epidemiPenyakit->jumlah_penderita,
             months_list()[$epidemiPenyakit->bulan] ?? $epidemiPenyakit->bulan,

app/Exports/ExportFasilitasPaud.php

@@ -81,7 +81,7 @@ public function map($fasilitasPaud): array
     {
         return [
             $fasilitasPaud->id,
-            $fasilitasPaud->desa->nama ?? '',
+            nama_desa($fasilitasPaud->desa_id) ?? '',
             $fasilitasPaud->jumlah_paud,
             $fasilitasPaud->jumlah_guru_paud,
             $fasilitasPaud->jumlah_siswa_paud,

app/Exports/ExportImunisasi.php

@@ -82,7 +82,7 @@ public function map($imunisasi): array
 
         return [
             $imunisasi->id,
-            $imunisasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($imunisasi->desa_id) ?? 'Tidak Diketahui',
             $imunisasi->desa_id,
             $imunisasi->cakupan_imunisasi, // Format dengan persen
             $bulanList[$imunisasi->bulan] ?? 'Tidak Diketahui',

app/Exports/ExportPutusSekolah.php

@@ -86,7 +86,7 @@ public function map($putusSekolah): array
     {
         return [
             $putusSekolah->id,
-            $putusSekolah->desa->nama ?? '',
+            nama_desa($putusSekolah->desa_id) ?? '',
             $putusSekolah->siswa_paud,
             $putusSekolah->anak_usia_paud,
             $putusSekolah->siswa_sd,

app/Exports/ExportTingkatPendidikan.php

@@ -83,7 +83,7 @@ public function map($tingkatPendidikan): array
     {
         return [
             $tingkatPendidikan->id,
-            $tingkatPendidikan->desa->nama ?? '',
+            nama_desa($tingkatPendidikan->desa_id) ?? '',
             $tingkatPendidikan->tidak_tamat_sekolah,
             $tingkatPendidikan->tamat_sd,
             $tingkatPendidikan->tamat_smp,

app/Exports/ExportToiletSanitasi.php

@@ -83,7 +83,7 @@ public function map($toiletSanitasi): array
 
         return [
             $toiletSanitasi->id,
-            $toiletSanitasi->desa->nama ?? 'Tidak Diketahui',
+            nama_desa($toiletSanitasi->desa_id) ?? 'Tidak Diketahui',
             $toiletSanitasi->desa_id,
             $toiletSanitasi->toilet,
             $toiletSanitasi->sanitasi,

app/Http/Controllers/Data/AKIAKBController.php

@@ -34,6 +34,7 @@
 use App\Exports\ExportAKIAKB;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportAKIAKBRequest;
+use App\Http\Requests\UpdateAKIAKBRequest;
 use App\Imports\ImporAKIAKB;
 use App\Models\AkiAkb;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(AkiAkb::with(['desa'])->get())
+        return DataTables::of(AkiAkb::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.aki_akb.edit') ? route('data.aki-akb.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.aki_akb.delete') ? route('data.aki-akb.destroy', $row->id) : null;

app/Http/Controllers/Data/FasilitasPaudController.php

@@ -34,8 +34,10 @@
 use App\Exports\ExportFasilitasPaud;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportFasilitasPaudRequest;
+use App\Http\Requests\UpdateFasilitasPaudRequest;
 use App\Imports\ImporFasilitasPaud;
 use App\Models\FasilitasPAUD;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataFasilitasPAUD()
     {
-        return DataTables::of(FasilitasPAUD::with(['desa'])->get())
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(FasilitasPAUD::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.fasilitas_paud.edit') ? route('data.fasilitas-paud.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.fasilitas_paud.delete') ? route('data.fasilitas-paud.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $fasilitas = FasilitasPAUD::with(['desa'])->findOrFail($id);
         $page_title = 'Fasilitas PAUD';
-        $page_description = 'Ubah Fasilitas PAUD : Desa ' . $fasilitas->desa->nama;
+        $page_description = 'Ubah Fasilitas PAUD : Desa ' . nama_desa($fasilitas->desa_id);
 
         return view('data.fasilitas_paud.edit', compact('page_title', 'page_description', 'fasilitas'));
     }
@@ -127,18 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateFasilitasPaudRequest $request, $id)
     {
-        request()->validate([
-            'jumlaah_paud' => 'required',
-            'jumlah_guru_paud' => 'required',
-            'jumlah_siswa_paud' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            FasilitasPAUD::findOrFail($id)->update($request->all());
+            FasilitasPAUD::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Fasilitas PAUD update failed', [
                 'error' => $e->getMessage(),

app/Http/Controllers/Data/ImunisasiController.php

@@ -65,8 +65,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(Imunisasi::with(['desa'])->get())
+        return DataTables::of(Imunisasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa'])->get())
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.imunisasi.edit') ? route('data.imunisasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.imunisasi.delete') ? route('data.imunisasi.destroy', $row->id) : null;

app/Http/Controllers/Data/PutusSekolahController.php

@@ -34,8 +34,10 @@
 use App\Exports\ExportPutusSekolah;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportPutusSekolahRequest;
+use App\Http\Requests\UpdatePutusSekolahRequest;
 use App\Imports\ImporPutusSekolah;
 use App\Models\PutusSekolah;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -59,12 +61,18 @@ public function index()
      */
     public function getDataPutusSekolah()
     {
-        return DataTables::of(PutusSekolah::with(['desa'])->get())
-            ->addColumn('aksi', function ($row) {
+        $desa = request()->input('desa');
+        $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
+        return DataTables::of(PutusSekolah::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+                    return $query->where('desa_id', $desa);
+                })->with(['desa'])->get())
+            ->addColumn('aksi', function ($row) {                
                 $data['edit_url'] = auth()->user()->can('access.data.putus_sekolah.edit') ? route('data.putus-sekolah.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.putus_sekolah.delete') ? route('data.putus-sekolah.destroy', $row->id) : null;
 
                 return view('forms.aksi', $data);
+            })->addColumn('nama_desa', function ($row) use ($listDesa) {
+                return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
             })
             ->rawColumns(['aksi'])->make();
     }
@@ -116,7 +124,7 @@ public function edit($id)
     {
         $siswa = PutusSekolah::with(['desa'])->findOrFail($id);
         $page_title = 'Siswa Putus Sekolah';
-        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . $siswa->desa->nama;
+        $page_description = 'Ubah Siswa Putus Sekolah : Desa ' . nama_desa($siswa->desa_id);
 
         return view('data.putus_sekolah.edit', compact('page_title', 'page_description', 'siswa'));
     }
@@ -127,23 +135,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdatePutusSekolahRequest $request, $id)
     {
-        request()->validate([
-            'siswa_paud' => 'required',
-            'anak_usia_paud' => 'required',
-            'siswa_sd' => 'required',
-            'anak_usia_sd' => 'required',
-            'siswa_smp' => 'required',
-            'anak_usia_smp' => 'required',
-            'siswa_sma' => 'required',
-            'anak_usia_sma' => 'required',
-            'semester' => 'required',
-            'tahun' => 'required',
-        ]);
-
         try {
-            PutusSekolah::findOrFail($id)->update($request->all());
+            PutusSekolah::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Putus Sekolah update failed', [
                 'error' => $e->getMessage(),

app/Http/Controllers/Data/TingkatPendidikanController.php

@@ -36,6 +36,7 @@
 use App\Http\Requests\TingkatPendidikanRequest;
 use App\Imports\ImporTingkatPendidikan;
 use App\Models\TingkatPendidikan;
+use App\Services\DesaService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Log;
@@ -61,7 +62,7 @@ public function getData()
     {
         if (request()->ajax()) {
             $desa = request()->input('desa');
-
+            $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
             return DataTables::of(
                 TingkatPendidikan::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
                     return $query->where('desa_id', $desa);
@@ -74,6 +75,9 @@ public function getData()
 
                     return view('forms.aksi', $data);
                 })
+                ->addColumn('nama_desa', function ($row) use ($listDesa) {
+                    return $row->desa->nama ?? $listDesa[$row->desa_id] ?? '-';
+                })
                 ->rawColumns(['aksi'])
                 ->make();
         }

app/Http/Controllers/Data/ToiletSanitasiController.php

@@ -34,6 +34,7 @@
 use App\Exports\ExportToiletSanitasi;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImportToiletSanitasiRequest;
+use App\Http\Requests\UpdateToiletSanitasiRequest;
 use App\Imports\ImporToiletSanitasi;
 use App\Models\ToiletSanitasi;
 use App\Services\DesaService;
@@ -65,8 +66,12 @@ public function index()
      */
     public function getDataAKIAKB()
     {
+        $desa = request()->input('desa');
         $listDesa = (new DesaService)->listDesa()->pluck('nama', 'desa_id');
-        return DataTables::of(ToiletSanitasi::with(['desa']))
+        return DataTables::of(ToiletSanitasi::when($desa && $desa !== 'Semua', function ($query) use ($desa) {
+            return $query->where('desa_id', $desa);
+        })
+            ->with(['desa']))
             ->addColumn('aksi', function ($row) {
                 $data['edit_url'] = auth()->user()->can('access.data.toilet_sanitasi.edit') ? route('data.toilet-sanitasi.edit', $row->id) : null;
                 $data['delete_url'] = auth()->user()->can('access.data.toilet_sanitasi.delete') ? route('data.toilet-sanitasi.destroy', $row->id) : null;
@@ -114,7 +119,7 @@ public function do_import(ImportToiletSanitasiRequest $request)
             return back()->with('error', 'Import data gagal.');
         }
 
-        return back()->with('success', 'Import data sukses.');
+        return redirect()->route('data.toilet_sanitasi.index')->with('success', 'Data berhasil diimpor!');        
     }
 
     /**
@@ -127,7 +132,7 @@ public function edit($id)
     {
         $toilet = ToiletSanitasi::with(['desa'])->findOrFail($id);
         $page_title = 'Toilet & Sanitasi';
-        $page_description = 'Ubah Toilet & Sanitasi : ' . $toilet->desa->nama;
+        $page_description = 'Ubah Toilet & Sanitasi : ' . nama_desa($toilet->desa_id);
 
         return view('data.toilet_sanitasi.edit', compact('page_title', 'page_description', 'toilet'));
     }
@@ -138,15 +143,10 @@ public function edit($id)
      * @param  int  $id
      * @return Response
      */
-    public function update(Request $request, $id)
+    public function update(UpdateToiletSanitasiRequest $request, $id)
     {
-        request()->validate([
-            'toilet' => 'required',
-            'sanitasi' => 'required',
-        ]);
-
         try {
-            ToiletSanitasi::findOrFail($id)->update($request->all());
+            ToiletSanitasi::findOrFail($id)->update($request->validated());
         } catch (\Exception $e) {
             Log::error('Toilet Sanitasi update failed', [
                 'error' => $e->getMessage(),

app/Http/Requests/UpdateAKIAKBRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateAKIAKBRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'aki' => 'required|integer',
+            'akb' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'aki.required' => 'Jumlah AKI wajib diisi.',
+            'akb.required' => 'Jumlah AKB wajib diisi.',
+        ];
+    }
+}

app/Http/Requests/UpdateFasilitasPaudRequest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateFasilitasPaudRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'jumlah_paud' => 'required|integer',
+            'jumlah_guru_paud' => 'required|integer',
+            'jumlah_siswa_paud' => 'required|integer',
+            'semester' => 'required|integer',
+            'tahun' => 'required|integer',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'jumlah_paud.required' => 'Jumlah PAUD wajib diisi.',
+            'jumlah_guru_paud.required' => 'Jumlah guru PAUD wajib diisi.',
+            'jumlah_siswa_paud.required' => 'Jumlah siswa PAUD wajib diisi.',
+            'semester.required' => 'Semester wajib diisi.',
+            'tahun.required' => 'Tahun wajib diisi.',
+        ];
+    }
+}