diff --git a/app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php b/app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php index 062df77..24729b0 100644 --- a/app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php +++ b/app/Http/Controllers/Web/Dashboard/DemografiPetaniController.php @@ -24,8 +24,7 @@ class DemografiPetaniController extends Controller ->count('komoditas_id'); $totalLuasLahan = Lahan::has('petani') ->sum('luas_lahan'); - $ratarataLuasLahan = Lahan::has('petani') - ->avg('luas_lahan'); + $ratarataLuasLahan = $totalLuasLahan && $totalPetani ? $totalLuasLahan / $totalPetani : 0; $umurKurang30 = Petani::whereNotNull('tanggal_lahir')->whereRaw("EXTRACT(YEAR FROM AGE(CURRENT_DATE, tanggal_lahir)) < 30")->count(); $umur30sampai39 = Petani::whereNotNull('tanggal_lahir')->whereRaw("EXTRACT(YEAR FROM AGE(CURRENT_DATE, tanggal_lahir)) BETWEEN 30 AND 39")->count(); diff --git a/resources/views/dashboard/demografi-petani.blade.php b/resources/views/dashboard/demografi-petani.blade.php index d34e50b..a0a5994 100644 --- a/resources/views/dashboard/demografi-petani.blade.php +++ b/resources/views/dashboard/demografi-petani.blade.php @@ -3,6 +3,30 @@ @push('styles') @endpush @section('content')
-
+
-
-
- +
+ +
+ + +
-

{{ $data['total_petani'] }}

+ +
+
+

+ {{ $data['total_petani'] }} +

+ + + petani + +
+ +

+ Total Petani +

+ + + Petani yang telah terdata + +
+
-

Total Petani

+
+
+
+ - Terdata + {{ $data['total_petani'] > 0 ? round(($data['petani_lakilaki'] / $data['total_petani']) * 100) : 0 }}% + Dari Total Petani

-
-
-
-
-
-
-
-
-

{{ $data['petani_lakilaki'] }}

+
+
+
+
+
+
+ +
+

{{ $data['petani_perempuan'] }}

+
+

Petani Perempuan

+

+ {{ $data['total_petani'] > 0 ? round(($data['petani_perempuan'] / $data['total_petani']) * 100) : 0 }}% + Dari Total Petani +

-

Petani Laki-laki

-

- {{ $data['total_petani'] > 0 ? round(($data['petani_lakilaki'] / $data['total_petani']) * 100) : 0 }}% - Dari Total Petani -

-
-
-
-
-
-
-
-
-
-

{{ $data['petani_perempuan'] }}

-
-

Petani Perempuan

-

- {{ $data['total_petani'] > 0 ? round(($data['petani_perempuan'] / $data['total_petani']) * 100) : 0 }}% - Dari Total Petani -

-
-
-
+ --> +
-
-
-
- +
+
+ +
+ + + +
+ +
+
+

+ {{ $data['total_komoditas'] }} +

+ + + komoditas + +
+ +

+ Total Komoditas +

+ + + Komoditas utama yang dikelola petani + +
+ +
-

{{ $data['total_komoditas'] }}

-
-

Total Komoditas

-

- - Dari Seluruh Petani -

-
-
+
-
-
-
- +
+ +
+ +
+ +
+ + + +
+ +
+
+

+ {{ number_format($data['total_luas_lahan'], 2) }} +

+ + + ha + +
+ +

+ Total Luas Lahan +

+ + + Seluruh lahan petani + +
+ +
+ +
+
+ {{ number_format($data['ratarata_luas_lahan'], 2) }} + + ha + +
+ + + Rata-rata +
+ per Petani + +
+ +
+
-

{{ $data['total_luas_lahan'] }}

-
-

Total Luas Lahan

-

- {{ $data['ratarata_luas_lahan'] ? number_format($data['ratarata_luas_lahan'], 2) : 0 }} - Rata-rata per Lahan -

-
@@ -287,11 +385,11 @@ @if ($petani->jenis_kelamin == 1) - + Laki-laki @else - + Perempuan @endif @@ -413,8 +511,8 @@ document.addEventListener('DOMContentLoaded', function () { series: [lakiLaki, perempuan], colors: [ - config.colors.primary, - config.colors.secondary + config.colors.info, + '#ff5598' ], stroke: { width: 0},