diff --git a/app/Http/Controllers/Api/Ekosistem/TabelBasisDataController.php b/app/Http/Controllers/Api/Ekosistem/TabelBasisDataController.php
index 4f6512d..f02ee4f 100644
--- a/app/Http/Controllers/Api/Ekosistem/TabelBasisDataController.php
+++ b/app/Http/Controllers/Api/Ekosistem/TabelBasisDataController.php
@@ -54,11 +54,10 @@ class TabelBasisDataController extends Controller
             abort(403);
         }
 
-        $tabel = TabelBasisData::with('kolom')->findOrFail($id);
+        $tabel = TabelBasisData::with('kolom', 'form', 'form.form', 'form.form.form', 'form.form.form.kolom')->findOrFail($id);
 
         return (new TabelBasisDataResource($tabel))
-            ->response()
-            ->setStatusCode(201);
+            ->response();
     }
 
     /**
diff --git a/app/Http/Controllers/Api/TanamanController.php b/app/Http/Controllers/Api/TanamanController.php
index 3f938cd..29c1a84 100644
--- a/app/Http/Controllers/Api/TanamanController.php
+++ b/app/Http/Controllers/Api/TanamanController.php
@@ -94,20 +94,24 @@ class TanamanController extends Controller
         if (!Gate::any(['petani', 'fasilitator','super_admin'])) {
             abort(403);
         }
-        $profile = Auth::user()->profile;
+
+        $user = Auth::user();
+        $profile = $user->profile;
+        $profileId = $user->role === 'petani' ? $profile->id : $request->profile_id;
 
         $request->merge([
             'komoditas_id' => $request->input('komoditas.id') ?? $request->input('komoditas_id'),
             'lahan_id'     => $request->input('lahan.id') ?? $request->input('lahan_id'),
-            'profile_id'   => $profile->id 
+            'profile_id'   => $profileId,
         ]);
+
         $validated = $request->validate([
             'nama' => ['required', 'string', 'max:255'],
             'komoditas_id' => ['required', 'exists:master_komoditas,id'],
             'lahan_id' => [
                 'required',
-                Rule::exists('map_lahan', 'id')->where(function ($query) use ($profile) {
-                    $query->where('profile_id', $profile->id)
+                Rule::exists('map_lahan', 'id')->where(function ($query) use ($profileId) {
+                    $query->where('profile_id', $profileId)
                         ->whereNull('deleted_at');
                 }),
             ],
diff --git a/app/Http/Controllers/Web/Ekosistem/FormBasisDataController.php b/app/Http/Controllers/Web/Ekosistem/FormBasisDataController.php
index 4d03593..c2982ec 100644
--- a/app/Http/Controllers/Web/Ekosistem/FormBasisDataController.php
+++ b/app/Http/Controllers/Web/Ekosistem/FormBasisDataController.php
@@ -10,6 +10,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
+use Illuminate\Http\RedirectResponse;
 
 use App\Models\Ekosistem\TabelBasisData;
 use App\Models\Ekosistem\FormBasisData;
diff --git a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
index 8279d3b..ce3e301 100644
--- a/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
+++ b/app/Http/Controllers/Web/Ekosistem/ValueBasisDataController.php
@@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 
 use App\Models\Ekosistem\TabelBasisData;
 use App\Models\Ekosistem\KolomBasisData;
@@ -21,6 +22,13 @@ use App\Models\Core\Program;
 
 class ValueBasisDataController extends Controller
 {
+    private $tableModelClassMap = [
+        'master_provinsi' => \App\Models\Wilayah\Provinsi::class,
+        'master_kabupaten_kota' => \App\Models\Wilayah\KabupatenKota::class,
+        'master_kecamatan' => \App\Models\Wilayah\Kecamatan::class,
+        'master_desa_kelurahan' => \App\Models\Wilayah\DesaKelurahan::class,
+    ];
+
     public function index(Request $request, string $tabelId): View
     {
         if (!Gate::any(['super_admin', 'admin', 'fasilitator'])) {
@@ -166,7 +174,7 @@ class ValueBasisDataController extends Controller
         if (!Gate::any(['super_admin', 'admin'])) {
             abort(403);
         }
-
+        
         $tabel = TabelBasisData::with('kolom')
             ->whereHas('kolom', function ($query) {
                 $query->where('is_active', true);
@@ -198,7 +206,12 @@ class ValueBasisDataController extends Controller
             if ($k->tipe == 'foreign_key') {
                 $relasi['kolom_id'] = $k->id;
                 try {
-                    $options_kolom = DB::table($k->relasi_tabel)->selectRaw($k->relasi_kolom_label . ' as label, ' . $k->relasi_kolom_id . ' as value')->whereNull('deleted_at');
+                    $modelClass = Arr::get($this->tableModelClassMap, 'master_desa_kelurahan');
+                    if ($modelClass) {
+                        $options_kolom = $modelClass::select($k->relasi_kolom_label . ' as label', $k->relasi_kolom_id . ' as value')->limit(10000);
+                    } else {
+                        $options_kolom = DB::table($k->relasi_tabel)->selectRaw($k->relasi_kolom_label . ' as label, ' . $k->relasi_kolom_id . ' as value')->whereNull('deleted_at')->limit(10000);
+                    }
                     $relasi['options'] = $options_kolom->get();
                     $relasi['sql'] = $options_kolom->toSql();
                 } catch (\Throwable $th) {
@@ -281,9 +294,6 @@ class ValueBasisDataController extends Controller
         return redirect()->route('tabel.data.index', [$tabelId, 'program_id' => $program->id])->with('success', 'Data berhasil ditambahkan.');
     }
 
-    /**
-     * Display the specified resource.
-     */
     public function show(Request $request, string $tabelId, string $id): View
     {
         if (!Gate::any(['super_admin', 'admin'])) {
@@ -329,7 +339,9 @@ class ValueBasisDataController extends Controller
         foreach ($values as $v) {
             $k = $kolom->where('id', $v->kolom_id)->first();
             if ($k->tipe == 'foreign_key') {
-                $v->value_relasi_label = DB::table($k->relasi_tabel)->where($k->relasi_kolom_id, $v->value_relasi)->value($k->relasi_kolom_label);
+                $v->value_relasi_label = DB::table($k->relasi_tabel)
+                    ->where($k->relasi_kolom_id, $v->value_relasi)
+                    ->value($k->relasi_kolom_label);
             } else if ($k->tipe == 'enum') {
                 $opsi = collect($k->enum_opsi);
                 $found = $opsi->first(function ($item) use ($v) {
@@ -393,7 +405,12 @@ class ValueBasisDataController extends Controller
             if ($k->tipe == 'foreign_key') {
                 $relasi['kolom_id'] = $k->id;
                 try {
-                    $options_kolom = DB::table($k->relasi_tabel)->selectRaw($k->relasi_kolom_label . ' as label, ' . $k->relasi_kolom_id . ' as value')->whereNull('deleted_at');
+                    $modelClass = Arr::get($this->tableModelClassMap, 'master_desa_kelurahan');
+                    if ($modelClass) {
+                        $options_kolom = $modelClass::select($k->relasi_kolom_label . ' as label', $k->relasi_kolom_id . ' as value')->limit(10000);
+                    } else {
+                        $options_kolom = DB::table($k->relasi_tabel)->selectRaw($k->relasi_kolom_label . ' as label, ' . $k->relasi_kolom_id . ' as value')->whereNull('deleted_at')->limit(10000);
+                    }
                     $relasi['options'] = $options_kolom->get();
                     $relasi['sql'] = $options_kolom->toSql();
                 } catch (\Throwable $th) {
diff --git a/app/Http/Controllers/Web/Master/JenisKomoditasController.php b/app/Http/Controllers/Web/Master/JenisKomoditasController.php
new file mode 100644
index 0000000..ea6ce41
--- /dev/null
+++ b/app/Http/Controllers/Web/Master/JenisKomoditasController.php
@@ -0,0 +1,228 @@
+<?php
+
+namespace App\Http\Controllers\Web\Master;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\Master\JenisKomoditas;
+use App\Models\Pertanian\Komoditas;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+
+class JenisKomoditasController extends Controller
+{
+    public function index(Request $request)
+    {
+        $perPage = $request->get('per_page', 10);
+        $search = $request->get('search');
+
+        $jenisKomoditas = JenisKomoditas::with('komoditas')
+            ->when($search, function ($query) use ($search) {
+                $query->where(function ($q) use ($search) {
+                    $q->where('nama', 'ILIKE', "%{$search}%")
+                        ->orWhere('path', 'ILIKE', "%{$search}%")
+                        ->orWhereHas('komoditas', function ($komoditasQuery) use ($search) {
+                            $komoditasQuery->where('nama', 'ILIKE', "%{$search}%");
+                        });
+                });
+            })
+            ->latest()
+            ->paginate($perPage);
+
+        $komoditas = Komoditas::orderBy('nama', 'asc')->get();
+
+        return view('master.jeniskomoditas.index', compact(
+            'jenisKomoditas',
+            'komoditas'
+        ));
+    }
+
+    public function getByKomoditas($komoditas_id)
+    {
+        $jenisKomoditas = JenisKomoditas::where('komoditas_id', $komoditas_id)
+            ->orderBy('nama', 'asc')
+            ->get(['id', 'nama']);
+
+        return response()->json([
+            'status' => 'success',
+            'data' => $jenisKomoditas,
+        ]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'komoditas_id' => [
+                'required',
+                'integer',
+                'exists:master_komoditas,id',
+            ],
+            'nama' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('jenis_komoditas', 'nama')
+                    ->where('komoditas_id', $request->komoditas_id),
+            ],
+        ], [
+            'komoditas_id.required' => 'Komoditas wajib dipilih.',
+            'komoditas_id.exists' => 'Komoditas yang dipilih tidak valid.',
+            'nama.required' => 'Nama jenis komoditas wajib diisi.',
+            'nama.unique' => 'Nama jenis komoditas sudah tersedia pada komoditas ini.',
+        ]);
+
+        try {
+            DB::beginTransaction();
+
+            $jenisKomoditas = JenisKomoditas::create([
+                'komoditas_id' => $validated['komoditas_id'],
+                'nama' => $validated['nama'],
+                'created_by' => auth()->id(),
+                'updated_by' => auth()->id(),
+            ]);
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data jenis komoditas berhasil disimpan.',
+                'data' => $jenisKomoditas,
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal menyimpan jenis komoditas', [
+                'error' => $e->getMessage(),
+                'request' => $request->all(),
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal menyimpan data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+
+    /**
+     * Display the specified resource.
+     */
+    public function show(string $id)
+    {
+        try {
+            $jenisKomoditas = JenisKomoditas::with('komoditas')->findOrFail($id);
+
+            return response()->json([
+                'status' => 'success',
+                'data' => $jenisKomoditas,
+            ]);
+        } catch (\Throwable $e) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Data jenis komoditas tidak ditemukan.',
+            ], 404);
+        }
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, string $id)
+    {
+        $jenisKomoditas = JenisKomoditas::findOrFail($id);
+
+        $validated = $request->validate([
+            'komoditas_id' => [
+                'required',
+                'integer',
+                'exists:master_komoditas,id',
+            ],
+            'nama' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('jenis_komoditas', 'nama')
+                    ->where('komoditas_id', $request->komoditas_id)
+                    ->ignore($jenisKomoditas->id),
+            ],
+            'path' => [
+                'nullable',
+                'string',
+            ],
+        ], [
+            'komoditas_id.required' => 'Komoditas wajib dipilih.',
+            'komoditas_id.exists' => 'Komoditas yang dipilih tidak valid.',
+            'nama.required' => 'Nama jenis komoditas wajib diisi.',
+            'nama.unique' => 'Nama jenis komoditas sudah tersedia pada komoditas ini.',
+        ]);
+
+        try {
+            DB::beginTransaction();
+
+            $jenisKomoditas->update([
+                'komoditas_id' => $validated['komoditas_id'],
+                'nama' => $validated['nama'],
+                'updated_by' => auth()->id(),
+            ]);
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data jenis komoditas berhasil diperbarui.',
+                'data' => $jenisKomoditas->fresh('komoditas'),
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal update jenis komoditas', [
+                'error' => $e->getMessage(),
+                'id' => $id,
+                'request' => $request->all(),
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal mengupdate data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(string $id)
+    {
+        try {
+            DB::beginTransaction();
+
+            $jenisKomoditas = JenisKomoditas::findOrFail($id);
+            $jenisKomoditas->update(['deleted_by' => auth()->id()]);
+            $jenisKomoditas->delete();
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data jenis komoditas berhasil dihapus.',
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal hapus jenis komoditas', [
+                'error' => $e->getMessage(),
+                'id' => $id,
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal menghapus data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+}
diff --git a/app/Http/Controllers/Web/Master/VarietasController.php b/app/Http/Controllers/Web/Master/VarietasController.php
new file mode 100644
index 0000000..420380c
--- /dev/null
+++ b/app/Http/Controllers/Web/Master/VarietasController.php
@@ -0,0 +1,226 @@
+<?php
+
+namespace App\Http\Controllers\Web\Master;
+
+use App\Http\Controllers\Controller;
+use App\Models\Master\Varietas;
+use App\Models\Pertanian\Komoditas;
+use App\Models\Master\JenisKomoditas;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Http\Request;
+
+class VarietasController extends Controller
+{
+    public function index(Request $request)
+    {
+        $perPage = $request->get('per_page', 10);
+        $search = $request->get('search');
+
+        $varietas = Varietas::with(['komoditas', 'jenisKomoditas'])
+            ->when($search, function ($query) use ($search) {
+                $query->where(function ($q) use ($search) {
+                    $q->where('nama', 'ILIKE', "%{$search}%")
+                        ->orWhere('path', 'ILIKE', "%{$search}%")
+                        ->orWhereHas('komoditas', function ($komoditasQuery) use ($search) {
+                            $komoditasQuery->where('nama', 'ILIKE', "%{$search}%");
+                        })
+                        ->orWhereHas('jenisKomoditas', function ($jenisQuery) use ($search) {
+                            $jenisQuery->where('nama', 'ILIKE', "%{$search}%");
+                        });
+                });
+            })
+            ->latest()
+            ->paginate($perPage);
+
+        $komoditas = Komoditas::orderBy('nama', 'asc')->get();
+
+        return view('master.varietas.index', compact(
+            'varietas',
+            'komoditas'
+        ));
+    }
+
+    public function store(Request $request)
+    {
+        $komoditasTable = (new Komoditas)->getTable();
+        $jenisKomoditasTable = (new JenisKomoditas)->getTable();
+        $varietasTable = (new Varietas)->getTable();
+
+        $validated = $request->validate([
+            'komoditas_id' => [
+                'required',
+                'integer',
+                Rule::exists($komoditasTable, 'id'),
+            ],
+            'jenis_komoditas_id' => [
+                'required',
+                'integer',
+                Rule::exists($jenisKomoditasTable, 'id')
+                    ->where('komoditas_id', $request->komoditas_id),
+            ],
+            'nama' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique($varietasTable, 'nama')
+                    ->where('komoditas_id', $request->komoditas_id)
+                    ->where('jenis_komoditas_id', $request->jenis_komoditas_id),
+            ],
+            'deskripsi' => [
+                'nullable',
+                'string',
+            ],
+        ]);
+
+        try {
+            DB::beginTransaction();
+
+            $varietas = Varietas::create([
+                'komoditas_id' => $validated['komoditas_id'],
+                'jenis_komoditas_id' => $validated['jenis_komoditas_id'],
+                'nama' => $validated['nama'],
+                'deskripsi' => $validated['deskripsi'] ?? null,
+                'created_by' => auth()->id(),
+                'updated_by' => auth()->id(),
+            ]);
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data varietas berhasil disimpan.',
+                'data' => $varietas,
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal menyimpan varietas', [
+                'error' => $e->getMessage(),
+                'request' => $request->all(),
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal menyimpan data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+
+    public function show(string $id)
+    {
+        try {
+            $varietas = Varietas::with(['komoditas', 'jenisKomoditas'])->findOrFail($id);
+
+            return response()->json([
+                'status' => 'success',
+                'data' => $varietas,
+            ]);
+        } catch (\Throwable $e) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Data varietas tidak ditemukan.',
+            ], 404);
+        }
+    }
+
+    public function update(Request $request, string $id)
+    {
+        $komoditasTable = (new Komoditas)->getTable();
+        $jenisKomoditasTable = (new JenisKomoditas)->getTable();
+        $varietasTable = (new Varietas)->getTable();
+
+        $validated = $request->validate([
+            'komoditas_id' => [
+                'required',
+                'integer',
+                Rule::exists($komoditasTable, 'id'),
+            ],
+            'jenis_komoditas_id' => [
+                'required',
+                'integer',
+                Rule::exists($jenisKomoditasTable, 'id')
+                    ->where('komoditas_id', $request->komoditas_id),
+            ],
+            'nama' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique($varietasTable, 'nama')
+                    ->where('komoditas_id', $request->komoditas_id)
+                    ->where('jenis_komoditas_id', $request->jenis_komoditas_id),
+            ],
+            'deskripsi' => [
+                'nullable',
+                'string',
+            ],
+        ]);
+
+        try {
+            DB::beginTransaction();
+
+            $varietas = Varietas::findOrFail($id);
+            $varietas->update([
+                'komoditas_id' => $validated['komoditas_id'],
+                'jenis_komoditas_id' => $validated['jenis_komoditas_id'],
+                'nama' => $validated['nama'],
+                'deskripsi' => $validated['deskripsi'] ?? null,
+                'updated_by' => auth()->id(),
+            ]);
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data varietas berhasil diperbarui.',
+                'data' => $varietas->fresh(['komoditas', 'jenisKomoditas']),
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal update varietas', [
+                'error' => $e->getMessage(),
+                'id' => $id,
+                'request' => $request->all(),
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal mengupdate data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+
+    public function destroy(string $id)
+    {
+        try {
+            DB::beginTransaction();
+
+            $varietas = Varietas::findOrFail($id);
+            $varietas->update(['deleted_by' => auth()->id()]);
+            $varietas->delete();
+
+            DB::commit();
+
+            return response()->json([
+                'status' => 'success',
+                'message' => 'Data varietas berhasil dihapus.',
+            ]);
+        } catch (\Throwable $e) {
+            DB::rollBack();
+
+            Log::error('Gagal hapus varietas', [
+                'error' => $e->getMessage(),
+                'id' => $id,
+            ]);
+
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Gagal menghapus data: ' . $e->getMessage(),
+            ], 500);
+        }
+    }
+}
diff --git a/app/Http/Controllers/Web/Program/RealisasiController.php b/app/Http/Controllers/Web/Program/RealisasiController.php
index 25eed7d..0e21a19 100644
--- a/app/Http/Controllers/Web/Program/RealisasiController.php
+++ b/app/Http/Controllers/Web/Program/RealisasiController.php
@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\View\View;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
 
 use App\Models\Program\Framework;
 use App\Models\Program\Realisasi;
@@ -26,7 +27,89 @@ class RealisasiController extends Controller
             abort(404);
         }
         
-        return view('program.realisasi.index', compact('framework'));
+        $ringkasanIsiRealisasi = DB::select('select count(pt.id) count_target, sum(case when rl.id > 0 then 1 else 0 end) count_realisasi
+            from program_target pt 
+            inner join program_aktivitas pa on pt.aktivitas_id = pa.id 
+            inner join program_transformasi ptr on pa.transformasi_id = ptr.id 
+            inner join program_framework pf on ptr.framework_id = pf.id
+            left join 
+            (select target_id, max(id) id from program_realisasi pr 
+            group by target_id) rl on pt.id = rl.target_id
+            where 
+            pt.deleted_at is null
+            and pa.deleted_at is null
+            and ptr.deleted_at is null
+            and pf.id = ?
+        ', [$framework->id]);
+        $ringkasanIsiRealisasi = collect($ringkasanIsiRealisasi)->map(function ($item) {
+            $item->persentase = $item->count_target > 0 ? round(($item->count_realisasi / $item->count_target) * 100, 2) : 0;
+            return $item;
+        })->first();
+
+        $ringkasanCapaianRealisasi = DB::select("select round(avg(percent_realisasi)::numeric * 100, 2) persentase, 
+            sum(case when percent_realisasi >= 0.8 then 1 else 0 end) capaian_80,
+            sum(case when percent_realisasi >= 0.5 and percent_realisasi < 0.8 then 1 else 0 end) capaian_50_80,
+            sum(case when percent_realisasi < 0.5 then 1 else 0 end) capaian_50
+            from 
+            (select pt.id target_id, pr.id realisasi_id, 
+            pt.tipe,
+            case 
+                when pt.tipe = 'integer' then pt.target_integer
+                when pt.tipe = 'float' then pt.target_float
+                when pt.tipe = 'boolean' then pt.target_boolean::integer
+            end target,
+            case 
+                when pt.tipe = 'integer' then pr.realisasi_integer  
+                when pt.tipe = 'float' then pr.realisasi_float  
+                when pt.tipe = 'boolean' then pr.realisasi_boolean::integer
+            end realisasi,
+            case 
+                when pt.tipe = 'integer' then pr.realisasi_integer::float / pt.target_integer::float
+                when pt.tipe = 'float' then pr.realisasi_float / pt.target_float
+                when pt.tipe = 'boolean' then pr.realisasi_boolean::integer / pt.target_boolean::integer
+            end percent_realisasi
+            from program_target pt 
+            inner join program_aktivitas pa on pt.aktivitas_id = pa.id 
+            inner join program_transformasi ptr on pa.transformasi_id = ptr.id 
+            inner join program_framework pf on ptr.framework_id = pf.id
+            left join 
+            (select target_id, max(id) id from program_realisasi pr 
+            group by target_id) rl on pt.id = rl.target_id
+            left join program_realisasi pr on rl.id = pr.id and pr.target_id = pt.id 
+            where 
+            pt.deleted_at is null
+            and pa.deleted_at is null
+            and ptr.deleted_at is null
+            and pf.id = ?) v", 
+            [$framework->id]);
+        $ringkasanCapaianRealisasi = collect($ringkasanCapaianRealisasi)->first();
+
+        $ringkasanVerifikasi = DB::select("select count(pt.id) count_target, 
+            sum(case when count_verifikasi > 0 then 1 else 0 end) count_verifikasi, 
+            sum(case when count_verifikasi = 0 or count_verifikasi is null then 1 else 0 end) count_unverifikasi
+            from program_target pt 
+            inner join program_aktivitas pa on pt.aktivitas_id = pa.id 
+            inner join program_transformasi ptr on pa.transformasi_id = ptr.id 
+            inner join program_framework pf on ptr.framework_id = pf.id
+            left join 
+            (select target_id, max(id) id from program_realisasi pr 
+            group by target_id) rl on pt.id = rl.target_id
+            left join 
+            (select realisasi_id, count(pv.id) count_verifikasi from program_verifikasi pv
+            group by realisasi_id) rv
+            on rv.realisasi_id = rl.id
+            where 
+            pt.deleted_at is null
+            and pa.deleted_at is null
+            and ptr.deleted_at is null
+            and pf.id = ?", 
+            [$framework->id]);
+        $ringkasanVerifikasi = collect($ringkasanVerifikasi)->map(function ($item) {
+            $item->persentase = $item->count_target > 0 ? round(($item->count_verifikasi / $item->count_target) * 100, 2) : 0;
+            return $item;
+        })->first();
+
+        return view('program.realisasi.index', compact('framework', 'ringkasanIsiRealisasi', 'ringkasanCapaianRealisasi', 'ringkasanVerifikasi'));
     }
 
     public function create()
@@ -64,7 +147,7 @@ class RealisasiController extends Controller
             abort(403);
         }
 
-        $realisasi = Realisasi::with('target', 'target.aktivitas', 'target.aktivitas.transformasi')
+        $realisasi = Realisasi::with('target', 'target.aktivitas', 'target.aktivitas.transformasi', 'verifikasi')
             ->find($id);
         if (!$realisasi) {
             return response()->json([
diff --git a/app/Http/Controllers/Web/Program/VerifikasiController.php b/app/Http/Controllers/Web/Program/VerifikasiController.php
index 0e52d7e..932da21 100644
--- a/app/Http/Controllers/Web/Program/VerifikasiController.php
+++ b/app/Http/Controllers/Web/Program/VerifikasiController.php
@@ -17,9 +17,9 @@ class VerifikasiController extends Controller
     /**
      * Display a listing of the resource.
      */
-    public function index()
+    public function index(Request $request): JsonResponse
     {
-        //
+        
     }
 
     /**
@@ -83,8 +83,25 @@ class VerifikasiController extends Controller
     /**
      * Remove the specified resource from storage.
      */
-    public function destroy(string $id)
+    public function destroy(string $id): JsonResponse
     {
-        //
+        if (!Gate::any(['super_admin', 'admin'])) {
+            abort(403);
+        }
+
+        $verifikasi = Verifikasi::find($id);
+        if (!$verifikasi) {
+            return response()->json([
+                'status' => 'error',
+                'message' => 'Data verifikasi tidak ditemukan.'
+            ], 404);
+        }   
+
+        $verifikasi->update(['updated_by' => auth()->id()]);
+        $verifikasi->delete();
+        return response()->json([
+            'status' => 'success',
+            'message' => 'Dokumen bukti berhasil dihapus.'
+        ]);
     }
 }
diff --git a/app/Http/Controllers/Web/ProgramController.php b/app/Http/Controllers/Web/ProgramController.php
index e429e4e..5a08d80 100644
--- a/app/Http/Controllers/Web/ProgramController.php
+++ b/app/Http/Controllers/Web/ProgramController.php
@@ -49,6 +49,7 @@ class ProgramController extends Controller
             'sub_domain'  => ['required', Rule::unique(Program::class, 'sub_domain')],
             'tahun' => ['required', 'integer'],
             'instansi' => ['nullable', 'string'],
+            'nama_singkat' => ['required', 'string'],
         ]);
 
         if ($validator->fails()) {
@@ -94,6 +95,9 @@ class ProgramController extends Controller
         $validator = Validator::make($request->all(), [
             'nama' => ['required'],
             'sub_domain'  => ['required', Rule::unique(Program::class, 'sub_domain')->ignore($id)],
+            'tahun' => ['required', 'integer'],
+            'instansi' => ['nullable', 'string'],
+            'nama_singkat' => ['required', 'string'],
         ]);
 
         if ($validator->fails()) {
@@ -106,9 +110,7 @@ class ProgramController extends Controller
             return redirect()->route('program.index')->with('error', 'Data program tidak ditemukan!');
         }
 
-        $program->update([
-            'nama'          => $request->nama,
-            'sub_domain'     => $request->sub_domain,
+        $program->update([...$validator->validated(),
             'updated_by'    => auth()->id(),
         ]);
 
diff --git a/app/Http/Resources/Core/ProgramResource.php b/app/Http/Resources/Core/ProgramResource.php
index 3b6503f..2d4f05a 100644
--- a/app/Http/Resources/Core/ProgramResource.php
+++ b/app/Http/Resources/Core/ProgramResource.php
@@ -22,6 +22,7 @@ class ProgramResource extends JsonResource
             'sub_domain' => $this->sub_domain,
             'tahun' => $this->tahun,
             'instansi' => $this->instansi,
+            'nama_singkat' => $this->nama_singkat,
             'komoditas' => $this->komoditas()->with('komoditas')->get()->map(function ($item) {
                 return new ProgramKomoditasResource($item);
             }),
diff --git a/app/Http/Resources/Ekosistem/FormBasisDataResource.php b/app/Http/Resources/Ekosistem/FormBasisDataResource.php
new file mode 100644
index 0000000..9b64112
--- /dev/null
+++ b/app/Http/Resources/Ekosistem/FormBasisDataResource.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Resources\Ekosistem;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+use App\Http\Resources\Ekosistem\KolomBasisDataResource;
+
+class FormBasisDataResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'tabel_id' => $this->tabel_id,
+            'parent_id' => $this->parent_id,
+            'tipe' => $this->tipe,
+            'column_width' => $this->column_width,
+            'kolom_id' => $this->kolom_id,
+            'section_label' => $this->section_label,
+            'urutan' => $this->urutan,
+            'kolom' => new KolomBasisDataResource($this->whenLoaded('kolom')),
+            'form' => FormBasisDataResource::collection($this->whenLoaded('form')),
+        ];
+    }
+}
diff --git a/app/Http/Resources/Ekosistem/TabelBasisDataResource.php b/app/Http/Resources/Ekosistem/TabelBasisDataResource.php
index 2b2feb6..5b4de9e 100644
--- a/app/Http/Resources/Ekosistem/TabelBasisDataResource.php
+++ b/app/Http/Resources/Ekosistem/TabelBasisDataResource.php
@@ -29,6 +29,7 @@ class TabelBasisDataResource extends JsonResource
             // 'group' => new GroupBasisDataResource($this->whenLoaded('group')),
             'kolom' => KolomBasisDataResource::collection($this->whenLoaded('kolom')),
             //'ringkasan' => RingkasanBasisDataResource::collection($this->whenLoaded('ringkasan')),
+            'form' => FormBasisDataResource::collection($this->whenLoaded('form')),
         ];
     }
 }
