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:
afriadirahman
2026-07-15 11:30:37 +07:00
parent a79a93d291 62f0f1bdbc
commit 090153e53a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Dashboard/ProfilPetaniController.php
+1 -1
View File
@@ -22,7 +22,7 @@ class ProfilPetaniController extends Controller
}
$title = 'Dashboard Profil Petani';
$komoditas = Komoditas::all();
$komoditas = Komoditas::where('is_utama', true)->get();
$petani = Petani::pluck('id');
$lahan = Lahan::whereIn('petani_id', $petani)->get();
app/Http/Controllers/Web/Dashboard/SurveyPetaniController.php
+2
View File
@@ -57,6 +57,7 @@ class SurveyPetaniController extends Controller
->leftJoin("{$komoditasTable} as k", 'k.id', '=', 'p.komoditas_id')
->selectRaw("COALESCE(k.nama, 'Belum ditentukan') as nama")
->selectRaw('COUNT(p.id) as petani_count')
->where('k.is_utama', true)
->groupBy('k.id', 'k.nama')
->orderByDesc('petani_count')
->get();
@@ -155,6 +156,7 @@ class SurveyPetaniController extends Controller
->leftJoin("{$komoditasTable} as k", 'k.id', '=', 'p.komoditas_id')
->selectRaw("COALESCE(k.nama, 'Belum ditentukan') as label")
->selectRaw('COALESCE(SUM(l.jumlah_tanaman), 0) as total')
->where('k.is_utama', true)
->groupBy('k.id', 'k.nama')
->orderByDesc('total')
->get();
resources/views/produktivitas/petani/edit.blade.php
+3 -3
View File
@@ -83,9 +83,9 @@
@error('tempat_lahir')<div class="error invalid-feedback">{{ $message }}</div>@enderror
</div>
<div class="col-md-3 mb-4 form-control-validation">
<label class="form-label" for="edit-petani-tanggal-lahir">Tanggal Lahir {{ $petani->tanggal_lahir?->format('Y-m-d') }}</label>
<input type="date" class="form-control @error('tanggal_lahir') is-invalid @enderror" id="edit-petani-tanggal-lahir" name="tanggal_lahir"
value="{{ old('tanggal_lahir', $petani->tanggal_lahir?->format('Y-m-d')) }}" />
<label class="form-label" for="edit-petani-tanggal-lahir">Tanggal Lahir</label>
<input type="text" class="form-control @error('tanggal_lahir') is-invalid @enderror" id="edit-petani-tanggal-lahir" name="tanggal_lahir"
value="{{ old('tanggal_lahir', $petani->tanggal_lahir?->format('d-m-Y')) }}" />
@error('tanggal_lahir')<div class="error invalid-feedback">{{ $message }}</div>@enderror
</div>
</div>