Probindo/database-pertani-web
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.probindo.com/Probindo/database-pertani-web

Browse Source
This commit is contained in:
Althaf
2026-05-06 11:45:28 +07:00
parent 2dd13aa873 6fdd573a79
commit 9605ae7502
7 changed files with 109 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Ekosistem/PetaniCPMController.php
+83 -7
View File
@@ -13,6 +13,7 @@ use Illuminate\Http\JsonResponse;
use App\Models\Ekosistem\PetaniCPM;
use App\Models\Wilayah\Provinsi;
use App\Models\Pertanian\Komoditas;
use App\Models\Core\Program;
use App\Enums\Pendidikan;
use App\Enums\Pekerjaan;
@@ -30,15 +31,34 @@ class PetaniCPMController extends Controller
$perPage = $request->query('per_page', 10);
$search = strtolower($request->query('search', ''));
$program = null;
$programList = Program::get();
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {
if ($request->has('program_id') && $request->query('program_id')) {
$programId = $request->query('program_id');
$program = Program::find($programId);
if (!$program) {
abort(400, 'Program tidak ditemukan.');
}
}
}
$petani = PetaniCPM::when($search, function ($query, $search) {
return $query->where('nama', 'like', "%{$search}%");
})
->when($program, function ($query) use ($program) {
return $query->where('program_id', $program->id);
})
->paginate($perPage);
return view('ekosistem.petani-cpm.index', compact('petani'));
return view('ekosistem.petani-cpm.index', compact('petani', 'program', 'programList'));
}
public function create(): View
public function create(Request $request): View
{
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
abort(403);
@@ -52,8 +72,21 @@ class PetaniCPMController extends Controller
$provinsi = Provinsi::all();
$komoditas = Komoditas::all();
$program = null;
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {
if ($request->has('program_id') && $request->query('program_id')) {
$programId = $request->query('program_id');
$program = Program::find($programId);
}
}
if (!$program) {
abort(400, 'Program tidak ditemukan.');
}
return view('ekosistem.petani-cpm.add', compact('pendidikan', 'pekerjaan',
'pernikahan', 'statusKeluarga', 'provinsi', 'komoditas'));
'pernikahan', 'statusKeluarga', 'provinsi', 'komoditas', 'program'));
}
/**
@@ -65,6 +98,20 @@ class PetaniCPMController extends Controller
abort(403);
}
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {
if ($request->has('program_id') && $request->query('program_id')) {
$programId = $request->query('program_id');
$program = Program::find($programId);
if (!$program) {
abort(400, 'Program tidak ditemukan.');
}
} else {
abort(400, 'Program tidak ditemukan.');
}
}
$validatedData = $request->validate([
'nama' => ['required','string','max:255'],
'jenis_kelamin' => ['required','boolean'],
@@ -88,16 +135,17 @@ class PetaniCPMController extends Controller
]);
PetaniCPM::create([...$validatedData,
'program_id' => $program->id,
'created_by' => auth()->id(),
'updated_by' => auth()->id()]);
return redirect()->route('petani-cpm.index')->with('success', 'Data petani CPM berhasil ditambahkan.');
return redirect()->route('petani-cpm.index', ['program_id' => $program->id])->with('success', 'Data petani CPM berhasil ditambahkan.');
}
/**
* Display the specified resource.
*/
public function show(string $id)
public function show(string $id): View
{
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
abort(403);
@@ -111,12 +159,26 @@ class PetaniCPMController extends Controller
/**
* Show the form for editing the specified resource.
*/
public function edit(string $id)
public function edit(Request $request, string $id): View
{
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
abort(403);
}
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {
if ($request->has('program_id') && $request->query('program_id')) {
$programId = $request->query('program_id');
$program = Program::find($programId);
if (!$program) {
abort(400, 'Program tidak ditemukan.');
}
} else {
abort(400, 'Program tidak ditemukan.');
}
}
$petani = PetaniCPM::findOrFail($id);
$pendidikan = Pendidikan::options();
@@ -128,7 +190,7 @@ class PetaniCPMController extends Controller
$komoditas = Komoditas::all();
return view('ekosistem.petani-cpm.edit', compact('petani', 'pendidikan', 'pekerjaan',
'pernikahan', 'statusKeluarga', 'provinsi', 'komoditas'));
'pernikahan', 'statusKeluarga', 'provinsi', 'komoditas', 'program'));
}
/**
@@ -140,6 +202,20 @@ class PetaniCPMController extends Controller
abort(403);
}
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {
if ($request->has('program_id') && $request->query('program_id')) {
$programId = $request->query('program_id');
$program = Program::find($programId);
if (!$program) {
abort(400, 'Program tidak ditemukan.');
}
} else {
abort(400, 'Program tidak ditemukan.');
}
}
$petani = PetaniCPM::findOrFail($id);
$validatedData = $request->validate([
app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
+1
View File
@@ -150,6 +150,7 @@ class ValueBasisDataController extends Controller
abort(404, 'Data kolom tidak ditemukan untuk tabel ini.');
}
$program = null;
if (app()->has('SystemProgram')) {
$program = app('SystemProgram');
} else {