diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php index e67fc77..a361af7 100644 --- a/app/Http/Controllers/Management/UserController.php +++ b/app/Http/Controllers/Management/UserController.php @@ -61,7 +61,7 @@ class UserController extends Controller } $role = ''; $role .= '
'; - $role .= 'Role & Hak Akses : '.@$row->group->name.''; + $role .= 'Role & Hak Akses : '.@$row->group->name.''; $role .= 'Instansi : '.@$instansi->instansi->name.''; $role .= '
'; @@ -71,7 +71,7 @@ class UserController extends Controller 'name' => @$row->name, 'role' => @$role, 'username' => @$row->username, - 'instansi' => @$instansi->name, + 'instansi' => @$instansi->instansi->name, 'email' => @$row->email, 'created_at' => dateTime(@$row->created_at), 'action' => @$action, diff --git a/app/Http/Controllers/Opendata/DatasetController.php b/app/Http/Controllers/Opendata/DatasetController.php index fc4a10e..3ef2475 100644 --- a/app/Http/Controllers/Opendata/DatasetController.php +++ b/app/Http/Controllers/Opendata/DatasetController.php @@ -124,11 +124,11 @@ class DatasetController extends Controller } $status = ''; if($row->status == 1){ - $status = 'Valid'; + $status = 'Valid'; }elseif($row->status == 0){ - $status = 'Menunggu Verifikasi'; + $status = 'Menunggu Verifikasi'; }elseif($row->status == 2){ - $status = 'Verifikasi Ditolak'; + $status = 'Verifikasi Ditolak'; } $_data[] = [ diff --git a/app/Http/Controllers/Opendata/DatasetTambahanController.php b/app/Http/Controllers/Opendata/DatasetTambahanController.php index 6e7662c..74f52db 100644 --- a/app/Http/Controllers/Opendata/DatasetTambahanController.php +++ b/app/Http/Controllers/Opendata/DatasetTambahanController.php @@ -89,11 +89,11 @@ class DatasetTambahanController extends Controller } $status = ''; if($row->status == 1){ - $status = 'Valid'; + $status = 'Valid'; }elseif($row->status == 0){ - $status = 'Menunggu Verifikasi'; + $status = 'Menunggu Verifikasi'; }elseif($row->status == 2){ - $status = 'Verifikasi Ditolak'; + $status = 'Verifikasi Ditolak'; } $_data[] = [ diff --git a/resources/views/dataset-tambahan.blade.php b/resources/views/dataset-tambahan.blade.php index 187e4b3..0e6896b 100644 --- a/resources/views/dataset-tambahan.blade.php +++ b/resources/views/dataset-tambahan.blade.php @@ -29,9 +29,9 @@
-

Organisasi

+

Instansi

- + @foreach ($instansi as $dataInstansi) @endforeach diff --git a/resources/views/modules/management/user/index.blade.php b/resources/views/modules/management/user/index.blade.php index a116b6d..de997a7 100644 --- a/resources/views/modules/management/user/index.blade.php +++ b/resources/views/modules/management/user/index.blade.php @@ -31,6 +31,7 @@ No Name Role + Instansi