From c01ba6a9060247f583d55f35939ea95eb7d646c1 Mon Sep 17 00:00:00 2001 From: Irwan Cahyono Date: Wed, 8 Jul 2026 01:37:15 +0700 Subject: [PATCH] perbaikan add header conflict --- .../views/produktivitas/petani/add.blade.php | 75 +++++--- .../produktivitas/petani/header.blade.php | 177 ++++++------------ 2 files changed, 108 insertions(+), 144 deletions(-) diff --git a/resources/views/produktivitas/petani/add.blade.php b/resources/views/produktivitas/petani/add.blade.php index 0a1aa2d..33c31df 100644 --- a/resources/views/produktivitas/petani/add.blade.php +++ b/resources/views/produktivitas/petani/add.blade.php @@ -3,23 +3,24 @@ @section('content')
@if ($errors->any()) -
-
    - @foreach ($errors->all() as $error) -
  • {{ $error }}
    • - @endforeach -
-
+
+
    + @foreach ($errors->all() as $error) +
  • {{ $error }}
    • + @endforeach +
+
@endif + + @include('produktivitas.petani.header', ['petani' => null]) +
-
-
Tambah Petani Baru
-
-
-
+
+ + @csrf
@@ -32,7 +33,7 @@ width="120" alt="User avatar" />
@@ -152,9 +153,9 @@
- - + + @error('nomor_telepon')
{{ $message }}
@enderror
@@ -162,25 +163,49 @@
Berkas
- - KTP + + @if(isset($petani) && $petani?->file_ktp) +
+ +
+ + + File saat ini: + {{ $petani->file_ktp }} + + @endif @error('file_ktp')
{{ $message }}
@enderror
- - KK + + @if(isset($petani) && $petani?->file_kk) +
+ +
+ + + File saat ini: + {{ $petani->file_kk }} + + @endif @error('file_kk')
{{ $message }}
@enderror
-
- + Kembali +
@@ -257,11 +282,12 @@ }); $('#add-petani-desa').select2(); - $('#addNewPetaniForm').validate({ + + $('#editPetaniForm').validate({ rules: { nama: { required: true }, ktp: { required: true, digits: true, minlength: 16, maxlength: 16 }, - kk: { required: false, digits: true, minlength: 16, maxlength: 16 }, + kk: { required: true, digits: true, minlength: 16, maxlength: 16 }, tempat_lahir: { required: true }, tanggal_lahir: { required: true, date: true }, jenis_kelamin: { required: true }, @@ -297,6 +323,7 @@ minlength: "Nomor telepon minimal 11 digit", maxlength: "Nomor telepon maksimal 13 digit" } + }, errorElement: 'div', errorPlacement: function (error, element) { diff --git a/resources/views/produktivitas/petani/header.blade.php b/resources/views/produktivitas/petani/header.blade.php index c764ab2..80236be 100644 --- a/resources/views/produktivitas/petani/header.blade.php +++ b/resources/views/produktivitas/petani/header.blade.php @@ -1,4 +1,4 @@ -
+
@@ -9,35 +9,36 @@ Avatar
-
{{ $petani ? $petani->nama : 'Tambah Petani Baru' }}
- {{ $petani ? ($petani->jenis_kelamin == 1 ? 'Laki-laki' : 'Perempuan') : 'Jenis Kelamin' }} - Komoditas: {{ $petani ? $petani->komoditas?->nama : 'Komoditas' }} +
{{ isset($petani) ? $petani->nama : 'Tambah Petani Baru' }}
+ {{ isset($petani) ? ($petani->jenis_kelamin == 1 ? 'Laki-laki' : 'Perempuan') : 'Jenis Kelamin' }} + Komoditas: {{ isset($petani) ? $petani->komoditas?->nama : 'Komoditas' }}
Domisili
-

Alamat: {{ $petani ? $petani->alamat : 'Alamat' }}

-

{{ $petani ? $petani->desaKelurahan->nama : 'Desa/Kelurahan' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->nama : 'Kecamatan' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->kabupatenKota->nama : 'Kabupaten/Kota' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->kabupatenKota->provinsi->nama : 'Provinsi' }}

+

Alamat: {{ isset($petani) ? $petani->alamat : 'Alamat' }}

+

{{ isset($petani) ? $petani->desaKelurahan->nama : 'Desa/Kelurahan' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->nama : 'Kecamatan' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->kabupatenKota->nama : 'Kabupaten/Kota' }}, {{ $petani ? $petani->desaKelurahan->kecamatan->kabupatenKota->provinsi->nama : 'Provinsi' }}

-
+
+
-

In-store Sales

-

$5,345.43

-

- 5k orders+5.7% +

Segmen Petani

+
Penggerak
+

+ Skor 4.2

- + - +
@@ -45,90 +46,34 @@
-

In-store Sales

-
$5,345.43
-

5k orders+5.7%

+

Lahan & Tanaman

+
12000 m2
+

+ 120 tanaman kopisehat +

- + + + + +
-
-

Praktik Budidaya

-

2 kali

-

- 2 sertifikasi+5.7% +

Praktik Budidaya

+
$5,345.43
+

+ 5k orders+5.7%

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

Pendidikan

-

3 kali

-

- 2 sertifikasi+5.7% -

-
- - - - - -
-
-
-
-
-
-

Pendidikan

-

3 kali

-

- 2 sertifikasi+5.7% -

-
- - - - - -
-
-
-
-
-
-

In-store Sales

-

$5,345.43

-

- 5k orders+5.7% -

-
- - - - - -
-
@@ -142,31 +87,49 @@
-

In-store Sales

+

Pendidikan

$5,345.43
-

5k orders+5.7%

+

+ 5k orders+5.7% +

- + + + + +
-

In-store Sales

+

Sosial Ekonomi

$5,345.43
-

5k orders+5.7%

+

+ 5k orders+5.7% +

- + + + + +
-

In-store Sales

+

Akses Pasar

$5,345.43
-

5k orders+5.7%

+

+ 5k orders+5.7% +

- + + + + +
@@ -246,29 +209,3 @@ @endif
- -@push('scripts') - -@endpush \ No newline at end of file