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

soft deleted petani

Browse Source
This commit is contained in:
irwan.l.cahyono
2026-08-07 15:00:30 +07:00
parent 04387268cd
commit ba1a318d09
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Dashboard/IndeksPetaniController.php
+6
View File
@@ -45,6 +45,7 @@ class IndeksPetaniController extends Controller
$avgSkor = SkorPetani::query() $avgSkor = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->whereIn('petani.komoditas_id', $komoditas->pluck('id')) ->whereIn('petani.komoditas_id', $komoditas->pluck('id'))
->avg('skor_kesiapan_adopsi'); ->avg('skor_kesiapan_adopsi');
@@ -72,6 +73,7 @@ class IndeksPetaniController extends Controller
$countSegmentasiByKomoditas = SkorPetani::query() $countSegmentasiByKomoditas = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->selectRaw(" ->selectRaw("
petani.komoditas_id, petani.komoditas_id,
$case AS segmen, $case AS segmen,
@@ -83,6 +85,7 @@ class IndeksPetaniController extends Controller
$avgDimensi = SkorPetani::query() $avgDimensi = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->whereIn('petani.komoditas_id', $komoditas->pluck('id')) ->whereIn('petani.komoditas_id', $komoditas->pluck('id'))
->selectRaw(" ->selectRaw("
avg(skor_d2_sistem_praktik_budidaya) as skor_d2_sistem_praktik_budidaya, avg(skor_d2_sistem_praktik_budidaya) as skor_d2_sistem_praktik_budidaya,
@@ -92,6 +95,7 @@ class IndeksPetaniController extends Controller
$avgKomponen = SkorPetani::query() $avgKomponen = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->whereIn('petani.komoditas_id', $komoditas->pluck('id')) ->whereIn('petani.komoditas_id', $komoditas->pluck('id'))
->selectRaw("avg(skor_komp_1_d4_k3_motivasi_kapasitas_adopsi) as skor_komp_1_d4_k3_motivasi_kapasitas_adopsi, ->selectRaw("avg(skor_komp_1_d4_k3_motivasi_kapasitas_adopsi) as skor_komp_1_d4_k3_motivasi_kapasitas_adopsi,
avg(skor_komp_2_d4_k2_ekonomi_rumah_tangga) as skor_komp_2_d4_k2_ekonomi_rumah_tangga, avg(skor_komp_2_d4_k2_ekonomi_rumah_tangga) as skor_komp_2_d4_k2_ekonomi_rumah_tangga,
@@ -123,6 +127,7 @@ class IndeksPetaniController extends Controller
$mapSegmentasi = SkorPetani::query() $mapSegmentasi = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->selectRaw("petani.desa_kelurahan_id, ->selectRaw("petani.desa_kelurahan_id,
$case AS segmen, $case AS segmen,
COUNT(petani.id) AS total COUNT(petani.id) AS total
@@ -133,6 +138,7 @@ class IndeksPetaniController extends Controller
$mapAvgSkorSegmentasi = SkorPetani::query() $mapAvgSkorSegmentasi = SkorPetani::query()
->join('petani', 'petani_skor.petani_id', '=', 'petani.id') ->join('petani', 'petani_skor.petani_id', '=', 'petani.id')
->whereNull('petani.deleted_at')
->selectRaw("petani.desa_kelurahan_id, ->selectRaw("petani.desa_kelurahan_id,
COUNT(petani.id) AS jumlah_petani, COUNT(petani.id) AS jumlah_petani,
avg(skor_kesiapan_adopsi) AS skor, avg(skor_kesiapan_adopsi) AS skor,
routes/web.php
+1 -1
View File
@@ -48,7 +48,7 @@ Route::middleware('auth')
Route::get('/dashboard/bumdes', [App\Http\Controllers\Web\Bumdes\PengurusBumdesController::class, 'index'])->name('dashboard.bumdes'); Route::get('/dashboard/bumdes', [App\Http\Controllers\Web\Bumdes\PengurusBumdesController::class, 'index'])->name('dashboard.bumdes');
Route::get('/dashboard/petani/demografi', [App\Http\Controllers\Web\Dashboard\DemografiPetaniController::class, 'index'])->name('dashboard.demografi-petani'); Route::get('/dashboard/petani/demografi', [App\Http\Controllers\Web\Dashboard\DemografiPetaniController::class, 'index'])->name('dashboard.demografi-petani');
Route::get('/dashboard/indeks-petani', [App\Http\Controllers\Web\Dashboard\IndeksPetaniController::class, 'index'])->name('dashboard.indeks-petani'); Route::get('/dashboard/petani/indeks', [App\Http\Controllers\Web\Dashboard\IndeksPetaniController::class, 'index'])->name('dashboard.indeks-petani');
Route::get('/user-profile', [App\Http\Controllers\Web\Konfigurasi\ProfileController::class, 'index'])->name('userProfile.index'); Route::get('/user-profile', [App\Http\Controllers\Web\Konfigurasi\ProfileController::class, 'index'])->name('userProfile.index');
Route::get('/user-profile/security', [App\Http\Controllers\Web\Konfigurasi\ProfileController::class, 'security'])->name('userProfile.security'); Route::get('/user-profile/security', [App\Http\Controllers\Web\Konfigurasi\ProfileController::class, 'security'])->name('userProfile.security');