diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index aac524b..58b3430 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -240,7 +240,7 @@ if (!function_exists('renderMenu')) { $html = ''; foreach ($parent as $p1) { // echo $p1->MsMenuId.'
'; - $child2 = Menu::where('status',true)->where('menu_type','sidebar')->where('parent_id',$p1->MsMenuId)->get(); + $child2 = Menu::where('status',true)->where('menu_type','sidebar')->where('parent_id',$p1->MsMenuId)->orderBy('ordering','ASC')->get(); $access1 = permission('is_read', $p1->MsMenuId, 'menu', true); $ch1 = count($child2) > 0 ? '' : ''; diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index b62702d..4855760 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -23,7 +23,7 @@ use App\Imports\Import; class DatasetController extends Controller { - protected $title = 'Dataset'; + protected $title = 'Dataset Utama'; protected $template = 'modules.opendata.dataset'; protected $route = 'modules.opendata.dataset'; private $datasetRepository; @@ -38,7 +38,7 @@ class DatasetController extends Controller $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset Utama'], ['name' => 'Dataset','active' => true], ]; $data['title'] = $this->title; @@ -138,7 +138,7 @@ class DatasetController extends Controller 'publik' => @$row->publik, 'tahun' => @$row->tahun, 'template' => @$row->tabelData->name, - 'created_at' => date('d-m-Y H:i:s',strtotime(@$row->created_at)), + 'created_at' => date('d-m-Y',strtotime(@$row->created_at)), 'instansi' => @$row->instansi->name, 'action' => @$action, 'status' => @$status, @@ -262,7 +262,7 @@ class DatasetController extends Controller { $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset Utama'], ['name' => 'Dataset','active' => true], ]; $keyId = decode_id($id); @@ -286,7 +286,7 @@ class DatasetController extends Controller { $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset Utama'], ['name' => 'Dataset','active' => true], ]; $keyId = decode_id($id); diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index 326cf7f..b76a8bb 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -29,7 +29,7 @@ class DatasetTambahanController extends Controller $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset SLHD'], ['name' => 'Dataset Tambahan','active' => true], ]; $data['title'] = $this->title; @@ -100,7 +100,7 @@ class DatasetTambahanController extends Controller 'name' => @$row->name, 'publik' => @$row->publik, 'tahun' => @$row->tahun, - 'created_at' => date('d-m-Y H:i:s',strtotime(@$row->created_at)), + 'created_at' => date('d-m-Y',strtotime(@$row->created_at)), 'instansi' => @$row->instansi->name, 'action' => @$action, 'status' => @$status, @@ -275,7 +275,7 @@ class DatasetTambahanController extends Controller { $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset SLHD'], ['name' => 'Dataset Tambahan','active' => true], ]; $keyId = decode_id($id); @@ -298,7 +298,7 @@ class DatasetTambahanController extends Controller { $data['breadcrumbs'] = [ ['name' => 'Dashboard','url' => url('dashboard')], - ['name' => 'Open Data'], + ['name' => 'Dataset SLHD'], ['name' => 'Dataset Tambahan','active' => true], ]; $keyId = decode_id($id); diff --git a/public/assets/js/bootstrap-table.min.js b/public/assets/js/bootstrap-table.min.js index ad2ac32..a65b1e5 100644 --- a/public/assets/js/bootstrap-table.min.js +++ b/public/assets/js/bootstrap-table.min.js @@ -4799,10 +4799,10 @@ return "Loading, please wait" }, formatRecordsPerPage: function(t) { - return "".concat(t, " rows per page") + return "".concat(t, " baris per halaman") }, formatShowingRows: function(t, e, n, i) { - return void 0 !== i && i > 0 && i > n ? "Showing ".concat(t, " to ").concat(e, " of ").concat(n, " rows (filtered from ").concat(i, " total rows)") : "Showing ".concat(t, " to ").concat(e, " of ").concat(n, " rows") + return void 0 !== i && i > 0 && i > n ? "Menampilkan ".concat(t, " sampai ").concat(e, " dari ").concat(n, " rows (filtered from ").concat(i, " total rows)") : "Menampilkan ".concat(t, " sampai ").concat(e, " dari ").concat(n, " baris") }, formatSRPaginationPreText: function() { return "previous page" @@ -4814,7 +4814,7 @@ return "next page" }, formatDetailPagination: function(t) { - return "Showing ".concat(t, " rows") + return "Menampilkan ".concat(t, " rows") }, formatSearch: function() { return "Search" diff --git a/resources/views/dashboardtest.blade.php b/resources/views/dashboardtest.blade.php index 0a93c15..b8e985d 100644 --- a/resources/views/dashboardtest.blade.php +++ b/resources/views/dashboardtest.blade.php @@ -259,11 +259,11 @@ - - - - - + + + + + diff --git a/resources/views/dataset-tambahan.blade.php b/resources/views/dataset-tambahan.blade.php index d1d4531..bfc78ad 100644 --- a/resources/views/dataset-tambahan.blade.php +++ b/resources/views/dataset-tambahan.blade.php @@ -38,9 +38,9 @@
-

Resource Data

+

Sumber Data

-

Resource Data

+

Sumber Data

-

Resource Data

+

Sumber Data

+ - - - - + + + + @@ -90,11 +90,11 @@
Judul DatasetKategoriTerakhir UpdateStatusAksiJudul DatasetKategoriTerakhir UpdateStatusAksi
NoInstansiDatasetPersentaseNoInstansiDatasetPersentase
- - - - - + + + + + diff --git a/resources/views/modules/management/role/akses/form.blade.php b/resources/views/modules/management/role/akses/form.blade.php index 66a4e08..73d9496 100644 --- a/resources/views/modules/management/role/akses/form.blade.php +++ b/resources/views/modules/management/role/akses/form.blade.php @@ -13,26 +13,26 @@ data-page-size="700"> - - - - - - - + + + + + + + @foreach($menu as $key1 => $parent) - - + - - + @@ -88,7 +88,7 @@ @if($level1['level2']) @foreach($level1['level2'] as $key3 => $level2) - - - diff --git a/resources/views/modules/management/role/index.blade.php b/resources/views/modules/management/role/index.blade.php index e951376..ea19c26 100644 --- a/resources/views/modules/management/role/index.blade.php +++ b/resources/views/modules/management/role/index.blade.php @@ -27,9 +27,9 @@ id="grid-data"> - - - + + + diff --git a/resources/views/modules/management/user/index.blade.php b/resources/views/modules/management/user/index.blade.php index 3b7bc20..90b43d5 100644 --- a/resources/views/modules/management/user/index.blade.php +++ b/resources/views/modules/management/user/index.blade.php @@ -27,10 +27,10 @@ id="grid-data"> - - - - + + + + diff --git a/resources/views/modules/master/instansi/form.blade.php b/resources/views/modules/master/instansi/form.blade.php index e4943e6..126a893 100644 --- a/resources/views/modules/master/instansi/form.blade.php +++ b/resources/views/modules/master/instansi/form.blade.php @@ -58,7 +58,7 @@ @enderror
- + @error('name') {{$message}} diff --git a/resources/views/modules/master/tabel-data/index.blade.php b/resources/views/modules/master/tabel-data/index.blade.php index 0d5be7d..0ed22f3 100644 --- a/resources/views/modules/master/tabel-data/index.blade.php +++ b/resources/views/modules/master/tabel-data/index.blade.php @@ -27,12 +27,12 @@ id="grid-data"> - # - No - Tahun - Name - Nomor Tabel - Jumlah Kolom + # + No + Tahun + Name + Nomor Tabel + Jumlah Kolom diff --git a/resources/views/modules/master/tabel-data/kolom/index.blade.php b/resources/views/modules/master/tabel-data/kolom/index.blade.php index b3a3ac0..1cd9a0f 100644 --- a/resources/views/modules/master/tabel-data/kolom/index.blade.php +++ b/resources/views/modules/master/tabel-data/kolom/index.blade.php @@ -24,11 +24,11 @@ id="grid-data"> - # - No - Name - Order - Key + # + No + Name + Order + Key diff --git a/resources/views/modules/master/topik/index.blade.php b/resources/views/modules/master/topik/index.blade.php index fa7cac8..4e2d850 100644 --- a/resources/views/modules/master/topik/index.blade.php +++ b/resources/views/modules/master/topik/index.blade.php @@ -27,9 +27,9 @@ id="grid-data"> - # - No - Name + # + No + Name diff --git a/resources/views/modules/opendata/dataset-tambahan/form.blade.php b/resources/views/modules/opendata/dataset-tambahan/form.blade.php index f8a33e3..ef4898f 100644 --- a/resources/views/modules/opendata/dataset-tambahan/form.blade.php +++ b/resources/views/modules/opendata/dataset-tambahan/form.blade.php @@ -6,7 +6,7 @@ {{csrf_field()}}
-
Informasi Instansi Dataset
+
Informasi Instansi

@@ -21,7 +21,7 @@ @enderror
- + file ? '' : 'required'}}> - Masukan Ekstensi File : .xls,.xlsx + Masukan Ekstensi File : .pdf,.xls,.xlsx @if(@$item->file)  Download File @endif @@ -65,10 +65,11 @@
- + + {{-- @for($i = (date('Y')-5); date('Y') >= $i ; $i++) - @endfor + @endfor --}}
diff --git a/resources/views/modules/opendata/dataset-tambahan/index.blade.php b/resources/views/modules/opendata/dataset-tambahan/index.blade.php index a2a64fb..93a0c50 100644 --- a/resources/views/modules/opendata/dataset-tambahan/index.blade.php +++ b/resources/views/modules/opendata/dataset-tambahan/index.blade.php @@ -35,16 +35,15 @@ data-page-size="10" data-id-field="id" id="grid-data"> - + - # - No - Nama Instansi - Nama Dataset - Resource Data - Tahun - Status - Tanggal Dibuat + # + No + Nama Instansi + Nama Dataset + Sumber Data Terkait + Tahun Sistem + Tanggal Input diff --git a/resources/views/modules/opendata/dataset-tambahan/view.blade.php b/resources/views/modules/opendata/dataset-tambahan/view.blade.php index 80d4ca5..ce990a4 100644 --- a/resources/views/modules/opendata/dataset-tambahan/view.blade.php +++ b/resources/views/modules/opendata/dataset-tambahan/view.blade.php @@ -25,7 +25,7 @@
-
Resource Data
+
Sumber Data
{{$item->template->name}}
diff --git a/resources/views/modules/opendata/dataset/form.blade.php b/resources/views/modules/opendata/dataset/form.blade.php index 73d517a..30982a8 100644 --- a/resources/views/modules/opendata/dataset/form.blade.php +++ b/resources/views/modules/opendata/dataset/form.blade.php @@ -6,7 +6,7 @@ {{csrf_field()}}
-
Informasi Instansi Dataset
+
Informasi Instansi

