diff --git a/app/Http/Controllers/Web/Dashboard/SummaryController.php b/app/Http/Controllers/Web/Dashboard/SummaryController.php index 1ae24d6..77c4982 100644 --- a/app/Http/Controllers/Web/Dashboard/SummaryController.php +++ b/app/Http/Controllers/Web/Dashboard/SummaryController.php @@ -4,13 +4,8 @@ namespace App\Http\Controllers\Web\Dashboard; use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use App\Models\Profile; -use App\Models\Wilayah\Provinsi; -use App\Models\wilayah\KabupatenKota; -use App\Models\Wilayah\Kecamatan; -use App\Models\Wilayah\DesaKelurahan; -use App\Models\Pertanian\Lahan; use Illuminate\Support\Facades\Gate; + class SummaryController extends Controller { public function index() @@ -21,128 +16,4 @@ class SummaryController extends Controller $title = 'Summary Dashboard'; return view('dashboard.summary', compact('title')); } - - public function produktivitasBackup(Request $request) - { - if (!Gate::allows('super_admin') && !Gate::allows('admin')) { - abort(403); - } - $title = 'Produktivitas Dashboard'; - $luasTotal = Lahan::whereNotNull('path')->sum('luas_lahan'); - $totalpetani = Profile::where('role', 'petani')->count(); - $totallahan = Lahan::whereNotNull('path')->count(); - - $petaniList = Profile::where('role', 'petani') - ->with(['lahan.tanaman.komoditas', 'desaKelurahan']) - ->paginate(20); - - $allLahan = Lahan::whereNotNull('path') - ->with(['profile', 'tanaman.komoditas', 'desaKelurahan.kecamatan.kabupatenKota.provinsi']) - ->get() - ->map(function($lahan) { - return [ - 'id' => $lahan->id, - 'polygon' => $lahan->path, - 'nama_petani' => $lahan->profile->nama ?? 'N/A', - 'luas' => $lahan->luas_lahan, - 'tanaman' => $lahan->tanaman->map(fn($t) => $t->komoditas->nama ?? null)->filter()->unique()->values() - ]; - }); - - return view('dashboard.produktivitas', compact('title', 'petaniList', 'allLahan', 'totalpetani', 'totallahan', 'luasTotal')); - } - - public function produktivitas(Request $request) - { - if (!Gate::allows('super_admin') && !Gate::allows('admin')) { - abort(403); - } - - $title = 'Produktivitas Dashboard'; - $luasTotal = Lahan::whereNotNull('path')->sum('luas_lahan'); - $totalpetani = Profile::where('role', 'petani')->count(); - $totallahan = Lahan::whereNotNull('path')->count(); - - $petaniList = Profile::where('role', 'petani') - ->with(['lahan.tanaman.komoditas', 'desaKelurahan']) - ->paginate(20); - - $allLahan = Lahan::whereNotNull('path') - ->with(['profile', 'tanaman.komoditas', 'desaKelurahan.kecamatan.kabupatenKota.provinsi']) - ->get(); - - // Penampung data per level (menggunakan ID sebagai key agar unique) - $geoProvinsi = []; - $geoKabupaten = []; - $geoKecamatan = []; - $geoDesa = []; - $geoLahan = []; - - foreach ($allLahan as $lahan) { - $desa = $lahan->desaKelurahan; - $kec = $desa ? $desa->kecamatan : null; - $kab = $kec ? $kec->kabupatenKota : null; - $prov = $kab ? $kab->provinsi : null; - - // --- Akumulasi Provinsi --- - if ($prov && $prov->path) { - if (!isset($geoProvinsi[$prov->id])) { - $geoProvinsi[$prov->id] = ['id' => $prov->id, 'nama' => $prov->nama, 'polygon' => $prov->path, 'total_lahan' => 0, 'total_luas' => 0]; - } - $geoProvinsi[$prov->id]['total_lahan']++; - $geoProvinsi[$prov->id]['total_luas'] += $lahan->luas_lahan; - } - - // --- Akumulasi Kabupaten --- - if ($kab && $kab->path) { - if (!isset($geoKabupaten[$kab->id])) { - $geoKabupaten[$kab->id] = ['id' => $kab->id, 'parent_id' => $prov->id ?? null, 'nama' => $kab->nama, 'polygon' => $kab->path, 'total_lahan' => 0, 'total_luas' => 0]; - } - $geoKabupaten[$kab->id]['total_lahan']++; - $geoKabupaten[$kab->id]['total_luas'] += $lahan->luas_lahan; - } - - // --- Akumulasi Kecamatan --- - if ($kec && $kec->path) { - if (!isset($geoKecamatan[$kec->id])) { - $geoKecamatan[$kec->id] = ['id' => $kec->id, 'parent_id' => $kab->id ?? null, 'nama' => $kec->nama, 'polygon' => $kec->path, 'total_lahan' => 0, 'total_luas' => 0]; - } - $geoKecamatan[$kec->id]['total_lahan']++; - $geoKecamatan[$kec->id]['total_luas'] += $lahan->luas_lahan; - } - - // --- Akumulasi Desa --- - if ($desa && $desa->path) { - if (!isset($geoDesa[$desa->id])) { - $geoDesa[$desa->id] = ['id' => $desa->id, 'parent_id' => $kec->id ?? null, 'nama' => $desa->nama, 'polygon' => $desa->path, 'total_lahan' => 0, 'total_luas' => 0]; - } - $geoDesa[$desa->id]['total_lahan']++; - $geoDesa[$desa->id]['total_luas'] += $lahan->luas_lahan; - } - - // Data Lahan Tetap - $geoLahan[] = [ - 'id' => $lahan->id, - 'parent_id' => $desa->id ?? null, - 'polygon' => $lahan->path, - 'nama_petani' => $lahan->profile->nama ?? 'N/A', - 'luas' => $lahan->luas_lahan, - 'tanaman' => $lahan->tanaman->map(fn($t) => $t->komoditas->nama ?? null)->filter()->unique()->values() - ]; - } - - return view('dashboard.produktivitas', [ - 'title' => $title, - 'petaniList' => $petaniList, - 'totalpetani' => $totalpetani, - 'totallahan' => $totallahan, - 'luasTotal' => $luasTotal, - // Reset key array agar menjadi format list normal untuk JSON - 'geoProvinsi' => array_values($geoProvinsi), - 'geoKabupaten' => array_values($geoKabupaten), - 'geoKecamatan' => array_values($geoKecamatan), - 'geoDesa' => array_values($geoDesa), - 'geoLahan' => $geoLahan - ]); - } } diff --git a/app/Http/Controllers/Web/Konfigurasi/AuthController.php b/app/Http/Controllers/Web/Konfigurasi/AuthController.php index 63f2f12..ec89fc6 100644 --- a/app/Http/Controllers/Web/Konfigurasi/AuthController.php +++ b/app/Http/Controllers/Web/Konfigurasi/AuthController.php @@ -15,13 +15,13 @@ class AuthController extends Controller public function login() { $title = 'Login'; - return view('konfigurasi.auth.login', compact('title')); + return view('auth.login', compact('title')); } public function register() { $title = 'Register'; - return view('konfigurasi.auth.register', compact('title')); + return view('auth.register', compact('title')); } public function createAccount(Request $request) @@ -42,7 +42,7 @@ class AuthController extends Controller 'deleted_by' => null, ]); - return redirect()->route('konfigurasi.auth.login')->with('success', 'Account created successfully. Please login.'); + return redirect()->route('auth.login')->with('success', 'Account created successfully. Please login.'); } public function verify(User $user) diff --git a/app/Http/Controllers/Web/Konfigurasi/ProfileController.php b/app/Http/Controllers/Web/Konfigurasi/ProfileController.php deleted file mode 100644 index bc91d21..0000000 --- a/app/Http/Controllers/Web/Konfigurasi/ProfileController.php +++ /dev/null @@ -1,21 +0,0 @@ -user()->id; - $profile = Profile::where('user_id', $userid)->first(); - $title = 'Profile'; - return view('konfigurasi.profile.index', compact('title', 'profile')); - } -} diff --git a/app/Models/Pertanian/Lahan.php b/app/Models/Pertanian/Lahan.php index c22ac45..0658438 100644 --- a/app/Models/Pertanian/Lahan.php +++ b/app/Models/Pertanian/Lahan.php @@ -38,22 +38,22 @@ class Lahan extends Model 'path' => 'array', ]; - public function profile() + public function profile(): BelongsTo { return $this->belongsTo(Profile::class, 'profile_id'); } - public function desaKelurahan() + public function desaKelurahan(): BelongsTo { return $this->belongsTo(DesaKelurahan::class, 'desa_kelurahan_id'); } - public function adat() + public function adat(): BelongsTo { return $this->belongsTo(Adat::class, 'adat_pemilik_id'); } - public function tanaman() + public function tanaman(): HasMany { return $this->hasMany(Tanaman::class, 'lahan_id'); } diff --git a/app/Models/Pertanian/Tanaman.php b/app/Models/Pertanian/Tanaman.php index 3ce7eea..8106923 100644 --- a/app/Models/Pertanian/Tanaman.php +++ b/app/Models/Pertanian/Tanaman.php @@ -7,9 +7,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; use App\Models\Pertanian\Komoditas; use App\Models\Pertanian\Lahan; use App\Models\Profile; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; - class Tanaman extends Model { diff --git a/app/Models/Profile.php b/app/Models/Profile.php index d41fed6..2752038 100644 --- a/app/Models/Profile.php +++ b/app/Models/Profile.php @@ -4,11 +4,9 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; + use App\Models\User; -use App\Models\Pertanian\Lahan; use App\Models\Wilayah\DesaKelurahan; -use Illuminate\Database\Eloquent\Relations\HasMany; -use Illuminate\Database\Eloquent\Relations\BelongsTo; class Profile extends Model { @@ -45,9 +43,4 @@ class Profile extends Model { return $this->belongsTo(User::class, 'user_id'); } - - public function lahan(): HasMany - { - return $this->hasMany(Lahan::class, 'profile_id'); - } } diff --git a/app/View/Components/WilayahDashboard.php b/app/View/Components/WilayahDashboard.php new file mode 100644 index 0000000..774251b --- /dev/null +++ b/app/View/Components/WilayahDashboard.php @@ -0,0 +1,70 @@ +count(); + + $provinsiKosong = $totalProvinsi - $provinsiAktif; + + $totalKabupaten = KabupatenKota::whereRaw("SUBSTRING(kode, 3, 2) < '70'")->count(); + $totalKota = KabupatenKota::whereRaw("SUBSTRING(kode, 3, 2) >= '70'")->count(); + + if ($totalKabupaten == 0 && $totalKota == 0 && $totalKabKota > 0) { + $totalKabupaten = $totalKabKota; + } + + $kecamatanPerdesaan = Kecamatan::whereHas('kabupatenKota', function($query) { + $query->whereRaw("SUBSTRING(kode, 3, 2) < '70'"); + })->count(); + + $kecamatanPerkotaan = max(0, $totalKecamatan - $kecamatanPerdesaan); + + $terpetakan = DesaKelurahan::whereNotNull('path')->count(); + $belumTerpetakan = max(0, $totalDesaKelurahan - $terpetakan); + + $totalDesa = DesaKelurahan::where('nama', 'like', 'DESA%')->count() ?: $totalDesaKelurahan; + $totalKelurahan = DesaKelurahan::where('nama', 'like', 'KEL%')->count(); + + $data = [ + 'totalProvinsi' => $totalProvinsi, + 'provinsiAktif' => $provinsiAktif, + 'provinsiKosong' => $provinsiKosong, + + 'totalKabKota' => $totalKabKota, + 'totalKabupaten' => $totalKabupaten, + 'totalKota' => $totalKota, + + 'totalKecamatan' => $totalKecamatan, + 'kecamatanPerdesaan' => $kecamatanPerdesaan, + 'kecamatanPerkotaan' => $kecamatanPerkotaan, + + 'totalDesaKelurahan' => $totalDesaKelurahan, + 'totalDesa' => $totalDesa, + 'totalKelurahan' => $totalKelurahan, + 'terpetakan' => $terpetakan, + 'belumTerpetakan' => $belumTerpetakan, + ]; + + return view('components.wilayah-dashboard', $data); + } +} \ No newline at end of file diff --git a/public/assets/img/pages/profile-banner.png b/public/assets/img/pages/profile-banner.png deleted file mode 100644 index bdb9ba7..0000000 Binary files a/public/assets/img/pages/profile-banner.png and /dev/null differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b88a647..4eda5f9 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -4,7 +4,7 @@
- +
-
- - -

- Anda belum terdaftar? - - Buat akun baru - -

- - - -
-
-@endsection \ No newline at end of file diff --git a/resources/views/konfigurasi/profile/index.blade.php b/resources/views/konfigurasi/profile/index.blade.php deleted file mode 100644 index 988529f..0000000 --- a/resources/views/konfigurasi/profile/index.blade.php +++ /dev/null @@ -1,558 +0,0 @@ -@extends('layout.main') - -@section('content') -
- -
-
-
- - -
-
-
- - - -
-
-
- -
-
-
- - - -
-
- -
-
-

Tentang Pengguna

-
    -
  • - Nama Lengkap: {{ $profile->nama ?? 'N/A' }} -
    • -
  • - Role: - {{ $profile->role ?? 'N/A' }} -
    • -
  • - Wilayah: - {{ $profile->desa_kelurahan_id ?? 'N/A' }} -
    • -
  • - No KTP: - {{ $profile->ktp ?? 'N/A' }} -
    • -
  • - No KK: - {{ $profile->kk ?? 'N/A' }} -
    • -
-

Kontak

-
    -
  • - Telepon: - {{ $profile->telepon ?? 'N/A' }} -
    • -
  • - Email: - {{ $profile->email ?? 'N/A' }} -
    • -
-

Teams

-
    -
  • - Backend Developer(126 Members) -
    • -
  • - React Developer(98 Members) -
    • -
-
-
- - -
-
-

Overview

-
    -
  • - Komoditas: 13.5k -
    • -
  • - Jumlah Lahan: 146 -
    • -
  • - Total Luas Lahan: 897 -
    • -
-
-
- -
-
- -
-
-
- Activity Timeline -
-
-
- - -
-
-
-
-
    -
  • - -
    -
    -
    12 Invoices have been paid
    - 12 min ago -
    -

    Invoices have been paid to the company

    -
    -
    - img - invoices.pdf -
    -
    -
    -
    • -
  • - -
    -
    -
    Client Meeting
    - 45 min ago -
    -

    Project meeting with john @10:15am

    -
    -
    -
    - Avatar -
    -
    -

    Lester McCarthy (Client)

    - CEO of Pixinvent -
    -
    -
    -
    -
    • -
  • - -
    -
    -
    Create a new project for client
    - 2 Day Ago -
    -

    6 team members in a project

    -
      -
    • -
      -
        -
      • - Avatar -
        • -
      • - Avatar -
        • -
      • - Avatar -
        • -
      • - +3 -
        • -
      -
      -
      • -
    -
    -
    • -
-
-
- -
- -
-
-
-
Connections
-
-
- - -
-
-
-
-
    -
  • -
    -
    -
    - Avatar -
    -
    -
    Cecilia Payne
    - 45 Connections -
    -
    -
    - -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Curtis Fletcher
    - 1.32k Connections -
    -
    -
    - -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Alice Stone
    - 125 Connections -
    -
    -
    - -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Darrell Barnes
    - 456 Connections -
    -
    -
    - -
    -
    -
    • - -
  • -
    -
    -
    - Avatar -
    -
    -
    Eugenia Moore
    - 1.2k Connections -
    -
    -
    - -
    -
    -
    • -
  • - View all connections -
    • -
-
-
-
- - -
-
-
-
Teams
-
-
- - -
-
-
-
-
    -
  • -
    -
    -
    - Avatar -
    -
    -
    React Developers
    - 72 Members -
    -
    -
    - Developer -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Support Team
    - 122 Members -
    -
    -
    - Support -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    UI Designers
    - 7 Members -
    -
    -
    - Designer -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Vue.js Developers
    - 289 Members -
    -
    -
    - Developer -
    -
    -
    • -
  • -
    -
    -
    - Avatar -
    -
    -
    Digital Marketing
    - 24 Members -
    -
    -
    - Marketing -
    -
    -
    • -
  • - View all teams -
    • -
-
-
-
- -
- - - -
-
- -
-@endsection \ No newline at end of file diff --git a/resources/views/layout/navbar.blade.php b/resources/views/layout/navbar.blade.php index 2285155..629f8b6 100644 --- a/resources/views/layout/navbar.blade.php +++ b/resources/views/layout/navbar.blade.php @@ -361,7 +361,7 @@
  • - + Profil Saya diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/layout/sidebar.blade.php index 1e8bf4b..d7884b1 100644 --- a/resources/views/layout/sidebar.blade.php +++ b/resources/views/layout/sidebar.blade.php @@ -1,6 +1,6 @@