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

revisi jumlahpetani

Browse Source
This commit is contained in:
irwan.l.cahyono
2026-08-19 01:57:52 +07:00
parent 8fbf68e6ef
commit 530c297b53
5 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php
+5
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Web\Dashboard;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use App\Models\Pertanian\Petani;
use App\Models\Pertanian\Komoditas;
@@ -15,6 +16,10 @@ class DemografiPetaniController extends Controller
{
public function index(Request $request)
{
if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
abort(403);
}
$petaniCounts = Petani::selectRaw("
COUNT(*) as total,
COUNT(*) FILTER (WHERE jenis_kelamin = true) as laki,
app/Http/Controllers/Web/Dashboard/IndikatorPertanianController.php
+2 -1
View File
@@ -103,7 +103,8 @@ class IndikatorPertanianController extends Controller
private function summaryData(array $filters): array
{
$totalPetani = $this->applyPetaniFilters(Petani::query(), $filters)->count();
$totalLuasLahan = ((float) $this->applyLahanFilters(Lahan::query(), $filters)->sum('luas_lahan')) / 10000;
// $totalLuasLahan = ((float) $this->applyLahanFilters(Lahan::query(), $filters)->sum('luas_lahan')) / 10000;
$totalLuasLahan = $this->applyLahanFilters(Lahan::has('petani'), $filters)->sum('luas_lahan');
$rataRataLuasLahan = $totalPetani > 0
? $totalLuasLahan / $totalPetani
: 0;
app/Http/Controllers/Web/Dashboard/SurveyPetaniController.php
+5 -3
View File
@@ -63,7 +63,8 @@ class SurveyPetaniController extends Controller
->orderByDesc('petani_count')
->get();
$totalPetani = (int) $komoditasCollection->sum('petani_count');
// $totalPetani = (int) $komoditasCollection->sum('petani_count');
$totalPetani = Petani::count();
$circumference = 2 * pi() * 46;
$komoditas = $komoditasCollection
@@ -144,8 +145,9 @@ class SurveyPetaniController extends Controller
// Ringkasan lahan
$totalLuasLahan = ((float) Lahan::query()
->sum('luas_lahan')) / 10000;
// $totalLuasLahan = ((float) Lahan::query()
// ->sum('luas_lahan')) / 10000;
$totalLuasLahan = Lahan::has('petani')->sum('luas_lahan');
// Jumlah tanaman berdasarkan komoditas petani