diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index 5fec2c7..af0525b 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -57,7 +57,7 @@ class DatasetController extends Controller public function grid(Request $request) { - $data = Dataset::all(); + $data = Dataset::orderBy('DatasetId','DESC')->get(); // $data = User::with(['group'])->orderBy('id','DESC')->get(); $_data = []; @@ -73,19 +73,31 @@ class DatasetController extends Controller $action .= ''; if(session('group_id') == 1){ // $action .= ''; - // $action .= ''; + if($row->status == 1){ + $action .= ''; + }else{ + $action .= ''; + } } $action .= ''; } + $status = ''; + if($row->status == 1){ + $status = ''; + }else{ + $status = ''; + } $_data[] = [ 'no' => $key+1, 'id' => encode_id($row->id), 'name' => @$row->name, 'publik' => @$row->publik, + 'tahun' => @$row->tahun, 'created_at' => date('d-m-Y H:i:s',strtotime(@$row->created_at)), 'instansi' => @$row->instansi->name, 'action' => @$action, + 'status' => @$status, ]; } @@ -146,7 +158,7 @@ class DatasetController extends Controller - for ($i = 1; $i < count($rows); $i++) { + for ($i = 5; $i < count($rows); $i++) { $row = $rows[$i]; // Skip baris kosong @@ -192,16 +204,18 @@ class DatasetController extends Controller $insert->deskripsi = $request->deskripsi; $insert->save(); }else{ + // dd($request->all()); Validator::make($request->all(), [ - 'name' => 'required', - 'instansi_id' => 'required', - 'template_id' => 'required', - 'template_default' => 'required', - 'publik' => 'required', - 'tags' => 'required', - 'file' => 'required|file|mimes:xlsx,xls', - 'topik' => 'required', + // 'name' => 'required', + // 'instansi_id' => 'required', + // 'template_id' => 'required', + // 'template_default' => 'required', + // 'publik' => 'required', + // 'tags' => 'required', + // 'file' => 'required|file', + // 'topik' => 'required', ])->validate(); + $insert = new Dataset; $insert->instansi_id = decode_id($request->instansi_id); @@ -299,4 +313,23 @@ class DatasetController extends Controller { // } + + public function delete($id) + { + $keyId = decode_id($id); + $dataset = Dataset::find($keyId); + $dataset->status = 0; + $dataset->save(); + + return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']); + } + public function aktif($id) + { + $keyId = decode_id($id); + $dataset = Dataset::find($keyId); + $dataset->status = 1; + $dataset->save(); + + return response()->json(['success' => true,'message' => 'Berhasil update data','type' => 'success']); + } } diff --git a/public/assets/logo-dlh.png b/public/assets/logo-dlh.png new file mode 100644 index 0000000..92d77be Binary files /dev/null and b/public/assets/logo-dlh.png differ diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 87c8a51..9646c2f 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -9,7 +9,9 @@ - + + + @@ -29,8 +31,8 @@
- - logo + + logo
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 49ff178..1905f14 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -8,7 +8,7 @@ - + @@ -31,7 +31,7 @@
- logo + logo

Register

diff --git a/resources/views/include/sidebar.blade.php b/resources/views/include/sidebar.blade.php index 2644dad..e552721 100644 --- a/resources/views/include/sidebar.blade.php +++ b/resources/views/include/sidebar.blade.php @@ -5,7 +5,7 @@
- Light logo + Light logo
DIKPLHD
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 5205afc..4bb6e36 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -88,7 +88,7 @@
- +

{{$dataSet->name}}

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 351f7cc..3c3eafc 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -6,7 +6,7 @@ DIKPLHD | Dinas Lingkungan Hidup - + @@ -27,7 +27,7 @@
- +
DIKPLHD
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 01e7573..1789db6 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -6,7 +6,10 @@ {{@$title}} | DIKPLHD - + + + + diff --git a/resources/views/modules/opendata/dataset/form.blade.php b/resources/views/modules/opendata/dataset/form.blade.php index 37d97d8..b4f61a6 100644 --- a/resources/views/modules/opendata/dataset/form.blade.php +++ b/resources/views/modules/opendata/dataset/form.blade.php @@ -134,6 +134,10 @@ {{$message}} @enderror
+
+ + +
 Batal diff --git a/resources/views/modules/opendata/dataset/index.blade.php b/resources/views/modules/opendata/dataset/index.blade.php index 5700062..f534d8d 100644 --- a/resources/views/modules/opendata/dataset/index.blade.php +++ b/resources/views/modules/opendata/dataset/index.blade.php @@ -34,6 +34,8 @@ No Nama Instansi Nama Dataset + Tahun + Status Tanggal Dibuat @@ -85,5 +87,45 @@ var id = $(this).attr('data-id'); }); return false; }); + +$("#grid-data").on("click", ".aktif_data", function() { +var base_url = $(this).attr('data-href'); +var id = $(this).attr('data-id'); + swal({ + title: "Aktifkan Data!", + text: "Apa anda yakin ingin aktifkan data ini ?", + type: "warning", + showCancelButton: true, + confirmButtonColor: "#2dad62", + confirmButtonText: "Ya Aktifkan Sekarang", + cancelButtonText: "Tidak", + closeOnConfirm: true, + closeOnCancel: true + }, + function(isConfirm) { + if(isConfirm){ + + request = $.ajax({ + url: base_url, + type: "GET", + }); + + // Callback handler that will be called on success + request.done(function(response, textStatus, jqXHR){ + console.log(response); + toastr.success("Berhasil Mengaktifkan Data", 'Berhasil!', {positionClass: 'toast-bottom-right', containerId: 'toast-bottom-right'}); + $('#grid-data').bootstrapTable('refresh'); + }); + + // Callback handler that will be called on failure + request.fail(function (jqXHR, textStatus, errorThrown){ + toastr.error( + "Gagal "+textStatus, errorThrown + ); + }); + } + }); + return false; +}); @endsection \ No newline at end of file diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php index a11c5d7..13ee4f0 100644 --- a/resources/views/search.blade.php +++ b/resources/views/search.blade.php @@ -67,7 +67,7 @@
- +
diff --git a/routes/modules/modules.php b/routes/modules/modules.php index 0c69eda..088d974 100644 --- a/routes/modules/modules.php +++ b/routes/modules/modules.php @@ -19,6 +19,8 @@ Route::name('opendata.')->prefix('opendata')->group(function () { Route::get('gridDetail',[DatasetController::class,'gridDetail'])->name('gridDetail'); Route::get('update/{id?}',[DatasetController::class,'update'])->name('update'); Route::get('view/{id?}',[DatasetController::class,'view'])->name('view'); + Route::get('delete/{id?}',[DatasetController::class,'delete'])->name('delete'); + Route::get('aktif/{id?}',[DatasetController::class,'aktif'])->name('aktif'); }); });