update

app/Http/Controllers/AjaxController.php

@@ -20,16 +20,14 @@ class AjaxController extends Controller
         $resource = json_decode($instansi->resource_data);
         // dd($resource);
 
+        $data = [];
+
         if(@$resource){
             $data = TabelData::whereIn('MsTabelDataId',$resource)->count();
         
             if(@$data != 0){
                 $data = TabelData::whereIn('MsTabelDataId',$resource)->get();
-            }else{
-                $data = TabelData::all();
             }
-        }else{
-            $data = TabelData::all();
         }
 
         // $data = TabelData::all();

app/Http/Controllers/HomeController.php

@@ -105,9 +105,15 @@ class HomeController extends Controller
         foreach ($data as $key => $row) {
             //cek upload
             $status = '';
-            $cek = Dataset::where('ms_tabel_data_id',$row->MsTabelDataId)->where('tahun',date('Y'))->count();
+            $cek = Dataset::where('ms_tabel_data_id',$row->MsTabelDataId)->where('tahun',date('Y'))->first();
-            if($cek > 0){
+            if(@$cek){
-                $status = '<span class="flex bg-emerald-500 rounded w-100 p-1 text-[10px] text-white">Sudah Unggah</spa>';
+                if(@$cek->status == 1){
+                    $status = ' <small class="p-1 w-full flex bg-emerald-500 text-white rounded" title="Valid">Valid</small>';
+                }elseif(@$cek->status == 0){
+                    $status = '<small class="p-1 w-full flex bg-yellow-500 text-white rounded" title="Tidak Valid">Menunggu Verifikasi</small>';
+                }elseif(@$cek->status == 2){
+                    $status = '<small class="p-1 w-full flex bg-red-500 text-white rounded" title="Tidak Valid">Verifikasi Ditolak</small>';
+                }
                 $action = '';
             }else{
                 $status = '<span class="flex bg-red-500 rounded w-100 p-1 text-[10px] text-white">Belum Unggah</spa>';
@@ -126,7 +132,7 @@ class HomeController extends Controller
     }
 
     function gridInstansiTambahan(Request $request){
-        $data = DatasetTambahan::whereIn('ms_instansi_id',session('instansi_id'))->get();
+        $data = DatasetTambahan::whereIn('instansi_id',[session('instansi_id')])->get();
 
         $_data = [];
         foreach ($data as $key => $row) {

app/Http/Controllers/Opendata/DatasetController.php

@@ -108,7 +108,7 @@ class DatasetController extends Controller
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
                 $action .= '<div class="flex flex-col gap-1 justify-center text-center items-center">';
-                if(($row->created_by == auth()->user()->id) || ($row->status == 2)){
+                if(($row->created_by == auth()->user()->id) && ($row->status == 2)){
                     $action .= '<a href="'.url('opendata/dataset/update/'.encode_id($row->DatasetId)).'" title="Ubah Data" class="p-2 w-full rounded text-white bg-blue-600">Edit</a>';
                 }
                 $action .= '<a href="'.url('opendata/dataset/view/'.encode_id($row->DatasetId)).'" title="Lihat Data" class="p-2 w-full rounded text-white bg-slate-600">Detail</a>';
@@ -175,6 +175,7 @@ class DatasetController extends Controller
                     $dataset->tahun_data         = $request->tahun_data;
                     $dataset->name               = $request->name;
                     $dataset->deskripsi          = $request->deskripsi;
+                    $dataset->status             = 0;
                     $dataset->save();
                 
             }else{
@@ -201,7 +202,9 @@ class DatasetController extends Controller
             }
 
             if(@$request->file){
-                $tabelData = TabelData::find(decode_id($request->template_id));
+                // dd($dataset);
+                $tabelData = TabelData::find($dataset->ms_tabel_data_id);
+                // dd($tabelData);
 
                 $import = new Import;
                 Excel::import($import, $request->file('file'));
@@ -219,16 +222,16 @@ class DatasetController extends Controller
                             'ms_tabel_data_kolom_id' => $columnIndex,
                         ],[
                             'dataset_id'       => $dataset->DatasetId,
-                            'ms_tabel_data_id' => decode_id($request->template_id),
+                            'ms_tabel_data_id' => $dataset->ms_tabel_data_id,
                             'row_id'           => $rowIndex + 1,
                             'ms_tabel_data_kolom_id' => $columnIndex,
                             'value'            => $value,
                         ]);
                     }
                 }
+            }
 
             DB::commit();
