diff --git a/app/Helpers/custom.php b/app/Helpers/custom.php index e9a5162..c9c7148 100644 --- a/app/Helpers/custom.php +++ b/app/Helpers/custom.php @@ -55,7 +55,7 @@ if (!function_exists('getRoles')) { $role = []; }else{ $roleDefault = array($user->ms_group_id); - $rolesId = json_decode($user->roles_id); + $rolesId = @$user->roles_id ? json_decode($user->roles_id) : []; $role = Group::whereIn('MsGroupId',array_unique(array_merge($rolesId,$roleDefault)))->get(); } diff --git a/app/Http/Controllers/LembarPengesahanController.php b/app/Http/Controllers/LembarPengesahanController.php index acd806b..738a6cb 100644 --- a/app/Http/Controllers/LembarPengesahanController.php +++ b/app/Http/Controllers/LembarPengesahanController.php @@ -8,6 +8,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\File; use Carbon\Carbon; use App\Models\LembarPengesahan; +use App\Models\KegiatanAdaptasi; +use App\Models\KegiatanMitigasi; class LembarPengesahanController extends Controller { @@ -42,13 +44,18 @@ class LembarPengesahanController extends Controller $_data = []; foreach ($data as $key => $row) { - - $btn = 'Edit'; - $btn .= '