@@ -21,13 +21,13 @@ @enderror
- +
@@ -50,7 +50,7 @@ @enderror
- +
Masukan Ekstensi File : .xls,.xlsx @@ -72,10 +72,11 @@
- + + {{-- @for($i = (date('Y')-5); date('Y') >= $i ; $i++) - @endfor + @endfor --}}
@@ -140,7 +141,7 @@ $(destino).empty(); if(selectTo=='template_id'){ - $(destino).append('').select2("val", "0"); + $(destino).append('').select2("val", "0"); $.each(obj, function(index) { value = obj[index].id; @@ -159,7 +160,7 @@ } else { if(selectTo=='template_id'){ - $(destino).empty().append('').select2("val", "0"); + $(destino).empty().append('').select2("val", "0"); } } $('#loading-spinner').hide(); diff --git a/resources/views/modules/opendata/dataset/index.blade.php b/resources/views/modules/opendata/dataset/index.blade.php index 7baadb2..171774d 100644 --- a/resources/views/modules/opendata/dataset/index.blade.php +++ b/resources/views/modules/opendata/dataset/index.blade.php @@ -21,7 +21,6 @@
-
- + - - - - - - - - + + + + + + + + diff --git a/resources/views/modules/opendata/dataset/view.blade.php b/resources/views/modules/opendata/dataset/view.blade.php index 900b538..44910e0 100644 --- a/resources/views/modules/opendata/dataset/view.blade.php +++ b/resources/views/modules/opendata/dataset/view.blade.php @@ -24,7 +24,7 @@
-
Resource Data
+
Sumber Data
{{$item->tabelData->name}}
diff --git a/resources/views/resource.blade.php b/resources/views/resource.blade.php index c35fab7..58f9f01 100644 --- a/resources/views/resource.blade.php +++ b/resources/views/resource.blade.php @@ -14,7 +14,7 @@

Pusat Data & Informasi

Semua Informasi dalam Satu Tempat

- Jelajahi kumpulan 60 resource data kami. Berikut beberapa pilihan yang kami tampilkan untuk mempermudah akses Anda + Jelajahi kumpulan 60 Sumber Data kami. Berikut beberapa pilihan yang kami tampilkan untuk mempermudah akses Anda

@@ -22,7 +22,7 @@
-

Resource Data

+

Sumber Data

diff --git a/resources/views/search.blade.php b/resources/views/search.blade.php index 13ee4f0..4b9b64d 100644 --- a/resources/views/search.blade.php +++ b/resources/views/search.blade.php @@ -29,7 +29,7 @@
page == 'opd' ? 'checked' : ''}} class="form-checkbox" type="checkbox"> OPD
page == 'dataset' ? 'checked' : ''}} class="form-checkbox" type="checkbox"> Dataset
--> -
Resource Data
+
Sumber Data

#NoNama InstansiNama DatasetResource DataTahunStatusTanggal Dibuat#NoNama InstansiNama DatasetSumber DataTahun SistemStatusTanggal Input