diff --git a/app/Events/OperasiNotice.php b/app/Events/OperasiNotice.php index 7098b18..8dde62b 100644 --- a/app/Events/OperasiNotice.php +++ b/app/Events/OperasiNotice.php @@ -11,12 +11,13 @@ class OperasiNotice implements ShouldBroadcast { use Dispatchable, InteractsWithSockets, SerializesModels; - public $cawangan,$namakhazanah; + public $cawangan,$namakhazanah,$group_id; - public function __construct($cawangan,$namakhazanah) + public function __construct($cawangan,$namakhazanah,$group_id) { $this->cawangan = $cawangan; $this->namakhazanah = $namakhazanah; + $this->group_id = $group_id; } public function broadcastOn() diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 383ad87..a5147a9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -662,7 +662,7 @@ class KhazanahController extends Controller } - event(new OperasiNotice($auth_user['cawangan'],$auth_user['name'])); + event(new OperasiNotice($auth_user['cawangan'],$auth_user['name'],$auth_user['group_id'])); } } diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 11a2e51..da85ec1 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -29,7 +29,7 @@ class OperasiController extends Controller $api_url = config('api.url'); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $kelulusan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/ListOperasi/')->json(); + $kelulusan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/ListOperasi/', ['group_id'=> $auth_user['group_id'] ])->json(); $arraykelulusan = []; diff --git a/database/migrations/2024_01_21_143742_add_group_id_to_users_table.php b/database/migrations/2024_01_21_143742_add_group_id_to_users_table.php new file mode 100644 index 0000000..514e7e2 --- /dev/null +++ b/database/migrations/2024_01_21_143742_add_group_id_to_users_table.php @@ -0,0 +1,34 @@ +integer('group_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + // + $table->dropColumn(['group_id']); + }); + } +} diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php index ddda734..91c95ab 100644 --- a/resources/views/layouts/app_operasi.blade.php +++ b/resources/views/layouts/app_operasi.blade.php @@ -1,5 +1,6 @@ + @@ -38,19 +39,19 @@ - + {{-- jquery validation --}} {{-- Pusher --}} - + - + +
- @if(session()->has('iklan') && session()->get('iklan') == 0) + @if (session()->has('iklan') && session()->get('iklan') == 0) + @yield('footer') +