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 @@
| Judul Dataset | -Kategori | -Terakhir Update | -Status | -Aksi | +Judul Dataset | +Kategori | +Terakhir Update | +Status | +Aksi |
|---|