-            }
 
             return redirect()->back()->with([
                     'message' => 'Berhasil update data',
@@ -301,7 +304,7 @@ class DatasetController extends Controller
         $data['item'] = Dataset::find($keyId);
 
         $template = TabelData::find($data['item']->ms_tabel_data_id);
-        $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('created_at','ASC')->get();
+        $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('DatasetCatatanId','DESC')->first();
         $data['tabel'] = TabelDataKolom::where('ms_tabel_data_id',$template->MsTabelDataId)->orderBy('order','ASC')->get();
         // $filename = pathinfo($tabelData->template_url, PATHINFO_FILENAME); 
         // $data['modelClass'] = "App\\Models\\Dataset\\Dataset" . ucfirst($filename);

app/Http/Controllers/Opendata/DatasetTambahanController.php

@@ -13,6 +13,7 @@ use App\Models\Master\Topik;
 use App\Models\Master\Template;
 use App\Models\Master\TabelData;
 use App\Models\DatasetTambahan;
+use App\Models\DatasetCatatan;
 
 class DatasetTambahanController extends Controller
 {
@@ -58,9 +59,9 @@ class DatasetTambahanController extends Controller
     public function grid(Request $request)
     {
         if((session('group_id') == 1) || (session('group_alias') == 'admin')){
-            $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->get();
+            $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->get();
         }else{
-            $data = DatasetTambahan::orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[auth()->user()->ms_instansi_id])->get();
+            $data = DatasetTambahan::with(['tabelData'])->orderBy('DatasetTambahanId','DESC')->whereIn('instansi_id',[session('instansi_id')])->get();
         }
         // $data = User::with(['group'])->orderBy('id','DESC')->get();
         $_data = [];
@@ -73,16 +74,16 @@ class DatasetTambahanController extends Controller
 
             if((permission('is_create', $this->route.'.*','module',false)) || (permission('is_update', $this->route.'.*','module',false))){
                 $action .= '<div class="flex gap-1 justify-center items-center flex-row">';
-                if($row->created_by == auth()->user()->id){
+                if(($row->created_by == auth()->user()->id) && ($row->status == 2)){
-                    $action .= '<a href="'.url('opendata/dataset-tambahan/update/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Ubah Data" class="p-2 rounded text-white bg-blue-500"><i class="ri-pencil-line text-white"></i></a>';
+                    $action .= '<a href="'.url('opendata/dataset-tambahan/update/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Ubah Data" class="p-2 rounded text-white bg-blue-500">Edit</a>';
                 }
-                $action .= '<a href="'.url('opendata/dataset-tambahan/view/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Lihat Data" class="p-2 rounded text-white bg-blue-900"><i class="ri-eye-line text-white"></i></a>';
+                $action .= '<a href="'.url('opendata/dataset-tambahan/view/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Lihat Data" class="p-2 rounded text-white bg-blue-900">Detail</a>';
                 if((session('group_id') == 1) || (session('group_alias') == 'admin')){
                     // $action .= '<a href="#" data-href="'.url('management/user/forcelogin/'.encode_id($row->id)).'" data-toggle="tooltip" title="Force Login" class="forcelogin p-2 rounded text-white bg-success"><i class="ri-user-2-line text-white"></i></a>';
                     if($row->status == 1){
-                        $action .= '<a href="#" data-href="'.url('opendata/dataset-tambahan/delete/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Hapus Data" class="remove_data p-2 rounded text-white bg-red-500"><i class="ri-delete-bin-line text-white"></i></a>';
+                        // $action .= '<a href="#" data-href="'.url('opendata/dataset-tambahan/delete/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Hapus Data" class="remove_data p-2 rounded text-white bg-red-500"><i class="ri-delete-bin-line text-white"></i></a>';
                     }else{
-                        $action .= '<a href="#" data-href="'.url('opendata/dataset-tambahan/aktif/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Aktifkan Data" class="aktif_data p-2 rounded text-white bg-emerald-500"><i class="ri-check-line text-white"></i></a>';
+                        // $action .= '<a href="#" data-href="'.url('opendata/dataset-tambahan/aktif/'.encode_id($row->DatasetTambahanId)).'" data-toggle="tooltip" title="Aktifkan Data" class="aktif_data p-2 rounded text-white bg-emerald-500"><i class="ri-check-line text-white"></i></a>';
                     }
                 }
                 $action .= '</div>';
@@ -188,34 +189,15 @@ class DatasetTambahanController extends Controller
 
 
             if(@$keyId){
-                Validator::make($request->all(), [
-                    'name'        => 'required',
-                    'instansi_id' => 'required',
-                    'template_id' => 'required',
-                    // 'template_default' => 'required',
-                    'publik'      => 'required',
-                    // 'tags'        => 'required',
-                    // 'topik'       => 'required',
-                ])->validate();
                 
                 $insert = DatasetTambahan::find($keyId);
-                $insert->instansi_id        = decode_id($request->instansi_id);
-                $insert->template_id        = decode_id($request->template_id);
-                $insert->template_default   = 0;
                 $insert->name               = $request->name;
-                $insert->publik             = 1;
-                $insert->tags               = json_encode($request->tags);
                 if(@$request->hasFile('file')){
                     $insert->file               = $filePath;
                 }
                 $insert->deskripsi          = $request->deskripsi;
-                $insert->tahun              = $request->tahun;
                 $insert->tahun_data         = $request->tahun_data;
-                if((session('group_id') == 1) || (session('group_alias') == 'admin')){
-                    $insert->status             = 1;
-                }else{
                 $insert->status             = 0;
-                }
                 $insert->save();
             }else{
                 // dd($request->all());
@@ -241,6 +223,11 @@ class DatasetTambahanController extends Controller
                 if(@$request->hasFile('file')){
                     $insert->file           = $filePath;
                 }
+                if((session('group_id') == 1) || (session('group_alias') == 'admin')){
+                    $insert->status         = 1;
+                }else{
+                    $insert->status         = 0;
+                }
                 $insert->deskripsi          = $request->deskripsi;
                 $insert->tahun              = $request->tahun;
                 $insert->tahun_data         = $request->tahun_data;
@@ -317,6 +304,7 @@ class DatasetTambahanController extends Controller
         $data['instansi'] = Instansi::all();
         $data['topik'] = Topik::all();
         $data['template'] = Template::all();
+        $data['catatan'] = DatasetCatatan::where('dataset_id',$keyId)->orderBy('created_at','ASC')->get();
 
         return view($this->template.'.view',$data);
     }
@@ -347,4 +335,26 @@ class DatasetTambahanController extends Controller
 
         return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']);
     }
+
+    public function verifikasi(Request $request,$id)
+    {
+        $keyId = decode_id($id);
+        $dataset = DatasetTambahan::find($keyId);
+        $dataset->status = $request->verifikasi;
+        $dataset->save();
+
+        if($request->catatan){
+            $cat = new DatasetCatatan;
+            $cat->dataset_id = $keyId;
+            $cat->type = 'dataset-tambahan';
+            $cat->catatan = $request->catatan;
+            $cat->status = 1;
+            $cat->save();
+        }
+
+        return redirect()->back()->with([
+                    'message' => 'Berhasil update data',
+                    'type'    => 'success',
+                ]);
+    }
 }

resources/views/index.blade.php

@@ -36,7 +36,7 @@
                         </div>
                         <div class="space-y-6">
                             <!-- Stat Item 1 -->
-                            <div class="flex items-center justify-between p-4 bg-slate-50 rounded-2xl border border-slate-100">
+                            <div class="flex items-center justify-between p-4 bg-slate-50 rounded-2xl border border-slate-100 hidden">
                                 <div class="flex items-center space-x-4">
                                     <div class="p-3 bg-white rounded-xl shadow-sm text-blue-500">
                                         <i data-lucide="database"></i>

resources/views/layouts/appNew.blade.php

@@ -53,6 +53,7 @@
                 <a href="{{ url('/') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Beranda</a>
                 <a href="{{ url('dataset') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Dataset Utama</a>
                 <a href="{{ url('dataset-tambahan') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Dataset Tambahan</a>
+                <a href="{{ url('kontak') }}" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Kontak</a>
                 {{-- <a href="#" class="font-medium text-slate-700 hover:text-blue-600 transition-colors">Informasi</a> --}}
                 <a href="{{ url('login') }}" class="flex items-center space-x-2 bg-blue-600 text-white px-5 py-2 rounded-xl font-semibold hover:bg-blue-700 transition-all shadow-lg shadow-blue-200">
                     <span>Login</span>
@@ -73,6 +74,7 @@
             <a href="{{ url('/') }}" class="block font-medium py-2">Beranda</a>
             <a href="{{ url('dataset') }}" class="block font-medium py-2">Dataset Utama</a>
             <a href="{{ url('dataset-tambahan') }}" class="block font-medium py-2">Dataset Tambahan</a>
+            <a href="{{ url('kontak') }}" class="block font-medium py-2">Kontak</a>
             <a href="{{ url('/login') }}" class="w-full bg-blue-600 text-white px-5 py-3 rounded-xl font-bold">Login</a>
         </div>
     </nav>

resources/views/modules/dashboard/dashboard.blade.php

@@ -5,7 +5,7 @@
     <div class="flex-1 overflow-y-auto p-8 custom-scrollbar">
         
         <!-- Stats Cards -->
-        <div class="grid grid-cols-1 {{ (session('group_id') == 1) || (session('group_alias') == 'admin') ? 'md:grid-cols-4 lg:grid-cols-4' : 'md:grid-cols-3 lg:grid-cols-3' }}  gap-6 mb-8">
+        <div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-3  gap-6 mb-8">
             <!-- Card 1 -->
             <div class="bg-white p-6 rounded-2xl border border-slate-200 shadow-sm hover:shadow-md transition-shadow">
                 <div class="flex justify-between items-start mb-4">
@@ -146,7 +146,8 @@
                             id="grid-data2">
                             <thead class="bg-slate-100 border-b border-slate-100">
                             <tr>
-                                <th class="text-[10px] border font-bold text-slate-900 text-center" data-width="20" data-field="dataset">Dataset</th>
+                                <th class="text-[10px] border font-bold text-slate-900 text-center tengah" data-width="5" data-field="no">No</th>
+                                <th class="text-[10px] border font-bold text-slate-900 text-center" data-field="name">Dataset</th>
                             </tr>
                             </thead>
                             <tbody></tbody>

resources/views/modules/opendata/dataset-tambahan/form.blade.php

@@ -10,7 +10,7 @@
                 <hr>
                 <div class="flex gap-4 mt-5">
                     <label class="mb-3 w-1/2 font-semibold required">Instansi</label>
-                    <select name="instansi_id" required class="p-2 border rounded w-full instansi_id select2 @error('instansi_id') is-invalid @enderror" id="instansi_id">
+                    <select name="instansi_id" {{ @$item ? 'disabled' : 'required' }} class="p-2 border rounded w-full instansi_id select2 @error('instansi_id') is-invalid @enderror" id="instansi_id">
                         <option value="">-</option>
                         @foreach($instansi as $dataInstansi)
                         <option {{@$item->instansi_id == $dataInstansi->MsInstansiId ? 'selected' : ''}} value="{{encode_id($dataInstansi->MsInstansiId)}}">{{$dataInstansi->name}}</option>
@@ -23,8 +23,12 @@
                 <div class="flex gap-4">
                     <label class="mb-3 w-1/2 font-semibold required">Sumber Data Terkait</label>
                     <div class="flex flex-col w-full justify-center items-start gap-2">
-                    <select name="template_id" required class="p-2 border rounded w-full template_id select2 @error('template_id') is-invalid @enderror" id="template_id">
+                    <select name="template_id" {{ @$item ? 'disabled' : 'required' }} class="p-2 border rounded w-full template_id select2 @error('template_id') is-invalid @enderror" id="template_id">
+                        @if(@$item)
+                            <option value="">Tabel {{@$item->tabelData->nomor_tabel}} - {{@$item->tabelData->name}}</option>
+                        @else
                             <option value="">-- Pilih Sumber Data --</option>
+                        @endif
                         {{-- @foreach($template as $dataTemplate)
                             <option {{@$item->template_id == $dataTemplate->MsTemplateId ? 'selected' : ''}} data-template="{{asset($dataTemplate->template_url)}}" value="{{encode_id($dataTemplate->MsTemplateId)}}">Tabel {{$dataTemplate->nomor_tabel}} - {{$dataTemplate->name}}</option>
                         @endforeach --}}
@@ -79,7 +83,7 @@
                 <div class="flex gap-4">
                     <label class="mb-3 w-1/2 font-semibold">Tahun Data</label>
                     <select name="tahun_data" class="p-2 bg-white rounded border w-full" id="">
-                        @for($i = (date('Y')-5); date('Y')-1 >= $i ;  $i++)
+                        @for($i = (date('Y')-2); date('Y')-1 >= $i ;  $i++)
                             <option {{ (@$item ? (@$item->tahun_data == $i ? 'selected' : '') : ($i == date('Y')-1 ? 'selected' : '') )}} value="{{$i}}">{{$i}}</option>
                         @endfor
                     </select>

resources/views/modules/opendata/dataset-tambahan/view.blade.php

@@ -66,9 +66,6 @@
                     <div class="text-xs">{{@$item->tahun_data}}</div>
                 </div>
             </div>
-
-        </div>
-        <div class="grid lg-grid-cols-1 gap-3">
             <div class="flex flex-between gap-3 bg-gray-100 items-center p-2 rounded">
                 <div class="p-2">
                     <i data-lucide="info" class="w-4 h-4 mr-2"></i>
@@ -78,11 +75,31 @@
                     <div class="text-xs">{{$item->deskripsi}}</div>
                 </div>
             </div>
+            <div class="flex flex-between gap-3 bg-gray-100 items-center p-2 rounded">
+                <div class="p-2">
+                    <i data-lucide="info" class="w-4 h-4 mr-2"></i>
                 </div>
+                <div class="flex flex-col">
+                    <div class="text-sm"><b>Status</b></div> 
+                    <div class="text-xs">
+                        @if(@$item->status == 1)
+                            <span class="p-1 w-full flex bg-emerald-500 text-white rounded" title="Valid">Valid</span>
+                        @elseif(@$item->status == 0)
+                            <span class="p-1 w-full flex bg-yellow-500 text-white rounded" title="Tidak Valid">Menunggu Verifikasi</span>
+                        @elseif(@$item->status == 2)
+                            <span class="p-1 w-full flex bg-red-500 text-white rounded" title="Tidak Valid">Verifikasi Ditolak</span>
+                        @endif
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    
+        @if((session('group_id') == 1) || (session('group_alias') == 'admin'))
             @if(@$item->status == 0)
                 <hr class="mt-3">
                 <h5 class="text-xl font-bold mt-3">Form Verifikasi Dataset</h5>
-            <form action="{{ url('opendata/dataset/verifikasi/'.encode_id($item->DatasetId)) }}" method="POST">
+                <form action="{{ url('opendata/dataset-tambahan/verifikasi/'.encode_id($item->DatasetTambahanId)) }}" method="POST">
                     {{ csrf_field() }}
                     <div class="mt-2">
                         <select name="verifikasi" class="w-full p-2 bg-white border" id="">
@@ -98,6 +115,7 @@
                     </div>
                 </form>
             @endif
+        @endif
         @if($item->status == '2')
             <hr class="mt-3">
             <h5 class="text-xl font-bold my-3">Catatan Verifikasi Dataset</h5>

resources/views/modules/opendata/dataset/form.blade.php

@@ -52,7 +52,7 @@
                 <div class="flex gap-4">
                     <label class="mb-3 w-1/2 font-semibold {{ @$item ? '' : 'required' }} ">Unggah Berkas</label>
                     <div class="flex flex-col w-full justify-center items-start gap-2">
-                        <input type="file" accept=".xls,.xlsx" value="{{@$item->file ? @$item->file :  old('file')}}" name="file" class="p-2 w-full bg-white rounded border @error('file') is-invalid @enderror" placeholder="Masukan File Dataset" {{ @$item ? 'disabled' : 'required' }} >
+                        <input type="file" accept=".xls,.xlsx" value="{{@$item->file ? @$item->file :  old('file')}}" name="file" class="p-2 w-full bg-white rounded border @error('file') is-invalid @enderror" placeholder="Masukan File Dataset" {{ @$item ? '' : 'required' }} >
                         <small><i>Masukan Ekstensi File : .xls,.xlsx</i></small>
                         @if(@$item)
                             <a href="{{url('opendata/dataset/download/'.encode_id(@$item->DatasetId))}}" class="p-2 bg-blue-500 rounded text-white flex items-center"><i data-lucide="download" class="w-4 h-4 mr-2"></i>Download File</a>
@@ -82,17 +82,19 @@
                 <div class="flex gap-4">
                     <label class="mb-3 w-1/2 font-semibold">Tahun Data</label>
                     <select name="tahun_data" class="p-2 bg-white rounded border w-full" id="">
-                        @for($i = (date('Y')-5); date('Y')-1 >= $i ;  $i++)
+                        @for($i = (date('Y')-2); date('Y')-1 >= $i ;  $i++)
                             <option {{ (@$item ? (@$item->tahun_data == $i ? 'selected' : '') : ($i == date('Y')-1 ? 'selected' : '') )}} value="{{$i}}">{{$i}}</option>
                         @endfor
                     </select>
                 </div>
 
             </div>
+            @if(@$item->status == 0 || @$item->status == 2)
             <div class="flex justify-center items-center gap-2">
                 <a href="{{route($route.'.index')}}" class="bg-red-500 rounded py-2 px-3 text-white flex items-center"><i data-lucide="arrow-left" class="w-4 h-4 mr-2"></i><span>Batal</span></a>
                 <button type="submit" class="bg-emerald-500 rounded py-2 px-3 text-white flex items-center"><i data-lucide="save" class="w-4 h-4 mr-2"></i><span> <span>Simpan</span></button>
             </div>
+            @endif
             
         </form>
     </div>

resources/views/modules/opendata/dataset/view.blade.php

@@ -66,9 +66,6 @@
                     <div class="text-xs">{{@$item->tahun_data}}</div>
                 </div>
             </div>
-
-        </div>
-        <div class="grid lg-grid-cols-1 gap-3">
             <div class="flex flex-between gap-3 bg-gray-100 items-center p-2 rounded">
                 <div class="p-2">
                     <i data-lucide="info" class="w-4 h-4 mr-2"></i>
@@ -78,6 +75,27 @@
                     <div class="text-xs">{{$item->deskripsi}}</div>
                 </div>
             </div>
+            <div class="flex flex-between gap-3 bg-gray-100 items-center p-2 rounded">
+                <div class="p-2">
+                    <i data-lucide="info" class="w-4 h-4 mr-2"></i>
+                </div>
+                <div class="flex flex-col">
+                    <div class="text-sm"><b>Status</b></div> 
+                    <div class="text-xs">
+                        @if(@$item->status == 1)
+                            <span class="p-1 w-full flex bg-emerald-500 text-white rounded" title="Valid">Valid</span>
+                        @elseif(@$item->status == 0)
+                            <span class="p-1 w-full flex bg-yellow-500 text-white rounded" title="Tidak Valid">Menunggu Verifikasi</span>
+                        @elseif(@$item->status == 2)
+                            <span class="p-1 w-full flex bg-red-500 text-white rounded" title="Tidak Valid">Verifikasi Ditolak</span>
+                        @endif
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="grid lg-grid-cols-1 gap-3">
+            
             <div class="flex  items-center p-2 rounded" style="overflow-x:auto;">
                 <div class="w-full">
 
@@ -89,11 +107,11 @@
                         data-side-pagination="server"
                         data-url="{{ route($route.'.gridDetail', ['id' => $keyId]) }}"
                         >
-                        <thead class="bg-slate-50/50 border-b border-slate-100">
+                        <thead class="bg-slate-100 border-b border-slate-100">
                             <tr>
-                                <th data-field="no" data-width="3%" class="px-6 border py-4 text-[10px] font-bold text-slate-400 uppercase tracking-widest">No</th>
+                                <th data-field="no" data-width="3%" class="text-[10px] border font-bold text-slate-900 text-center tengah">No</th>
                                 @foreach ($tabel as $k => $key)
-                                    <th data-field="{{$key->order}}" class="px-6 border py-4 text-[10px] font-bold text-slate-400 uppercase tracking-widest">{{ $key->name }}</th>
+                                    <th data-field="{{$key->order}}" class="text-[10px] border font-bold text-slate-900 text-center">{{ $key->name }}</th>
                                 @endforeach
                             </tr>
                         </thead>
@@ -104,6 +122,7 @@
 
             {{-- {!! $modelClass::legend() !!} --}}
         </div>
+        @if((session('group_id') == 1) || (session('group_alias') == 'admin'))
             @if(@$item->status == 0)
                 <hr class="mt-3">
                 <h5 class="text-xl font-bold mt-3">Form Verifikasi Dataset</h5>
@@ -123,15 +142,20 @@
                     </div>
                 </form>
             @endif
-        @if($item->status == '2')
+        @endif
+        @if(($item->status == '2') || ($item->status == '1'))
             <hr class="mt-3">
-            <h5 class="text-xl font-bold my-3">Catatan Verifikasi Dataset</h5>
+            <h5 class="text-xl font-bold my-3">Catatan Verifikator</h5>
-            @foreach ($catatan as $valCatatan)
+            {{-- @foreach ($catatan as $valCatatan)
                 <div class="flex flex-col gap-3 bg-gray-100 p-2 mb-2 rounded">
                     <div class="text-[10px]">{{$valCatatan->created_at}}</div> 
                     <div class="text-sm">{{$valCatatan->catatan}}</div>
                 </div>
-            @endforeach
+            @endforeach --}}            
+            <div class="flex flex-col gap-3 bg-gray-100 p-2 mb-2 rounded">
+                <div class="text-[10px]">{{@$catatan->created_at}}</div> 
+                <div class="text-sm">{{@$catatan->catatan}}</div>
+            </div>
         @endif
     </div>
 </div>

routes/modules/modules.php

@@ -57,6 +57,7 @@ Route::name('opendata.')->prefix('opendata')->group(function () {
         Route::get('view/{id?}',[DatasetTambahanController::class,'view'])->name('view');
         Route::get('delete/{id?}',[DatasetTambahanController::class,'delete'])->name('delete');
         Route::get('aktif/{id?}',[DatasetTambahanController::class,'aktif'])->name('aktif');
+        Route::post('verifikasi/{id?}',[DatasetTambahanController::class,'verifikasi'])->name('verifikasi');
     });
 });