diff --git a/app/Models/Core/Program.php b/app/Models/Core/Program.php
index e4f7240..30f7c1a 100644
--- a/app/Models/Core/Program.php
+++ b/app/Models/Core/Program.php
@@ -20,6 +20,7 @@ class Program extends Model
         "sub_domain",
         "tahun",
         "instansi",
+        "nama_singkat",
     ];
 
     public function komoditas(): HasMany
diff --git a/app/Models/Master/JenisKomoditas.php b/app/Models/Master/JenisKomoditas.php
new file mode 100644
index 0000000..cce5c46
--- /dev/null
+++ b/app/Models/Master/JenisKomoditas.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models\Master;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App\Models\Pertanian\Komoditas;
+
+class JenisKomoditas extends Model
+{
+    use HasFactory, SoftDeletes;
+
+    protected $table = 'jenis_komoditas';
+
+    protected $fillable = [
+        'nama',
+        'komoditas_id',
+        'created_by',
+        'updated_by',
+        'deleted_by',
+    ];
+
+    public function komoditas()
+    {
+        return $this->belongsTo(Komoditas::class, 'komoditas_id');
+    }
+}
diff --git a/app/Models/Master/Varietas.php b/app/Models/Master/Varietas.php
new file mode 100644
index 0000000..b8d867f
--- /dev/null
+++ b/app/Models/Master/Varietas.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Models\Master;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App\Models\Pertanian\Komoditas;
+use App\Models\Master\JenisKomoditas;
+
+class Varietas extends Model
+{
+    protected $table = 'master_varietas';
+
+    protected $fillable = [
+        'komoditas_id',
+        'jenis_komoditas_id',
+        'nama',
+        'deskripsi',
+        'created_by',
+        'updated_by',
+    ];
+
+    public function jenisKomoditas()
+    {
+        return $this->belongsTo(JenisKomoditas::class, 'jenis_komoditas_id');
+    }
+
+    public function komoditas()
+    {
+        return $this->belongsTo(Komoditas::class, 'komoditas_id');
+    }
+}
diff --git a/app/Models/Wilayah/DesaKelurahan.php b/app/Models/Wilayah/DesaKelurahan.php
index ac8beef..123a402 100644
--- a/app/Models/Wilayah/DesaKelurahan.php
+++ b/app/Models/Wilayah/DesaKelurahan.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\wilayah;
+namespace App\Models\Wilayah;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
diff --git a/database/migrations/2026_04_11_105538_create_programs_table.php b/database/migrations/2026_04_11_105538_create_programs_table.php
index 9af40e2..8fc965b 100644
--- a/database/migrations/2026_04_11_105538_create_programs_table.php
+++ b/database/migrations/2026_04_11_105538_create_programs_table.php
@@ -18,6 +18,7 @@ return new class extends Migration
             $table->string('sub_domain');
             $table->integer('tahun');
             $table->string('instansi')->nullable();
+            $table->string('nama_singkat', length: 50);
 
             $table->foreignId('created_by')->nullable()->constrained('users')->onDelete('set null');
             $table->foreignId('updated_by')->nullable()->constrained('users')->onDelete('set null');
diff --git a/resources/views/core/program/add.blade.php b/resources/views/core/program/add.blade.php
index 01b5099..03248ee 100644
--- a/resources/views/core/program/add.blade.php
+++ b/resources/views/core/program/add.blade.php
@@ -18,6 +18,12 @@
                         <input type="text" class="form-control" id="add-program-nama" name="nama" placeholder="Cth: Program Pertanian" />
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-md-6 mb-4 form-control-validation">
+                        <label class="form-label" for="add-program-nama-singkat">Nama Singkat<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="add-program-nama-singkat" name="nama_singkat" placeholder="Cth: PP" />
+                    </div>
+                </div>
                 <div class="row">
                     <div class="col-md-3 mb-4 form-control-validation">
                         <label class="form-label" for="add-program-subdomain">Sub Domain<span class="text-danger">*</span></label>
@@ -51,12 +57,14 @@
             rules: {
                 nama: { required: true },
                 sub_domain: { required: true },
-                tahun: { required: true }
+                tahun: { required: true },
+                nama_singkat: { required: true }
             },
             messages: {
                 nama: { required: "Nama program wajib diisi" },
                 sub_domain: { required: "Subdomain wajib diisi" },
-                tahun: { required: "Tahun wajib diisi" }
+                tahun: { required: "Tahun wajib diisi" },
+                nama_singkat: { required: "Nama singkat wajib diisi" }
             },
             errorElement: 'div',
             errorPlacement: function (error, element) {
diff --git a/resources/views/core/program/edit.blade.php b/resources/views/core/program/edit.blade.php
index 30603a3..6d36b74 100644
--- a/resources/views/core/program/edit.blade.php
+++ b/resources/views/core/program/edit.blade.php
@@ -19,6 +19,12 @@
                         <input type="text" class="form-control" id="add-program-nama" name="nama" placeholder="Cth: Program Pertanian" value="{{ old('nama', $program->nama) }}" />
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-md-6 mb-4 form-control-validation">
+                        <label class="form-label" for="add-program-nama-singkat">Nama Singkat<span class="text-danger">*</span></label>
+                        <input type="text" class="form-control" id="add-program-nama-singkat" name="nama_singkat" placeholder="Cth: PP" value="{{ old('nama_singkat', $program->nama_singkat) }}" />
+                    </div>
+                </div>
                 <div class="row">
                     <div class="col-md-3 mb-4 form-control-validation">
                         <label class="form-label" for="add-program-subdomain">Sub Domain<span class="text-danger">*</span></label>
@@ -56,12 +62,14 @@
             rules: {
                 nama: { required: true },
                 sub_domain: { required: true },
-                tahun: { required: true }
+                tahun: { required: true },
+                nama_singkat: { required: true }
             },
             messages: {
                 nama: { required: "Nama program wajib diisi" },
                 sub_domain: { required: "Subdomain wajib diisi" },
-                tahun: { required: "Tahun wajib diisi" }
+                tahun: { required: "Tahun wajib diisi" },
+                nama_singkat: { required: "Nama singkat wajib diisi" }
             },
             errorElement: 'div',
             errorPlacement: function (error, element) {
diff --git a/resources/views/core/program/view.blade.php b/resources/views/core/program/view.blade.php
index 93a838c..c9821ed 100644
--- a/resources/views/core/program/view.blade.php
+++ b/resources/views/core/program/view.blade.php
@@ -17,6 +17,12 @@
                     <input type="text" class="form-control" id="add-program-nama" name="nama" placeholder="Cth: Program Pertanian" value="{{ old('nama', $program->nama) }}" readonly />
                 </div>
             </div>
+            <div class="row">
+                <div class="col-md-6 mb-4 form-control-validation">
+                    <label class="form-label" for="add-program-nama-singkat">Nama Singkat<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="add-program-nama-singkat" name="nama_singkat" placeholder="Cth: PP" value="{{ old('nama_singkat', $program->nama_singkat) }}" readonly />
+                </div>
+            </div>
             <div class="row">
                 <div class="col-md-3 mb-4 form-control-validation">
                     <label class="form-label" for="add-program-subdomain">Sub Domain<span class="text-danger">*</span></label>
diff --git a/resources/views/ekosistem/petani-cpm/index.blade.php b/resources/views/ekosistem/petani-cpm/index.blade.php
index f544342..1fff4c9 100644
--- a/resources/views/ekosistem/petani-cpm/index.blade.php
+++ b/resources/views/ekosistem/petani-cpm/index.blade.php
@@ -86,13 +86,13 @@
                 <div class="col-md-auto d-flex gap-2">
                     @if (app()->has('SystemProgram'))
                     @else
-                    <div class="col-md-auto">
+                    <div class="col-6">
                         <div class="d-flex align-items-center">
                             <label class="me-2 text-nowrap">Program</label>
                             <select name="program_id" class="form-select form-select-sm w-auto" onchange="this.form.submit()" id="select-program">
-                                <option value="">Pilih Program</option>
+                                <option value="">--- Pilih Program ---</option>
                                 @foreach($programList as $prog)
-                                    <option value="{{ $prog->id }}" {{ request('program_id') == $prog->id ? 'selected' : '' }}>{{ $prog->nama }}</option>
+                                    <option value="{{ $prog->id }}" {{ request('program_id') == $prog->id ? 'selected' : '' }}>{{ $prog->nama_singkat }}</option>
                                 @endforeach
                             </select>
                         </div>
@@ -102,9 +102,8 @@
                         <input type="text" name="search" class="form-control" placeholder="Cari Nama Petani..." value="{{ request('search') }}">
                         <button type="submit" class="btn btn-outline-primary"><i class="ti tabler-search"></i></button>
                     </div>
-                    <a href="{{ route('petani-cpm.create', ['program_id' => request('program_id')]) }}" class="btn btn-sm btn-primary"
-                        style="display: {{ request('program_id') ? 'flex' : 'none' }};">
-                        <i class="ti tabler-plus me-1"></i> Tambah
+                    <a href="{{ route('petani-cpm.create', ['program_id' => request('program_id')]) }}" class="btn btn-sm btn-primary flex-shrink-0">
+                        <i class="icon-base ti tabler-plus me-1"></i> Tambah
                     </a>
                 </div>
             </form>
@@ -159,6 +158,7 @@
     'use strict';
 
     $(document).ready(function () {
+        $('#select-program').select2();
         
         $(".delete-record").click(function (e) {
             e.preventDefault();
diff --git a/resources/views/ekosistem/petani-cpm/view.blade.php b/resources/views/ekosistem/petani-cpm/view.blade.php
index 32212be..4c292ae 100644
--- a/resources/views/ekosistem/petani-cpm/view.blade.php
+++ b/resources/views/ekosistem/petani-cpm/view.blade.php
@@ -4,7 +4,7 @@
 <div class="container-xxl flex-grow-1 container-p-y">
     <div class="card">
         <div class="card-header border-bottom mb-4">
-            <h5 class="card-title mb-0">Edit Petani (CPM)</h5>
+            <h5 class="card-title mb-0">Data Petani (CPM)</h5>
         </div>
         
         <div class="card-body">
diff --git a/resources/views/ekosistem/value-basis-data/index.blade.php b/resources/views/ekosistem/value-basis-data/index.blade.php
index 96be1fe..dc7faa4 100644
--- a/resources/views/ekosistem/value-basis-data/index.blade.php
+++ b/resources/views/ekosistem/value-basis-data/index.blade.php
@@ -49,16 +49,15 @@
                 <div class="col-md-auto d-flex gap-2">
                     @if (app()->has('SystemProgram'))
                     @else
-                    <div class="col-md-auto">
+                    <div class="col-6">
                         <div class="d-flex align-items-center">
                             <label class="me-2 text-nowrap">Program</label>
-                            <select name="program_id" class="form-select form-select-sm w-auto" onchange="this.form.submit()">
-                                <option value="">Pilih Program</option>
+                            <select name="program_id" class="form-select form-select-sm w-auto" onchange="this.form.submit()" id="program_id">
+                                <option value="">--- Pilih Program ---</option>
                                 @foreach($programList as $prog)
-                                    <option value="{{ $prog->id }}" {{ request('program_id') == $prog->id ? 'selected' : '' }}>{{ $prog->nama }}</option>
+                                    <option value="{{ $prog->id }}" {{ request('program_id') == $prog->id ? 'selected' : '' }}>{{ $prog->nama_singkat }}</option>
                                 @endforeach
                             </select>
-                            <label class="ms-2 text-nowrap">entries</label>
                         </div>
                     </div>
                     @endif
@@ -66,9 +65,8 @@
                         <input type="text" name="search" class="form-control" placeholder="Cari Nama Tabel..." value="{{ request('search') }}">
                         <button type="submit" class="btn btn-outline-primary"><i class="ti tabler-search"></i></button>
                     </div>
-                    <a href="{{ route('tabel.data.create', [$tabel->id, 'program_id' => request('program_id')]) }}" class="btn btn-sm btn-primary add-new"
-                        style="display: {{ request('program_id') ? 'flex' : 'none' }};">
-                        <i class="ti tabler-plus me-1"></i> Tambah
+                    <a href="{{ route('tabel.data.create', [$tabel->id, 'program_id' => request('program_id')]) }}" class="btn btn-sm btn-primary flex-shrink-0 add-new">
+                        <i class="icon-xs icon-base ti tabler-plus me-1"></i> Tambah
                     </a>
                 </div>
             </form>
@@ -123,6 +121,8 @@
     'use strict';
 
     $(document).ready(function () {
+        $('#program_id').select2();
+
         $(".delete-record").click(function (e) {
             e.preventDefault();
             const id = $(this).data('id');
diff --git a/resources/views/layout/sidebar.blade.php b/resources/views/layout/sidebar.blade.php
index d7884b1..511f93d 100644
--- a/resources/views/layout/sidebar.blade.php
+++ b/resources/views/layout/sidebar.blade.php
@@ -122,7 +122,7 @@
             </li>
         </ul>
     </li>
-    <li class="menu-item {{ request()->routeIs(['petani-cpm.*','tabel.data.*']) ? 'active open' : '' }}">
+    <li class="menu-item {{ request()->routeIs(['petani-cpm.*', 'lahan-cpcl.*', 'tabel.data.*']) ? 'active open' : '' }}">
         <a href="javascript:void(0);" class="menu-link menu-toggle">
             <i class="menu-icon icon-base ti tabler-folder-root"></i>
             <div data-i18n="Basis Data Ekosistem">Basis Data Ekosistem</div>
@@ -130,7 +130,14 @@
         <ul class="menu-sub">
             <li class="menu-item {{ request()->routeIs('petani-cpm.*') ? 'active' : '' }}">
                 <a href="{{ route('petani-cpm.index') }}" class="menu-link">
-                <div data-i18n="Petani">Petani</div>
+                <div data-i18n="Petani CPM">Petani CPM</div>
+                </a>
+            </li>
+        </ul>
+        <ul class="menu-sub">
+            <li class="menu-item {{ request()->routeIs('lahan-cpcl.*') ? 'active' : '' }}">
+                <a href="{{ route('lahan-cpcl.index') }}" class="menu-link">
+                <div data-i18n="Lahan CPCL">Lahan CPCL</div>
                 </a>
             </li>
         </ul>
@@ -164,11 +171,18 @@
             </li>
         </ul>
     </li> -->
-    <li class="menu-item">
+    <li class="menu-item {{ request()->routeIs(['realisasi.*', 'kelompok-belajar-tani.*', 'workshop.*']) ? 'active open' : '' }}">
         <a href="javascript:void(0);" class="menu-link menu-toggle">
             <i class="menu-icon icon-base ti tabler-webhook"></i>
             <div data-i18n="Program & Komunitas">Program & Komunitas</div>
         </a>
+        <ul class="menu-sub">
+            <li class="menu-item {{ request()->routeIs('realisasi.*') ? 'active' : '' }}">
+                <a href="{{ route('realisasi.index') }}" class="menu-link">
+                <div data-i18n="Capaian Program">Capaian Program</div>
+                </a>
+            </li>
+        </ul>
         <ul class="menu-sub">
             <li class="menu-item {{ request()->routeIs('kelompok-belajar-tani.*') ? 'active' : '' }}">
                 <a href="{{ route('kelompok-belajar-tani.index') }}" class="menu-link">
@@ -177,19 +191,19 @@
             </li>
         </ul>
         <ul class="menu-sub">
-            <li class="menu-item">
+            <li class="menu-item {{ request()->routeIs('workshop.*') ? 'active' : '' }}">
                 <a href="{{ route('workshop.index') }}" class="menu-link">
                 <div data-i18n="Workshop & Lokakarya">Workshop & Lokakarya</div>
                 </a>
             </li>
         </ul>
-        <ul class="menu-sub">
+        <!-- <ul class="menu-sub">
             <li class="menu-item">
                 <a href="#" class="menu-link">
                 <div data-i18n="Desiminasi & Replikasi">Desiminasi & Replikasi</div>
                 </a>
             </li>
-        </ul>
+        </ul> -->
     </li>
     <!-- Master Data -->
     <li class="menu-header small">
@@ -202,26 +216,26 @@
         <div data-i18n="Wilayah">Wilayah</div>
         </a>
         <ul class="menu-sub">
-        <li class="menu-item">
-            <a href="{{ route('provinsi.index') }}" class="menu-link">
-            <div data-i18n="Provinsi">provinsi</div>
-            </a>
-        </li>
-        <li class="menu-item">
-            <a href="{{ route('kabupatenkota.index') }}" class="menu-link">
-            <div data-i18n="Kabupaten Kota">Kabupaten Kota</div>
-            </a>
-        </li>
-        <li class="menu-item">
-            <a href="{{ route('kecamatan.index') }}" class="menu-link">
-            <div data-i18n="Kecamatan">Kecamatan</div>
-            </a>
-        </li>
-        <li class="menu-item">
-            <a href="{{ route('desakelurahan.index') }}" class="menu-link">
-            <div data-i18n="Desa Kelurahan">Desa Kelurahan</div>
-            </a>
-        </li>
+            <li class="menu-item">
+                <a href="{{ route('provinsi.index') }}" class="menu-link">
+                <div data-i18n="Provinsi">provinsi</div>
+                </a>
+            </li>
+            <li class="menu-item">
+                <a href="{{ route('kabupatenkota.index') }}" class="menu-link">
+                <div data-i18n="Kabupaten Kota">Kabupaten Kota</div>
+                </a>
+            </li>
+            <li class="menu-item">
+                <a href="{{ route('kecamatan.index') }}" class="menu-link">
+                <div data-i18n="Kecamatan">Kecamatan</div>
+                </a>
+            </li>
+            <li class="menu-item">
+                <a href="{{ route('desakelurahan.index') }}" class="menu-link">
+                <div data-i18n="Desa Kelurahan">Desa Kelurahan</div>
+                </a>
+            </li>
         </ul>
     </li>
     <li class="menu-item">
diff --git a/resources/views/master/jeniskomoditas/add.blade.php b/resources/views/master/jeniskomoditas/add.blade.php
new file mode 100644
index 0000000..543735d
--- /dev/null
+++ b/resources/views/master/jeniskomoditas/add.blade.php
@@ -0,0 +1,42 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasAddJenisKomoditas" aria-labelledby="offcanvasAddJenisKomoditasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasAddJenisKomoditasLabel" class="offcanvas-title">Tambah Jenis Komoditas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <form class="add-new-jeniskomoditas pt-0" id="addNewJenisKomoditasForm" action="{{ route('jenis-komoditas.store') }}" method="POST">
+            @csrf
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-jenis-komoditas-komoditas">
+                    Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="add-jenis-komoditas-komoditas" name="komoditas_id" class="select2 form-select" data-placeholder="Pilih Komoditas">
+                    <option value=""></option>
+                    @foreach($komoditas as $item)
+                        <option value="{{ $item->id }}">{{ $item->nama }}</option>
+                    @endforeach
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-jenis-komoditas-name">
+                    Nama Jenis Komoditas <span class="text-danger">*</span>
+                </label>
+                <input
+                    type="text"
+                    class="form-control"
+                    id="add-jenis-komoditas-name"
+                    placeholder="Contoh: Kopi Arabika"
+                    name="nama"
+                    autocomplete="off" />
+            </div>
+
+            <div class="mt-8">
+                <button type="submit" class="btn btn-primary me-3 data-submit">Submit</button>
+                <button type="reset" class="btn btn-label-danger" data-bs-dismiss="offcanvas">Cancel</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/master/jeniskomoditas/edit.blade.php b/resources/views/master/jeniskomoditas/edit.blade.php
new file mode 100644
index 0000000..fd9a5dd
--- /dev/null
+++ b/resources/views/master/jeniskomoditas/edit.blade.php
@@ -0,0 +1,45 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasEditJenisKomoditas" aria-labelledby="offcanvasEditJenisKomoditasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasEditJenisKomoditasLabel" class="offcanvas-title">Edit Jenis Komoditas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <form class="edit-jeniskomoditas pt-0" id="editJenisKomoditasForm" method="POST">
+            @csrf
+            @method('PUT')
+
+            <input type="hidden" id="edit-jenis-komoditas-id" name="id">
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-jenis-komoditas-komoditas">
+                    Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="edit-jenis-komoditas-komoditas" name="komoditas_id" class="select2 form-select" data-placeholder="Pilih Komoditas">
+                    <option value=""></option>
+                    @foreach($komoditas as $item)
+                        <option value="{{ $item->id }}">{{ $item->nama }}</option>
+                    @endforeach
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-jenis-komoditas-name">
+                    Nama Jenis Komoditas <span class="text-danger">*</span>
+                </label>
+                <input
+                    type="text"
+                    class="form-control"
+                    id="edit-jenis-komoditas-name"
+                    placeholder="Contoh: Kopi Arabika"
+                    name="nama"
+                    autocomplete="off" />
+            </div>
+
+            <div class="mt-8">
+                <button type="submit" class="btn btn-primary me-3 data-submit">Update</button>
+                <button type="reset" class="btn btn-label-danger" data-bs-dismiss="offcanvas">Cancel</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/master/jeniskomoditas/index.blade.php b/resources/views/master/jeniskomoditas/index.blade.php
new file mode 100644
index 0000000..936d389
--- /dev/null
+++ b/resources/views/master/jeniskomoditas/index.blade.php
@@ -0,0 +1,485 @@
+@extends('layout.main')
+
+@section('content')
+<div class="container-xxl flex-grow-1 container-p-y">
+
+    <div class="card">
+        <div class="card-header border-bottom">
+            <div class="d-flex flex-column flex-md-row justify-content-between align-items-md-center gap-3">
+                <div>
+                    <h5 class="card-title mb-0">Jenis Komoditas</h5>
+                    <small class="text-muted">Kelola data jenis komoditas</small>
+                </div>
+
+                <button
+                    type="button"
+                    class="btn btn-primary"
+                    data-bs-toggle="offcanvas"
+                    data-bs-target="#offcanvasAddJenisKomoditas">
+                    <i class="ti tabler-plus me-1"></i>
+                    Tambah Jenis Komoditas
+                </button>
+            </div>
+        </div>
+
+        <div class="card-body border-bottom">
+            <form
+                method="GET"
+                action="{{ route('jenis-komoditas.index') }}"
+                class="row g-3 align-items-center justify-content-between">
+
+                <div class="col-md-auto">
+                    <div class="d-flex align-items-center">
+                        <label class="me-2 text-nowrap">Show</label>
+                        <select name="per_page" class="form-select form-select-sm w-auto" onchange="this.form.submit()">
+                            @foreach([10, 25, 50, 100] as $limit)
+                                <option value="{{ $limit }}" {{ (int) request('per_page', 10) === $limit ? 'selected' : '' }}>
+                                    {{ $limit }}
+                                </option>
+                            @endforeach
+                        </select>
+                        <label class="ms-2 text-nowrap">entries</label>
+                    </div>
+                </div>
+
+                <div class="col-md-auto">
+                    <div class="input-group input-group-sm">
+                        <input
+                            type="text"
+                            name="search"
+                            class="form-control"
+                            placeholder="Cari jenis komoditas..."
+                            value="{{ request('search') }}">
+
+                        @if(request('search'))
+                            <a href="{{ route('jenis-komoditas.index', ['per_page' => request('per_page', 10)]) }}"
+                               class="btn btn-outline-secondary">
+                                <i class="ti tabler-x"></i>
+                            </a>
+                        @endif
+
+                        <button type="submit" class="btn btn-outline-primary">
+                            <i class="ti tabler-search"></i>
+                        </button>
+                    </div>
+                </div>
+            </form>
+        </div>
+
+        <div class="table-responsive text-nowrap">
+            <table class="table table-hover">
+                <thead class="border-top">
+                    <tr>
+                        <th style="width: 70px;">No</th>
+                        <th>Nama Jenis Komoditas</th>
+                        <th>Komoditas</th>
+                        <th class="text-center" style="width: 160px;">Actions</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    @forelse($jenisKomoditas as $index => $jenis)
+                        @php
+                            $komoditasNama = $jenis->komoditas->nama ?? '-';
+                            $words = preg_split('/\s+/', trim($komoditasNama));
+                            $initials = collect($words)
+                                ->filter()
+                                ->map(fn($word) => strtoupper(substr($word, 0, 1)))
+                                ->take(2)
+                                ->implode('');
+
+                            $states = ['success', 'danger', 'warning', 'info', 'primary', 'secondary'];
+                            $state = $states[$jenis->id % count($states)];
+                        @endphp
+
+                        <tr>
+                            <td>{{ $jenisKomoditas->firstItem() + $index }}</td>
+
+                            <td>
+                                <div class="d-flex justify-content-start align-items-center">
+                                    <div class="avatar-wrapper me-3">
+                                        <div class="avatar avatar-sm">
+                                            <span class="avatar-initial rounded-circle bg-label-{{ $state }}">
+                                                {{ $initials ?: 'JK' }}
+                                            </span>
+                                        </div>
+                                    </div>
+
+                                    <div class="d-flex flex-column">
+                                        <span class="fw-medium text-heading">{{ $jenis->nama }}</span>
+                                        <small class="text-muted">ID: {{ $jenis->id }}</small>
+                                    </div>
+                                </div>
+                            </td>
+
+                            <td>
+                                <span class="badge bg-label-secondary">
+                                    {{ $komoditasNama }}
+                                </span>
+                            </td>
+
+                            <td>
+                                <div class="d-flex justify-content-center align-items-center">
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill view-record"
+                                        data-id="{{ $jenis->id }}"
+                                        title="Lihat">
+                                        <i class="ti tabler-eye ti-md"></i>
+                                    </button>
+
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill edit-record"
+                                        data-id="{{ $jenis->id }}"
+                                        title="Edit">
+                                        <i class="ti tabler-edit ti-md"></i>
+                                    </button>
+
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill delete-record"
+                                        data-id="{{ $jenis->id }}"
+                                        data-nama="{{ $jenis->nama }}"
+                                        title="Hapus">
+                                        <i class="ti tabler-trash ti-md"></i>
+                                    </button>
+                                </div>
+                            </td>
+                        </tr>
+                    @empty
+                        <tr>
+                            <td colspan="5" class="text-center py-5">
+                                <div class="d-flex flex-column align-items-center">
+                                    <i class="ti tabler-database-off ti-lg mb-2 text-muted"></i>
+                                    <span class="text-muted">Tidak ada data ditemukan.</span>
+                                </div>
+                            </td>
+                        </tr>
+                    @endforelse
+                </tbody>
+            </table>
+        </div>
+
+        @if($jenisKomoditas->hasPages())
+            <div class="card-footer d-flex justify-content-center justify-content-md-end border-top">
+                {{ $jenisKomoditas->appends(request()->query())->links('pagination::bootstrap-5') }}
+            </div>
+        @endif
+    </div>
+</div>
+
+@include('master.jeniskomoditas.add')
+@include('master.jeniskomoditas.edit')
+@include('master.jeniskomoditas.view')
+@endsection
+
+
+@push('scripts')
+<script>
+'use strict';
+
+$(function () {
+    const csrfToken = "{{ csrf_token() }}";
+    const baseUrl = "{{ url('jenis-komoditas') }}";
+
+    const offcanvasAdd = new bootstrap.Offcanvas(document.getElementById('offcanvasAddJenisKomoditas'));
+    const offcanvasEdit = new bootstrap.Offcanvas(document.getElementById('offcanvasEditJenisKomoditas'));
+    const offcanvasView = new bootstrap.Offcanvas(document.getElementById('offcanvasViewJenisKomoditas'));
+
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': csrfToken
+        }
+    });
+
+    $('.select2').each(function () {
+        const $this = $(this);
+
+        $this.wrap('<div class="position-relative"></div>').select2({
+            dropdownParent: $this.parent(),
+            placeholder: $this.data('placeholder') || 'Pilih data',
+            allowClear: true,
+            width: '100%'
+        });
+    });
+
+    $.validator.setDefaults({
+        errorElement: 'div',
+        errorClass: 'invalid-feedback',
+        highlight: function (element) {
+            $(element).addClass('is-invalid');
+        },
+        unhighlight: function (element) {
+            $(element).removeClass('is-invalid');
+        },
+        errorPlacement: function (error, element) {
+            if (element.hasClass('select2-hidden-accessible')) {
+                error.insertAfter(element.next('.select2-container'));
+            } else {
+                error.appendTo(element.closest('.form-control-validation'));
+            }
+        }
+    });
+
+    $('.select2').on('change', function () {
+        const $form = $(this).closest('form');
+
+        if ($form.data('validator')) {
+            $(this).valid();
+        }
+    });
+
+    function showSuccess(title = 'Berhasil!', text = 'Data berhasil diproses') {
+        return Swal.fire({
+            icon: 'success',
+            title,
+            text,
+            showConfirmButton: false,
+            timer: 1500,
+            customClass: {
+                confirmButton: 'btn btn-primary'
+            },
+            buttonsStyling: false
+        });
+    }
+
+    function showError(xhr, fallback = 'Terjadi kesalahan sistem.') {
+        let message = fallback;
+
+        if (xhr.responseJSON?.message) {
+            message = xhr.responseJSON.message;
+        }
+
+        if (xhr.responseJSON?.errors) {
+            message = Object.values(xhr.responseJSON.errors).flat().join('<br>');
+        }
+
+        return Swal.fire({
+            icon: 'error',
+            title: 'Gagal!',
+            html: message,
+            customClass: {
+                confirmButton: 'btn btn-primary'
+            },
+            buttonsStyling: false
+        });
+    }
+
+    function resetForm($form) {
+        if (!$form.length) return;
+
+        $form[0].reset();
+
+        if ($form.data('validator')) {
+            $form.validate().resetForm();
+        }
+
+        $form.find('.is-invalid').removeClass('is-invalid');
+
+        $form.find('.select2').each(function () {
+            $(this).val('').trigger('change.select2');
+        });
+    }
+
+    function setButtonLoading($button, isLoading, text = 'Menyimpan...') {
+        if (isLoading) {
+            $button
+                .data('original-text', $button.html())
+                .prop('disabled', true)
+                .html(`<span class="spinner-border spinner-border-sm me-1"></span>${text}`);
+        } else {
+            $button
+                .prop('disabled', false)
+                .html($button.data('original-text'));
+        }
+    }
+
+    $('#addNewJenisKomoditasForm').validate({
+        rules: {
+            komoditas_id: {
+                required: true
+            },
+            nama: {
+                required: true,
+                maxlength: 255
+            }
+        },
+        messages: {
+            komoditas_id: {
+                required: 'Komoditas wajib dipilih'
+            },
+            nama: {
+                required: 'Nama jenis komoditas wajib diisi',
+                maxlength: 'Nama maksimal 255 karakter'
+            }
+        },
+        submitHandler: function (form, event) {
+            event.preventDefault();
+
+            const $form = $(form);
+            const $button = $form.find('button[type="submit"]');
+
+            setButtonLoading($button, true);
+
+            $.ajax({
+                url: $form.attr('action'),
+                type: 'POST',
+                data: $form.serialize(),
+                success: function (res) {
+                    offcanvasAdd.hide();
+
+                    showSuccess(
+                        'Berhasil!',
+                        res.message || 'Data jenis komoditas berhasil disimpan'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal menyimpan data jenis komoditas');
+                },
+                complete: function () {
+                    setButtonLoading($button, false);
+                }
+            });
+        }
+    });
+
+    $('#offcanvasAddJenisKomoditas').on('hidden.bs.offcanvas', function () {
+        resetForm($('#addNewJenisKomoditasForm'));
+    });
+
+    $(document).on('click', '.edit-record', function () {
+        const id = $(this).data('id');
+        const $form = $('#editJenisKomoditasForm');
+
+        resetForm($form);
+
+        $.ajax({
+            url: `${baseUrl}/${id}`,
+            type: 'GET',
+            success: function (res) {
+                const data = res.data || res;
+
+                $('#edit-jenis-komoditas-id').val(data.id);
+                $('#edit-jenis-komoditas-komoditas').val(data.komoditas_id).trigger('change');
+                $('#edit-jenis-komoditas-name').val(data.nama);
+
+                offcanvasEdit.show();
+            },
+            error: function (xhr) {
+                showError(xhr, 'Terjadi kesalahan saat mengambil data edit');
+            }
+        });
+    });
+
+    $('#editJenisKomoditasForm').validate({
+        rules: {
+            komoditas_id: {
+                required: true
+            },
+            nama: {
+                required: true,
+                maxlength: 255
+            }
+        },
+        messages: {
+            komoditas_id: {
+                required: 'Komoditas wajib dipilih'
+            },
+            nama: {
+                required: 'Nama jenis komoditas wajib diisi',
+                maxlength: 'Nama maksimal 255 karakter'
+            }
+        },
+        submitHandler: function (form, event) {
+            event.preventDefault();
+
+            const $form = $(form);
+            const id = $('#edit-jenis-komoditas-id').val();
+            const $button = $form.find('button[type="submit"]');
+
+            setButtonLoading($button, true, 'Mengupdate...');
+
+            $.ajax({
+                url: `${baseUrl}/${id}`,
+                type: 'POST',
+                data: $form.serialize(),
+                success: function (res) {
+                    offcanvasEdit.hide();
+
+                    showSuccess(
+                        'Updated!',
+                        res.message || 'Data jenis komoditas berhasil diperbarui'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal mengupdate data jenis komoditas');
+                },
+                complete: function () {
+                    setButtonLoading($button, false);
+                }
+            });
+        }
+    });
+
+    $('#offcanvasEditJenisKomoditas').on('hidden.bs.offcanvas', function () {
+        resetForm($('#editJenisKomoditasForm'));
+    });
+
+    $(document).on('click', '.view-record', function () {
+        const id = $(this).data('id');
+
+        $.ajax({
+            url: `${baseUrl}/${id}`,
+            type: 'GET',
+            success: function (res) {
+                const data = res.data || res;
+
+                $('#view-jenis-komoditas-komoditas').val(data.komoditas?.nama || data.nama_komoditas || '-');
+                $('#view-jenis-komoditas-name').val(data.nama || '-');
+
+                offcanvasView.show();
+            },
+            error: function (xhr) {
+                showError(xhr, 'Terjadi kesalahan saat mengambil detail data');
+            }
+        });
+    });
+
+    $(document).on('click', '.delete-record', function () {
+        const id = $(this).data('id');
+        const nama = $(this).data('nama') || 'data ini';
+
+        Swal.fire({
+            title: 'Apakah Anda yakin?',
+            text: `Jenis Komoditas "${nama}" akan dihapus secara permanen.`,
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Ya, Hapus!',
+            cancelButtonText: 'Batal',
+            customClass: {
+                confirmButton: 'btn btn-primary me-3',
+                cancelButton: 'btn btn-label-secondary'
+            },
+            buttonsStyling: false
+        }).then(function (result) {
+            if (!result.isConfirmed) return;
+
+            $.ajax({
+                url: `${baseUrl}/${id}`,
+                type: 'DELETE',
+                success: function (res) {
+                    showSuccess(
+                        'Terhapus!',
+                        res.message || 'Data jenis komoditas berhasil dihapus'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal menghapus data jenis komoditas');
+                }
+            });
+        });
+    });
+});
+</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/master/jeniskomoditas/view.blade.php b/resources/views/master/jeniskomoditas/view.blade.php
new file mode 100644
index 0000000..b4f71d6
--- /dev/null
+++ b/resources/views/master/jeniskomoditas/view.blade.php
@@ -0,0 +1,24 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasViewJenisKomoditas" aria-labelledby="offcanvasViewJenisKomoditasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasViewJenisKomoditasLabel" class="offcanvas-title">Detail Jenis Komoditas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <div class="mb-6">
+            <label class="form-label">Komoditas</label>
+            <input type="text" class="form-control" id="view-jenis-komoditas-komoditas" readonly>
+        </div>
+
+        <div class="mb-6">
+            <label class="form-label">Nama Jenis Komoditas</label>
+            <input type="text" class="form-control" id="view-jenis-komoditas-name" readonly>
+        </div>
+
+        <div class="mt-8">
+            <button type="button" class="btn btn-label-secondary" data-bs-dismiss="offcanvas">
+                Tutup
+            </button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/master/varietas/add.blade.php b/resources/views/master/varietas/add.blade.php
new file mode 100644
index 0000000..25717c2
--- /dev/null
+++ b/resources/views/master/varietas/add.blade.php
@@ -0,0 +1,61 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasAddVarietas" aria-labelledby="offcanvasAddVarietasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasAddVarietasLabel" class="offcanvas-title">Tambah Varietas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <form class="add-new-varietas pt-0" id="addNewVarietasForm" action="{{ route('varietas.store') }}" method="POST">
+            @csrf
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-varietas-komoditas">
+                    Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="add-varietas-komoditas" name="komoditas_id" class="select2 form-select" data-placeholder="Pilih Komoditas">
+                    <option value=""></option>
+                    @foreach($komoditas as $item)
+                        <option value="{{ $item->id }}">{{ $item->nama }}</option>
+                    @endforeach
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-varietas-jenis-komoditas">
+                    Jenis Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="add-varietas-jenis-komoditas" name="jenis_komoditas_id" class="select2 form-select" data-placeholder="Pilih Jenis Komoditas">
+                    <option value=""></option>
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-varietas-name">
+                    Nama Varietas <span class="text-danger">*</span>
+                </label>
+                <input
+                    type="text"
+                    class="form-control"
+                    id="add-varietas-name"
+                    placeholder="Contoh: Ciherang"
+                    name="nama"
+                    autocomplete="off">
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="add-varietas-description">Deskripsi</label>
+                <textarea
+                    class="form-control"
+                    id="add-varietas-description"
+                    placeholder="Opsional"
+                    name="deskripsi"
+                    rows="3"></textarea>
+            </div>
+
+            <div class="mt-8">
+                <button type="submit" class="btn btn-primary me-3 data-submit">Submit</button>
+                <button type="reset" class="btn btn-label-danger" data-bs-dismiss="offcanvas">Cancel</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/master/varietas/edit.blade.php b/resources/views/master/varietas/edit.blade.php
new file mode 100644
index 0000000..42a5300
--- /dev/null
+++ b/resources/views/master/varietas/edit.blade.php
@@ -0,0 +1,64 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasEditVarietas" aria-labelledby="offcanvasEditVarietasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasEditVarietasLabel" class="offcanvas-title">Edit Varietas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <form class="edit-varietas pt-0" id="editVarietasForm" method="POST">
+            @csrf
+            @method('PUT')
+
+            <input type="hidden" id="edit-varietas-id" name="id">
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-varietas-komoditas">
+                    Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="edit-varietas-komoditas" name="komoditas_id" class="select2 form-select" data-placeholder="Pilih Komoditas">
+                    <option value=""></option>
+                    @foreach($komoditas as $item)
+                        <option value="{{ $item->id }}">{{ $item->nama }}</option>
+                    @endforeach
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-varietas-jenis-komoditas">
+                    Jenis Komoditas <span class="text-danger">*</span>
+                </label>
+                <select id="edit-varietas-jenis-komoditas" name="jenis_komoditas_id" class="select2 form-select" data-placeholder="Pilih Jenis Komoditas">
+                    <option value=""></option>
+                </select>
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-varietas-name">
+                    Nama Varietas <span class="text-danger">*</span>
+                </label>
+                <input
+                    type="text"
+                    class="form-control"
+                    id="edit-varietas-name"
+                    placeholder="Contoh: Ciherang"
+                    name="nama"
+                    autocomplete="off">
+            </div>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="edit-varietas-description">Deskripsi</label>
+                <textarea
+                    class="form-control"
+                    id="edit-varietas-description"
+                    placeholder="Opsional"
+                    name="deskripsi"
+                    rows="3"></textarea>
+            </div>
+
+            <div class="mt-8">
+                <button type="submit" class="btn btn-primary me-3 data-submit">Update</button>
+                <button type="reset" class="btn btn-label-danger" data-bs-dismiss="offcanvas">Cancel</button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/master/varietas/index.blade.php b/resources/views/master/varietas/index.blade.php
new file mode 100644
index 0000000..ffd26ca
--- /dev/null
+++ b/resources/views/master/varietas/index.blade.php
@@ -0,0 +1,547 @@
+@extends('layout.main')
+
+@section('content')
+<div class="container-xxl flex-grow-1 container-p-y">
+    <div class="card">
+        <div class="card-body border-bottom">
+            <form method="GET" action="{{ route('varietas.index') }}" class="d-flex justify-content-between align-items-center row gap-3 gap-md-0">
+                <div class="col-md-auto">
+                    <div class="d-flex align-items-center">
+                        <label class="me-2 text-nowrap">Show</label>
+                        <select name="per_page" class="form-select form-select-sm w-auto" onchange="this.form.submit()">
+                            <option value="10" {{ request('per_page') == 10 ? 'selected' : '' }}>10</option>
+                            <option value="25" {{ request('per_page') == 25 ? 'selected' : '' }}>25</option>
+                            <option value="50" {{ request('per_page') == 50 ? 'selected' : '' }}>50</option>
+                            <option value="100" {{ request('per_page') == 100 ? 'selected' : '' }}>100</option>
+                        </select>
+                        <label class="ms-2 text-nowrap">entries</label>
+                    </div>
+                </div>
+
+                <div class="col-md-auto d-flex gap-2">
+                    <div class="input-group input-group-sm w-auto">
+                        <input
+                            type="text"
+                            name="search"
+                            class="form-control"
+                            placeholder="Cari Varietas..."
+                            value="{{ request('search') }}">
+
+                        @if(request('search'))
+                            <a href="{{ route('varietas.index', ['per_page' => request('per_page', 10)]) }}" class="btn btn-outline-secondary">
+                                <i class="ti tabler-x"></i>
+                            </a>
+                        @endif
+
+                        <button type="submit" class="btn btn-outline-primary">
+                            <i class="ti tabler-search"></i>
+                        </button>
+                    </div>
+
+                    <button
+                        type="button"
+                        class="btn btn-sm btn-primary add-new"
+                        data-bs-toggle="offcanvas"
+                        data-bs-target="#offcanvasAddVarietas">
+                        <i class="ti tabler-plus me-1"></i> Tambah
+                    </button>
+                </div>
+            </form>
+        </div>
+
+        <div class="table-responsive text-nowrap">
+            <table class="table table-hover">
+                <thead class="border-top">
+                    <tr>
+                        <th>No</th>
+                        <th>Nama Varietas</th>
+                        <th>Komoditas</th>
+                        <th>Jenis Komoditas</th>
+                        <th class="text-center">Actions</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    @forelse($varietas as $index => $item)
+                        @php
+                            $namaVarietas = $item->nama ?? '-';
+                            $words = preg_split('/\s+/', trim($namaVarietas));
+                            $initials = collect($words)
+                                ->filter()
+                                ->map(fn($word) => strtoupper(substr($word, 0, 1)))
+                                ->take(2)
+                                ->implode('');
+
+                            $states = ['success', 'danger', 'warning', 'info', 'primary', 'secondary'];
+                            $state = $states[$item->id % count($states)];
+                        @endphp
+
+                        <tr>
+                            <td>{{ $varietas->firstItem() + $index }}</td>
+
+                            <td>
+                                <div class="d-flex justify-content-start align-items-center">
+                                    <div class="avatar-wrapper me-3">
+                                        <div class="avatar avatar-sm">
+                                            <span class="avatar-initial rounded-circle bg-label-{{ $state }}">
+                                                {{ $initials ?: 'VR' }}
+                                            </span>
+                                        </div>
+                                    </div>
+
+                                    <div class="d-flex flex-column">
+                                        <span class="fw-medium text-heading">{{ $item->nama }}</span>
+                                        <small class="text-muted">{{ $item->deskripsi }}</small>
+                                    </div>
+                                </div>
+                            </td>
+
+                            <td>
+                                <span class="badge bg-label-secondary">
+                                    {{ $item->komoditas->nama ?? '-' }}
+                                </span>
+                            </td>
+
+                            <td>
+                                <span class="badge bg-label-info">
+                                    {{ $item->jenisKomoditas->nama ?? '-' }}
+                                </span>
+                            </td>
+
+                            <td>
+                                <div class="d-flex justify-content-center align-items-center">
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill view-record"
+                                        data-id="{{ $item->id }}"
+                                        title="Lihat">
+                                        <i class="ti tabler-eye ti-md"></i>
+                                    </button>
+
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill edit-record"
+                                        data-id="{{ $item->id }}"
+                                        title="Edit">
+                                        <i class="ti tabler-edit ti-md"></i>
+                                    </button>
+
+                                    <button
+                                        type="button"
+                                        class="btn btn-icon btn-text-secondary rounded-pill delete-record"
+                                        data-id="{{ $item->id }}"
+                                        data-nama="{{ $item->nama }}"
+                                        title="Hapus">
+                                        <i class="ti tabler-trash ti-md"></i>
+                                    </button>
+                                </div>
+                            </td>
+                        </tr>
+                    @empty
+                        <tr>
+                            <td colspan="6" class="text-center py-4">
+                                Tidak ada data ditemukan.
+                            </td>
+                        </tr>
+                    @endforelse
+                </tbody>
+            </table>
+        </div>
+
+        @if($varietas->hasPages())
+            <div class="card-footer d-flex justify-content-center justify-content-md-end border-top">
+                {{ $varietas->appends(request()->query())->links('pagination::bootstrap-5') }}
+            </div>
+        @endif
+    </div>
+</div>
+
+@include('master.varietas.add')
+@include('master.varietas.edit')
+@include('master.varietas.view')
+@endsection
+
+@push('scripts')
+<script>
+'use strict';
+
+$(function () {
+    const csrfToken = "{{ csrf_token() }}";
+    const baseUrl = "{{ url('varietas') }}";
+
+    const offcanvasAdd = new bootstrap.Offcanvas(document.getElementById('offcanvasAddVarietas'));
+    const offcanvasEdit = new bootstrap.Offcanvas(document.getElementById('offcanvasEditVarietas'));
+    const offcanvasView = new bootstrap.Offcanvas(document.getElementById('offcanvasViewVarietas'));
+
+    $.ajaxSetup({
+        headers: {
+            'X-CSRF-TOKEN': csrfToken
+        }
+    });
+
+    $('.select2').each(function () {
+        const $this = $(this);
+
+        $this.wrap('<div class="position-relative"></div>').select2({
+            dropdownParent: $this.parent(),
+            placeholder: $this.data('placeholder') || 'Pilih data',
+            allowClear: true,
+            width: '100%'
+        });
+    });
+
+    $.validator.setDefaults({
+        errorElement: 'div',
+        errorClass: 'invalid-feedback',
+        highlight: function (element) {
+            $(element).addClass('is-invalid');
+        },
+        unhighlight: function (element) {
+            $(element).removeClass('is-invalid');
+        },
+        errorPlacement: function (error, element) {
+            if (element.hasClass('select2-hidden-accessible')) {
+                error.insertAfter(element.next('.select2-container'));
+            } else {
+                error.appendTo(element.closest('.form-control-validation'));
+            }
+        }
+    });
+
+    $('.select2').on('change', function () {
+        const $form = $(this).closest('form');
+
+        if (!$form.length) return;
+        if (!$form.data('validator')) return;
+
+        $(this).valid();
+    });
+
+    function showSuccess(title = 'Berhasil!', text = 'Data berhasil diproses') {
+        return Swal.fire({
+            icon: 'success',
+            title,
+            text,
+            showConfirmButton: false,
+            timer: 1500,
+            customClass: {
+                confirmButton: 'btn btn-primary'
+            },
+            buttonsStyling: false
+        });
+    }
+
+    function showError(xhr, fallback = 'Terjadi kesalahan sistem.') {
+        let message = fallback;
+
+        if (xhr.responseJSON?.message) {
+            message = xhr.responseJSON.message;
+        }
+
+        if (xhr.responseJSON?.errors) {
+            message = Object.values(xhr.responseJSON.errors).flat().join('<br>');
+        }
+
+        return Swal.fire({
+            icon: 'error',
+            title: 'Gagal!',
+            html: message,
+            customClass: {
+                confirmButton: 'btn btn-primary'
+            },
+            buttonsStyling: false
+        });
+    }
+
+    function setButtonLoading($button, isLoading, text = 'Menyimpan...') {
+        if (isLoading) {
+            $button
+                .data('original-text', $button.html())
+                .prop('disabled', true)
+                .html(`<span class="spinner-border spinner-border-sm me-1"></span>${text}`);
+        } else {
+            $button
+                .prop('disabled', false)
+                .html($button.data('original-text'));
+        }
+    }
+
+    function resetForm($form) {
+        if (!$form.length) return;
+
+        $form[0].reset();
+
+        if ($form.data('validator')) {
+            $form.validate().resetForm();
+        }
+
+        $form.find('.is-invalid').removeClass('is-invalid');
+
+        $form.find('.select2').each(function () {
+            $(this).val('').trigger('change.select2');
+        });
+    }
+
+    function loadJenisKomoditas(komoditasId, targetSelector, selectedId = null) {
+        const $target = $(targetSelector);
+
+        $target.empty().append('<option value=""></option>').trigger('change.select2');
+
+        if (!komoditasId) return;
+
+        $.ajax({
+            url: `/jenis-komoditas-by-komoditas/${komoditasId}`,
+            type: 'GET',
+            success: function (res) {
+                const data = res.data || [];
+
+                data.forEach(function (item) {
+                    const option = new Option(item.nama, item.id, false, false);
+                    $target.append(option);
+                });
+
+                if (selectedId) {
+                    $target.val(selectedId);
+                }
+
+                $target.trigger('change.select2');
+            },
+            error: function (xhr) {
+                showError(xhr, 'Gagal mengambil data jenis komoditas.');
+            }
+        });
+    }
+
+    $('#add-varietas-komoditas').on('change', function () {
+        const komoditasId = $(this).val();
+        loadJenisKomoditas(komoditasId, '#add-varietas-jenis-komoditas');
+    });
+
+    $('#edit-varietas-komoditas').on('change', function () {
+        const komoditasId = $(this).val();
+        loadJenisKomoditas(komoditasId, '#edit-varietas-jenis-komoditas');
+    });
+
+    $('#addNewVarietasForm').validate({
+        rules: {
+            komoditas_id: {
+                required: true
+            },
+            jenis_komoditas_id: {
+                required: true
+            },
+            nama: {
+                required: true,
+                maxlength: 255
+            },
+            deskripsi: {
+                maxlength: 10000
+            }
+        },
+        messages: {
+            komoditas_id: {
+                required: 'Komoditas wajib dipilih'
+            },
+            jenis_komoditas_id: {
+                required: 'Jenis komoditas wajib dipilih'
+            },
+            nama: {
+                required: 'Nama varietas wajib diisi',
+                maxlength: 'Nama maksimal 255 karakter'
+            },
+            deskripsi: {
+                maxlength: 'Deskripsi terlalu panjang'
+            }
+        },
+        submitHandler: function (form, event) {
+            event.preventDefault();
+
+            const $form = $(form);
+            const $button = $form.find('button[type="submit"]');
+
+            setButtonLoading($button, true);
+
+            $.ajax({
+                url: $form.attr('action'),
+                type: 'POST',
+                data: $form.serialize(),
+                success: function (res) {
+                    offcanvasAdd.hide();
+
+                    showSuccess(
+                        'Berhasil!',
+                        res.message || 'Data varietas berhasil disimpan'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal menyimpan data varietas');
+                },
+                complete: function () {
+                    setButtonLoading($button, false);
+                }
+            });
+        }
+    });
+
+    $('#offcanvasAddVarietas').on('hidden.bs.offcanvas', function () {
+        resetForm($('#addNewVarietasForm'));
+        $('#add-varietas-jenis-komoditas').empty().append('<option value=""></option>').trigger('change.select2');
+    });
+
+    $(document).on('click', '.view-record', function () {
+        const id = $(this).data('id');
+
+        $.ajax({
+            url: `${baseUrl}/${id}`,
+            type: 'GET',
+            success: function (res) {
+                const data = res.data || res;
+
+                $('#view-varietas-komoditas').val(data.komoditas?.nama || '-');
+                $('#view-varietas-jenis-komoditas').val(data.jenis_komoditas?.nama || data.jenis_komoditas?.nama || data.jenisKomoditas?.nama || '-');
+                $('#view-varietas-name').val(data.nama || '-');
+                $('#view-varietas-description').val(data.deskripsi || '-');
+
+                offcanvasView.show();
+            },
+            error: function (xhr) {
+                showError(xhr, 'Terjadi kesalahan saat mengambil detail data.');
+            }
+        });
+    });
+
+    $(document).on('click', '.edit-record', function () {
+        const id = $(this).data('id');
+        const $form = $('#editVarietasForm');
+
+        resetForm($form);
+
+        $.ajax({
+            url: `${baseUrl}/${id}`,
+            type: 'GET',
+            success: function (res) {
+                const data = res.data || res;
+
+                $('#edit-varietas-id').val(data.id);
+                $('#edit-varietas-komoditas').val(data.komoditas_id).trigger('change.select2');
+                $('#edit-varietas-name').val(data.nama || '');
+                $('#edit-varietas-description').val(data.deskripsi || '');
+
+                loadJenisKomoditas(
+                    data.komoditas_id,
+                    '#edit-varietas-jenis-komoditas',
+                    data.jenis_komoditas_id
+                );
+
+                offcanvasEdit.show();
+            },
+            error: function (xhr) {
+                showError(xhr, 'Terjadi kesalahan saat mengambil data edit.');
+            }
+        });
+    });
+
+    $('#editVarietasForm').validate({
+        rules: {
+            komoditas_id: {
+                required: true
+            },
+            jenis_komoditas_id: {
+                required: true
+            },
+            nama: {
+                required: true,
+                maxlength: 255
+            },
+            deskripsi: {
+                maxlength: 10000
+            }
+        },
+        messages: {
+            komoditas_id: {
+                required: 'Komoditas wajib dipilih'
+            },
+            jenis_komoditas_id: {
+                required: 'Jenis komoditas wajib dipilih'
+            },
+            nama: {
+                required: 'Nama varietas wajib diisi',
+                maxlength: 'Nama maksimal 255 karakter'
+            },
+            deskripsi: {
+                maxlength: 'Deskripsi terlalu panjang'
+            }
+        },
+        submitHandler: function (form, event) {
+            event.preventDefault();
+
+            const $form = $(form);
+            const id = $('#edit-varietas-id').val();
+            const $button = $form.find('button[type="submit"]');
+
+            setButtonLoading($button, true, 'Mengupdate...');
+
+            $.ajax({
+                url: `${baseUrl}/${id}`,
+                type: 'POST',
+                data: $form.serialize(),
+                success: function (res) {
+                    offcanvasEdit.hide();
+
+                    showSuccess(
+                        'Updated!',
+                        res.message || 'Data varietas berhasil diperbarui'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal mengupdate data varietas');
+                },
+                complete: function () {
+                    setButtonLoading($button, false);
+                }
+            });
+        }
+    });
+
+    $('#offcanvasEditVarietas').on('hidden.bs.offcanvas', function () {
+        resetForm($('#editVarietasForm'));
+        $('#edit-varietas-jenis-komoditas').empty().append('<option value=""></option>').trigger('change.select2');
+    });
+
+    $(document).on('click', '.delete-record', function () {
+        const id = $(this).data('id');
+        const nama = $(this).data('nama') || 'data ini';
+
+        Swal.fire({
+            title: 'Apakah Anda yakin?',
+            text: `Varietas "${nama}" akan dihapus secara permanen.`,
+            icon: 'warning',
+            showCancelButton: true,
+            confirmButtonText: 'Ya, Hapus!',
+            cancelButtonText: 'Batal',
+            customClass: {
+                confirmButton: 'btn btn-primary me-3',
+                cancelButton: 'btn btn-label-secondary'
+            },
+            buttonsStyling: false
+        }).then(function (result) {
+            if (!result.isConfirmed) return;
+
+            $.ajax({
+                url: `${baseUrl}/${id}`,
+                type: 'DELETE',
+                success: function (res) {
+                    showSuccess(
+                        'Terhapus!',
+                        res.message || 'Data varietas berhasil dihapus'
+                    ).then(() => window.location.reload());
+                },
+                error: function (xhr) {
+                    showError(xhr, 'Gagal menghapus data varietas');
+                }
+            });
+        });
+    });
+});
+</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/master/varietas/view.blade.php b/resources/views/master/varietas/view.blade.php
new file mode 100644
index 0000000..fabb816
--- /dev/null
+++ b/resources/views/master/varietas/view.blade.php
@@ -0,0 +1,34 @@
+<div class="offcanvas offcanvas-end" tabindex="-1" id="offcanvasViewVarietas" aria-labelledby="offcanvasViewVarietasLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasViewVarietasLabel" class="offcanvas-title">Detail Varietas</h5>
+        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <div class="mb-6">
+            <label class="form-label">Komoditas</label>
+            <input type="text" class="form-control" id="view-varietas-komoditas" readonly>
+        </div>
+
+        <div class="mb-6">
+            <label class="form-label">Jenis Komoditas</label>
+            <input type="text" class="form-control" id="view-varietas-jenis-komoditas" readonly>
+        </div>
+
+        <div class="mb-6">
+            <label class="form-label">Nama Varietas</label>
+            <input type="text" class="form-control" id="view-varietas-name" readonly>
+        </div>
+
+        <div class="mb-6">
+            <label class="form-label">Deskripsi</label>
+            <textarea class="form-control" id="view-varietas-description" rows="3" readonly></textarea>
+        </div>
+
+        <div class="mt-8">
+            <button type="button" class="btn btn-label-secondary" data-bs-dismiss="offcanvas">
+                Tutup
+            </button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/program/framework/view-aktivitas.blade.php b/resources/views/program/framework/view-aktivitas.blade.php
index a8afbef..b8a952d 100644
--- a/resources/views/program/framework/view-aktivitas.blade.php
+++ b/resources/views/program/framework/view-aktivitas.blade.php
@@ -35,7 +35,7 @@
                                                     <a class="dropdown-item edit-aktivitas" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Aktivitas</a>
                                                     <a class="dropdown-item delete-aktivitas" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $aktivitas->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Aktivitas</a>
                                                     <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
+                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $aktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
                                                     <a class="dropdown-item edit-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-aktivitas-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Target</a>
                                                     <a class="dropdown-item delete-target" href="javascript:void(0);" data-id="{{ $targetAktivitas->id }}" data-aktivitas-id="{{ $targetAktivitas->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $targetAktivitas->variabel }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Target</a>
                                                 </div>
diff --git a/resources/views/program/framework/view.blade copy.php b/resources/views/program/framework/view.blade copy.php
deleted file mode 100644
index ee5ff29..0000000
--- a/resources/views/program/framework/view.blade copy.php	
+++ /dev/null
@@ -1,296 +0,0 @@
-@extends('layout.main')
-
-@section('content')
-<div class="container-xxl flex-grow-1 container-p-y">
-    <div class="card">
-        <div class="card-header border-bottom mb-4">
-            <h5 class="card-title mb-0">Lihat Kerangka Kerja</h5>
-        </div>
-        
-        <div class="card-body">
-            <form id="viewFrameworkForm">
-                @csrf
-                
-                <h6 class="mb-3">Informasi Kerangka Kerja</h6>
-                <div class="row">
-                    <div class="col-md-3 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-nama">Nama Kerangka Kerja<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="update" name="nama" placeholder="Cth: Tabel Pertanian" value="{{ old('nama', $framework->nama) }}"  readonly/>
-                    </div>
-                    <div class="col-md-3 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-tahun">Tahun Implementasi<span class="text-danger">*</span></label>
-                        <input type="number" step="1" min="2026" class="form-control" id="update-framework-tahun" name="tahun" placeholder="Cth: 2023" value="{{ old('tahun', $framework->tahun) ?? now()->year }}" readonly/>
-                    </div>
-                    <div class="col-md-6 mb-4 form-control-validation">
-                        <label class="form-label" for="update-framework-program">Untuk Program<span class="text-danger">*</span></label>
-                        <input type="text" class="form-control" id="update-framework-tahun" name="tahun" placeholder="Cth: 2023" value="{{ old('program_id', $framework->program->nama) }}" readonly/>
-                    </div>
-                </div>
-
-                <h6 class="mb-3">Informasi Rencana Kerja</h6>
-
-                <hr class="my-4 mx-n4" />
-                <div class="row mb-4">
-                    <div class="col-md-auto d-flex gap-2">
-                        <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="offcanvas" data-bs-target="#offcanvasAddTransformasi" >
-                            <i class="ti tabler-plus me-1"></i> Tambah Transformasi
-                        </button>
-                    </div>
-                </div>
-
-                <div class="row mb-4">
-                    <div class="col-md-12 mb-4 form-control-validation">
-                        
-                        <div class="table-responsive text-nowrap mb-4">
-                            <table class="table table-hover">
-                                <thead class="border-top">
-                                    <tr>
-                                        <th>Transformasi</th>
-                                        <th>Tujuan Jangka Pendek/Aktivitas</th>
-                                        <th>Deskripsi</th>
-                                        <th>Indikator</th>
-                                        <th>Variabel</th>
-                                        <th>Target</th>
-                                        <th>Baseline</th>
-                                        <th>Aksi</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @forelse($framework->transformasi as $transformasi)
-                                    @forelse($transformasi->tujuan as $tujuan)
-                                    @forelse($tujuan->target as $target)
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td><span class="{{ $tujuan->jenis_aktivitas == 'tujuan' ? 'text-heading' : 'text-muted' }}">{{ $tujuan->nama }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->deskripsi }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->indikator }}</span></td>
-                                        <td><span class="text-muted">{{ $target->variabel }}</span></td>
-                                        <td>
-                                            @if($target->tipe === 'integer')
-                                                <span class="text-muted">{{ $target->target_integer }}</span>
-                                            @elseif($target->tipe === 'float')
-                                                <span class="text-muted">{{ $target->target_float }}</span>
-                                            @elseif($target->tipe === 'boolean')
-                                                <span class="text-muted">{{ $target->target_boolean ? 'Ya' : 'Tidak' }}</span>
-                                            @endif
-                                        </td>
-                                        <td>
-                                            @if($target->tipe === 'integer')
-                                                <span class="text-muted">{{ $target->baseline_integer }}</span>
-                                            @elseif($target->tipe === 'float')
-                                                <span class="text-muted">{{ $target->baseline_float }}</span>
-                                            @elseif($target->tipe === 'boolean')
-                                                <span class="text-muted">{{ $target->baseline_boolean ? 'Ya' : 'Tidak' }}</span>
-                                            @endif
-                                        </td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <!-- tujuan -->
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                    <a class="dropdown-item edit-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Tujuan</a>
-                                                    <a class="dropdown-item delete-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Tujuan</a>
-                                                    <hr/>
-                                                    <!-- aktivitas --> 
-                                                    <a class="dropdown-item add-aktivitas" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Aktivitas</a>
-                                                    <a class="dropdown-item edit-aktivitas" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Aktivitas</a>
-                                                    <a class="dropdown-item delete-aktivitas" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Aktivitas</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
-                                                    <a class="dropdown-item edit-target" href="javascript:void(0);" data-id="{{ $target->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Target</a>
-                                                    <a class="dropdown-item delete-target" href="javascript:void(0);" data-id="{{ $target->id }}" data-tujuan-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $target->variabel }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Target</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @empty
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td><span class="{{ $tujuan->jenis_aktivitas == 'tujuan' ? 'text-heading' : 'text-muted' }}">{{ $tujuan->nama }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->deskripsi }}</span></td>
-                                        <td><span class="text-muted">{{ $tujuan->indikator }}</span></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                    <a class="dropdown-item edit-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Tujuan</a>
-                                                    <a class="dropdown-item delete-tujuan" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}" data-nama="{{ $tujuan->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Tujuan</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-target" href="javascript:void(0);" data-id="{{ $tujuan->id }}" data-transformasi-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Target</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @endforelse 
-                                    <!-- endforelse target -->
-                                    @empty 
-                                    <tr>
-                                        <td><span class="text-heading">{{ $transformasi->kode }} {{ $transformasi->nama }}</span></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td></td>
-                                        <td>
-                                            <div class="dropdown">
-                                                <button type="button" class="btn p-0 dropdown-toggle hide-arrow" data-bs-toggle="dropdown">
-                                                    <i class="icon-base ti tabler-dots-vertical"></i>
-                                                </button>
-                                                <div class="dropdown-menu">
-                                                    <a class="dropdown-item edit-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-edit me-1"></i> Edit Transformasi</a>
-                                                    <a class="dropdown-item delete-transformasi" href="javascript:void(0);" data-id="{{ $transformasi->id }}" data-nama="{{ $transformasi->nama }}"><i class="icon-base ti tabler-trash me-1"></i> Hapus Transformasi</a>
-                                                    <hr/>
-                                                    <a class="dropdown-item add-tujuan" href="javascript:void(0);" data-id="{{ $transformasi->id }}"><i class="icon-base ti tabler-plus me-1"></i> Tambah Tujuan</a>
-                                                </div>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    @endforelse
-                                    <!-- endforelse aktivitas -->
-                                    @empty
-                                    <tr>
-                                        <td colspan="4" class="text-center py-4">Tidak ada data ditemukan.</td>
-                                    </tr>
-                                    @endforelse
-                                    <!-- endforelse tranformasi -->
-                                </tbody>
-                            </table>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div class="mt-4 text-end">
-                    <a href="{{ route('framework.index') }}" class="btn btn-label-secondary me-2">Kembali</a>
-                </div>
-            </form>
-        </div>
-    </div>
-    @include('program.transformasi.add')
-    @include('program.transformasi.edit')
-    @include('program.aktivitas.add-tujuan')
-    @include('program.aktivitas.edit')
-    @include('program.target.add')
-</div>
-@endsection
-
-@push('scripts')
-<script>
-    'use strict';
-    $(document).ready(function () {
-
-        $(".delete-transformasi").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Transformasi ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.destroy', [$framework->id, ':id']) }}".replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-
-        $(".delete-aktivitas").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const transformasiId = $(this).data('transformasi-id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Tujuan/Aktivitas ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.aktivitas.destroy', [$framework->id, ':transformasiId', ':id']) }}"
-                            .replace(':transformasiId', transformasiId).replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-
-        $(".delete-target").click(function (e) {
-            e.preventDefault();
-            const id = $(this).data('id');
-            const aktivitasId = $(this).data('aktivitas-id');
-            const transformasiId = $(this).data('transformasi-id');
-            const name = $(this).data('nama');
-
-            Swal.fire({
-                title: 'Hapus?',
-                text: `Target ${name} akan dihapus!`,
-                icon: 'warning',
-                showCancelButton: true,
-                confirmButtonText: 'Ya, Hapus!',
-                customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
-                buttonsStyling: false
-            }).then(function (result) {
-                if (result.value) {
-                    $.ajax({
-                        url: "{{ route('framework.transformasi.aktivitas.target.destroy', [$framework->id, ':transformasiId', ':aktivitasId', ':id']) }}"
-                            .replace(':transformasiId', transformasiId)
-                            .replace(':aktivitasId', aktivitasId)
-                            .replace(':id', id),
-                        type: 'DELETE',
-                        data: {
-                            _token: '{{ csrf_token() }}'
-                        },
-                        success: function () {
-                            Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
-                                .then(() => window.location.reload());
-                        }
-                    });
-                }
-            });
-        });
-    });
-</script>
-@endpush
\ No newline at end of file
diff --git a/resources/views/program/realisasi/add.blade.php b/resources/views/program/realisasi/add.blade.php
index a1c2772..eb64800 100644
--- a/resources/views/program/realisasi/add.blade.php
+++ b/resources/views/program/realisasi/add.blade.php
@@ -25,33 +25,20 @@
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-target">Target<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-target-integer" name="target_integer" placeholder="Cth: 100" readonly />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-target-integer" name="target_integer" placeholder="Cth: 100" readonly />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-target-float" name="target_float" placeholder="Cth: 100.23" readonly />
-                <div class="form-check form-check-inline" id="add-target-target-boolean-true" style="display: none;">
-                    <input type="radio" name="target_boolean" value="1" readonly />
-                    <label class="form-check-label" for="add-target-target-boolean-true">Ya</label>
-                </div>
-                <div class="form-check form-check-inline" id="add-target-target-boolean-false" style="display: none;">
-                    <input type="radio" name="target_boolean" value="0" readonly />
-                    <label class="form-check-label" for="add-target-target-boolean-false">Tidak</label>
-                </div>
+                <input type="text" class="form-control" style="display: none;" id="add-target-target-boolean" name="target_text" placeholder="Cth: 100.23" readonly />
+
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-baseline">Baseline<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-baseline-integer" name="baseline_integer" placeholder="Cth: 100" readonly />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-baseline-integer" name="baseline_integer" placeholder="Cth: 100" readonly />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-baseline-float" name="baseline_float" placeholder="Cth: 100.23" readonly />
-                <div class="form-check form-check-inline" id="add-target-baseline-boolean-true" style="display: none;">
-                    <input type="radio" name="baseline_boolean" value="1" readonly />
-                    <label class="form-check-label" for="add-target-baseline-boolean-true">Ya</label>
-                </div>
-                <div class="form-check form-check-inline" id="add-target-baseline-boolean-false" style="display: none;">
-                    <input type="radio" name="baseline_boolean" value="0" readonly />
-                    <label class="form-check-label" for="add-target-baseline-boolean-false">Tidak</label>
-                </div>
+                <input type="text" class="form-control" style="display: none;" id="add-target-baseline-boolean" name="baseline_text" placeholder="Cth: 100.23" readonly />                
             </div>
             <div class="mb-6 form-control-validation">
                 <label class="form-label form-check-label" for="add-target-realisasi">Capaian Realisasi<span class="text-danger">*</span></label>
-                <input type="number" step="1" min="0" class="form-control" id="add-target-realisasi-integer" name="realisasi_integer" placeholder="Cth: 100" />
+                <input type="number" step="1" min="0" class="form-control" style="display: none;" id="add-target-realisasi-integer" name="realisasi_integer" placeholder="Cth: 100" />
                 <input type="number" step="any" min="0" class="form-control" style="display: none;" id="add-target-realisasi-float" name="realisasi_float" placeholder="Cth: 100.23" />
                 <div class="form-check form-check-inline" id="add-target-realisasi-boolean-true" style="display: none;">
                     <input type="radio" name="realisasi_boolean" value="1" />
@@ -92,12 +79,10 @@
 
                     $('#add-target-target-integer').val(res.data.target_integer);
                     $('#add-target-target-float').val(res.data.target_float);
-                    $('#add-target-target-boolean-true').prop('checked', res.data.target_boolean);
-                    $('#add-target-target-boolean-false').prop('checked', !res.data.target_boolean);
+                    $('#add-target-target-boolean').val(res.data.target_boolean ? 'Ya' : 'Tidak');
                     $('#add-target-baseline-integer').val(res.data.baseline_integer);
                     $('#add-target-baseline-float').val(res.data.baseline_float);
-                    $('#add-target-baseline-boolean-true').prop('checked', res.data.baseline_boolean);
-                    $('#add-target-baseline-boolean-false').prop('checked', !res.data.baseline_boolean);
+                    $('#add-target-baseline-boolean').val(res.data.baseline_boolean ? 'Ya' : 'Tidak');
 
                     if (res.data.latest_realisasi != null) {
                         $('#add-target-realisasi-integer').val(res.data.latest_realisasi.realisasi_integer);
@@ -111,7 +96,13 @@
                         $('#add-target-realisasi-boolean-false').prop('checked', !res.data.baseline_boolean);
                     }
                     
-
+                    $('#add-target-target-integer, #add-target-target-float, #add-target-target-boolean')
+                        .hide().prop('disabled', true);
+                    $('#add-target-baseline-integer, #add-target-baseline-float, #add-target-baseline-boolean')
+                        .hide().prop('disabled', true);
+                    $('#add-target-realisasi-integer, #add-target-realisasi-float, #add-target-realisasi-boolean-true, #add-target-realisasi-boolean-false')
+                        .hide().prop('disabled', true);
+                        
                     if (res.data.tipe === 'integer') {
                         $('#add-target-target-integer').show().prop('disabled', false);
                         $('#add-target-baseline-integer').show().prop('disabled', false);
@@ -121,8 +112,8 @@
                         $('#add-target-baseline-float').show().prop('disabled', false);
                         $('#add-target-realisasi-float').show().prop('disabled', false);
                     } else if (res.data.tipe === 'boolean') {
-                        $('#add-target-target-boolean-true, #add-target-target-boolean-false').show().prop('disabled', false);
-                        $('#add-target-baseline-boolean-true, #add-target-baseline-boolean-false').show().prop('disabled', false);
+                        $('#add-target-target-boolean').show().prop('disabled', false);
+                        $('#add-target-baseline-boolean').show().prop('disabled', false);
                         $('#add-target-realisasi-boolean-true, #add-target-realisasi-boolean-false').show().prop('disabled', false);
                     }
 
diff --git a/resources/views/program/realisasi/index-aktivitas.blade.php b/resources/views/program/realisasi/index-aktivitas.blade.php
index 45d01b7..10c2137 100644
--- a/resources/views/program/realisasi/index-aktivitas.blade.php
+++ b/resources/views/program/realisasi/index-aktivitas.blade.php
@@ -92,8 +92,16 @@
                                                     data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="Tambah Dokumen Verifikasi">
                                                     <i class="ti tabler-file-plus ti-md"></i>
                                                 </a>
-                                                @if($targetAktivitas->latestRealisasi && $targetAktivitas->latestRealisasi->verifikasi->count() == 0)
-                                                @else
+                                                @if($targetAktivitas->latestRealisasi && $targetAktivitas->latestRealisasi->verifikasi->count() > 0)
+                                                <a href="javascript:;" class="btn btn-icon btn-text-secondary rounded-pill list-verifikasi" 
+                                                    data-framework-id="{{ $framework->id }}"
+                                                    data-transformasi-id="{{ $transformasi->id }}"
+                                                    data-aktivitas-id="{{ $aktivitas->id }}"
+                                                    data-target-id="{{ $targetAktivitas->id }}"
+                                                    data-realisasi-id="{{ $targetAktivitas->latestRealisasi->id }}"
+                                                    data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="Daftar Dokumen Verifikasi">
+                                                    <i class="ti tabler-files ti-md"></i>
+                                                </a>
                                                 @endif
                                                 @endif
                                             </div>
diff --git a/resources/views/program/realisasi/index-tujuan.blade.php b/resources/views/program/realisasi/index-tujuan.blade.php
index 0768930..343639d 100644
--- a/resources/views/program/realisasi/index-tujuan.blade.php
+++ b/resources/views/program/realisasi/index-tujuan.blade.php
@@ -91,6 +91,17 @@
                                                     data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="Tambah Dokumen Verifikasi">
                                                     <i class="ti tabler-file-plus ti-md"></i>
                                                 </a>
+                                                @if($target->latestRealisasi && $target->latestRealisasi->verifikasi->count() > 0)
+                                                <a href="javascript:;" class="btn btn-icon btn-text-secondary rounded-pill list-verifikasi" 
+                                                    data-framework-id="{{ $framework->id }}"
+                                                    data-transformasi-id="{{ $transformasi->id }}"
+                                                    data-aktivitas-id="{{ $tujuan->id }}"
+                                                    data-target-id="{{ $target->id }}"
+                                                    data-realisasi-id="{{ $target->latestRealisasi->id }}"
+                                                    data-bs-toggle="tooltip" data-bs-placement="top" data-bs-original-title="Daftar Dokumen Verifikasi">
+                                                    <i class="ti tabler-files ti-md"></i>
+                                                </a>
+                                                @endif
                                                 @endif
                                             </div>
                                         </td>
diff --git a/resources/views/program/realisasi/index.blade.php b/resources/views/program/realisasi/index.blade.php
index 0d4bdd0..b3ce346 100644
--- a/resources/views/program/realisasi/index.blade.php
+++ b/resources/views/program/realisasi/index.blade.php
@@ -7,9 +7,85 @@
 
 @section('content')
 <div class="container-xxl flex-grow-1 container-p-y">
+    <div class="row g-6 mb-6">
+        
+        <div class="col-sm-6 col-xl-4">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-start justify-content-between">
+                        <div class="content-left">
+                            <span class="text-heading">Capaian Realisasi</span>
+                            <div class="d-flex align-items-center my-1">
+                                <h4 class="mb-0 me-2 {{ $ringkasanCapaianRealisasi->persentase >= 80 ? 'text-success' : ($ringkasanIsiRealisasi->persentase >= 50 ? 'text-warning' : 'text-danger') }}">
+                                    {{ $ringkasanCapaianRealisasi->persentase ?? 0 }}%
+                                </h4>
+                            </div>
+                            <small class="mb-0">
+                                {{ $ringkasanCapaianRealisasi->capaian_80 ?? 0 }} Capaian &ge; 80%,
+                                {{ $ringkasanCapaianRealisasi->capaian_50_80 ?? 0 }} Capaian 50% - 80%,
+                                {{ $ringkasanCapaianRealisasi->capaian_50 ?? 0 }} Capaian < 50%</small>
+                        </div>
+
+                        <div class="avatar">
+                            <span class="avatar-initial rounded bg-label-success">
+                                <i class="icon-base ti tabler-gauge icon-26px"></i>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-6 col-xl-4">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-start justify-content-between">
+                        <div class="content-left">
+                            <span class="text-heading">Keterisian Data Capaian Realisasi</span>
+                            <div class="d-flex align-items-center my-1">
+                                <h4 class="mb-0 me-2 {{ $ringkasanIsiRealisasi->persentase >= 80 ? 'text-success' : ($ringkasanIsiRealisasi->persentase >= 50 ? 'text-warning' : 'text-danger') }}">
+                                    {{ $ringkasanIsiRealisasi->persentase ?? 0 }}%
+                                </h4>
+                            </div>
+                            <small class="mb-0">{{ $ringkasanIsiRealisasi->count_realisasi ?? 0 }} Data Terisi / {{ $ringkasanIsiRealisasi->count_target ?? 0 }} Data Target</small>
+                        </div>
+
+                        <div class="avatar">
+                            <span class="avatar-initial rounded bg-label-primary">
+                                <i class="icon-base ti tabler-chart-dots icon-26px"></i>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-6 col-xl-4">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-start justify-content-between">
+                        <div class="content-left">
+                            <span class="text-heading">Kelengkapan Dokumen Verifikasi</span>
+                            <div class="d-flex align-items-center my-1">
+                                <h4 class="mb-0 me-2 {{ $ringkasanVerifikasi->persentase >= 80 ? 'text-success' : ($ringkasanVerifikasi->persentase >= 50 ? 'text-warning' : 'text-danger') }}">
+                                    {{ $ringkasanVerifikasi->persentase ?? 0 }}%
+                                </h4>
+                            </div>
+                            <small class="mb-0">{{ $ringkasanVerifikasi->count_unverifikasi ?? 0 }} Realisasi Belum Dilengkapi Dokumen</small>
+                        </div>
+
+                        <div class="avatar">
+                            <span class="avatar-initial rounded bg-label-secondary">
+                                <i class="icon-base ti tabler-files icon-26px"></i>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="card">
         <div class="card-header border-bottom mb-4">
-            <h5 class="card-title mb-0">Lihat Realiasi</h5>
+            <h5 class="card-title mb-0">Realiasi Capaian</h5>
         </div>
         
         <div class="card-body">
@@ -77,6 +153,7 @@
 @include('program.realisasi.list')
 @include('program.realisasi.edit')
 @include('program.verifikasi.add')
+@include('program.verifikasi.list')
 @endsection
 
 @push('scripts')
diff --git a/resources/views/program/verifikasi/list.blade.php b/resources/views/program/verifikasi/list.blade.php
new file mode 100644
index 0000000..b8ef1cf
--- /dev/null
+++ b/resources/views/program/verifikasi/list.blade.php
@@ -0,0 +1,117 @@
+<div
+    class="offcanvas offcanvas-end"
+    tabindex="-1"
+    id="offcanvasListVerifikasi"
+    aria-labelledby="offcanvasListVerifikasiLabel">
+    <div class="offcanvas-header border-bottom">
+        <h5 id="offcanvasListVerifikasiLabel" class="offcanvas-title">Daftar Dokumen Verifikasi</h5>
+        <button
+            type="button"
+            class="btn-close text-reset"
+            data-bs-dismiss="offcanvas"
+            aria-label="Tutup"></button>
+    </div>
+    <div class="offcanvas-body mx-0 flex-grow-0 p-6 h-100">
+        <form class="t-0" id="historyVerifikasiForm">
+
+            <input type="hidden" id="list-verifikasi-transformasi-id" name="transformasi_id"/>
+            <input type="hidden" id="list-verifikasi-aktivitas-id" name="aktivitas_id"/>
+            <input type="hidden" id="list-verifikasi-target-id" name="target_id"/>
+            <input type="hidden" id="list-verifikasi-realisasi-id" name="realisasi_id"/>
+
+            <div class="mb-6 form-control-validation">
+                <label class="form-label" for="list-verifikasi-variabel">Variabel Target<span class="text-danger">*</span></label>
+                <input type="text" class="form-control" id="list-verifikasi-variabel" name="variabel" placeholder="Cth: AK1" readonly />
+            </div>
+
+            <table class="table table-hover" id="historyVerifikasiTable">
+                <thead>
+                    <tr>
+                        <th>Dokumen</th>
+                        <th>Aksi</th>
+                    </tr>
+                </thead>
+                <tbody id="historyVerifikasiTableBody">
+                </tbody>
+            </table>
+            
+            <button type="reset" class="btn btn-label-danger" data-bs-dismiss="offcanvas">Tutup</button>
+        </form>
+    </div>
+</div>
+
+@push('scripts')
+<script>
+    $(document).ready(function() {
+        const offcanvasListVerifikasi = new bootstrap.Offcanvas(document.getElementById('offcanvasListVerifikasi'));
+
+        $(".list-verifikasi").click(function () {
+            const targetId = $(this).data('target-id');
+            const aktivitasId = $(this).data('aktivitas-id');
+            const transformasiId = $(this).data('transformasi-id');
+            const realisasiId = $(this).data('realisasi-id');
+            $('#list-verifikasi-aktivitas-id').val(aktivitasId);
+            $('#list-verifikasi-transformasi-id').val(transformasiId);
+            $('#list-verifikasi-target-id').val(targetId);
+            $('#list-verifikasi-realisasi-id').val(realisasiId);
+            
+            $.get("{{ route('realisasi.show', ':id') }}"
+                .replace(':id', realisasiId), function (res) {
+                if (res.status === 'success') {
+                    $('#list-verifikasi-variabel').val(res.data.target.variabel);
+                    
+                    let rows = '';
+                    if (res.data.tipe === 'integer') {
+                        realisasiValue = res.data.realisasi_integer;
+                    } else if (res.data.tipe === 'float') {
+                        realisasiValue = res.data.realisasi_float;
+                    } else if (res.data.tipe === 'boolean') {
+                        realisasiValue = res.data.realisasi_boolean ? 'Ya' : 'Tidak';
+                    }
+
+                    res.data.verifikasi.forEach(function (verifikasi) {
+                        rows += '<tr><td>' + verifikasi.dokumen + '</td><td>'
+                            + '<a href="' + verifikasi.link_dokumen + '" target="_blank" class="btn btn-icon btn-text-secondary rounded-pill">'
+                            + '<i class="ti tabler-file ti-md"></i></a>'
+                            + '<a href="javascript:;" class="btn btn-icon btn-text-danger rounded-pill delete-verifikasi" data-id="' + verifikasi.id + '" data-nama="' + verifikasi.dokumen + '">'
+                            + '<i class="ti tabler-trash ti-md"></i></a>'
+                            + '</td></tr>';
+                    });
+                    $('#historyVerifikasiTableBody').html(rows);
+
+                    offcanvasListVerifikasi.show();
+                }
+            });
+
+            $('#historyVerifikasiTable').on('click', '.delete-verifikasi', function () {
+                const id = $(this).data('id');
+                const nama = $(this).data('nama');
+                Swal.fire({
+                    title: 'Hapus?',
+                    text: `Dokumen Verifikasi: ${nama} akan dihapus!`,
+                    icon: 'warning',
+                    showCancelButton: true,
+                    confirmButtonText: 'Ya, Hapus!',
+                    customClass: { confirmButton: 'btn btn-danger me-3', cancelButton: 'btn btn-label-secondary' },
+                    buttonsStyling: false
+                }).then(function (result) {
+                    if (result.value) {
+                        $.ajax({
+                            url: "{{ route('verifikasi.destroy', ':id') }}".replace(':id', id),
+                            type: 'POST',
+                            data: {
+                                _token: '{{ csrf_token() }}',
+                                _method: 'DELETE'
+                            },
+                            success: function () {
+                                Swal.fire({ icon: 'success', title: 'Terhapus!', showConfirmButton: false, timer: 1500 })
+                                    .then(() => location.reload());
+                            }
+                        });
+                    }
+                });
+            });
+        });
+    });
+</script>
+@endpush
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index fa3b787..486581d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -88,6 +88,10 @@ Route::middleware('auth')
     Route::put('/komoditas/{id}', [App\Http\Controllers\Web\Master\KomoditasController::class, 'update'])->name('komoditas.update');
     Route::delete('/komoditas/{id}', [App\Http\Controllers\Web\Master\KomoditasController::class, 'destroy'])->name('komoditas.destroy');
 
+    Route::resource('jenis-komoditas', App\Http\Controllers\Web\Master\JenisKomoditasController::class);
+    Route::get('/jenis-komoditas-by-komoditas/{komoditas_id}', [App\Http\Controllers\Web\Master\JenisKomoditasController::class, 'getByKomoditas'])->name('jenis-komoditas.by-komoditas');
+    Route::resource('varietas', App\Http\Controllers\Web\Master\VarietasController::class);
+
     Route::get('/keluarga', [App\Http\Controllers\Web\Master\KeluargaController::class, 'index'])->name('keluarga.index');
     Route::get('/keluarga/add', [App\Http\Controllers\Web\Master\KeluargaController::class, 'create'])->name('keluarga.create');
     Route::post('/keluarga', [App\Http\Controllers\Web\Master\KeluargaController::class, 'store'])->name('keluarga.store');
@@ -131,6 +135,7 @@ Route::middleware('auth')
 
     Route::resource('petani-cpm', App\Http\Controllers\Web\Ekosistem\PetaniCPMController::class);
     Route::get('petani-cpm/summary/{tipe}', [App\Http\Controllers\Web\Ekosistem\PetaniCPMController::class, 'summary'])->name('petani-cpm.summary');
+    Route::resource('lahan-cpcl', App\Http\Controllers\Web\Ekosistem\LahanCPCLController::class);
 
     // Monev
     Route::resource('framework', App\Http\Controllers\Web\Program\FrameworkController::class);
@@ -138,5 +143,5 @@ Route::middleware('auth')
     Route::resource('framework.transformasi.aktivitas', App\Http\Controllers\Web\Program\AktivitasController::class)->only(['show', 'store', 'update', 'destroy']);
     Route::resource('framework.transformasi.aktivitas.target', App\Http\Controllers\Web\Program\TargetController::class)->only(['show', 'store', 'update', 'destroy']);
     Route::resource('realisasi', App\Http\Controllers\Web\Program\RealisasiController::class)->only('index', 'store', 'show', 'update', 'destroy');
-    Route::resource('verifikasi', App\Http\Controllers\Web\Program\VerifikasiController::class)->only('store', 'update', 'destroy');
+    Route::resource('verifikasi', App\Http\Controllers\Web\Program\VerifikasiController::class)->only('store', 'destroy');
 });
\ No newline at end of file