diff --git a/app/Http/Controllers/WorkerController.php b/app/Http/Controllers/WorkerController.php index 61b7f02..2887aca 100644 --- a/app/Http/Controllers/WorkerController.php +++ b/app/Http/Controllers/WorkerController.php @@ -160,7 +160,11 @@ class WorkerController extends Controller ->first(); $user->workers[0]->job_titles = $user->workers[0]->job_titles->pluck('id')->toArray(); - $job_titles = Job_title::all()->where('is_bd', '=', 1)->sortByDesc('sort'); + $job_titles = Job_title::query() + ->where('is_remove', '=', 0) + ->where('is_bd', '=', 1) + ->sortByDesc('sort') + ; return view('workers.form_basic_information', compact('user', 'job_titles')); } diff --git a/public/css/style_may2024.css b/public/css/style_may2024.css index 3cfa740..0e5807c 100644 --- a/public/css/style_may2024.css +++ b/public/css/style_may2024.css @@ -9266,4 +9266,4 @@ main + .news { body .cke_notifications_area{ opacity: 0; display: none !important; -} +} diff --git a/resources/views/education/show.blade.php b/resources/views/education/show.blade.php index 6179fdd..e3e6da0 100644 --- a/resources/views/education/show.blade.php +++ b/resources/views/education/show.blade.php @@ -22,7 +22,13 @@ thumb.removeClass('ui-state-active'); var panel_height = panel.height() - parseInt(added_height); - panel.animate({height: panel_height + "px"}, 500 ); + panel.animate({height: panel_height + "px"}, { + easing: 'swing', + duration: 500, + complete: function () { + panel.css('height', 'auto'); + } + }); panel.data('added-height', 0); } else { parent_ul.find('.accordion-thumb').removeClass('ui-state-active'); @@ -30,7 +36,13 @@ var add_height = this_li.find('.accordion-panel').height() + 20; var panel_height = panel.height() + parseInt(add_height) - parseInt(added_height); - panel.animate({height: panel_height + "px"}, 500 ); + panel.animate({height: panel_height + "px"}, { + easing: 'swing', + duration: 500, + complete: function () { + panel.css('height', 'auto'); + } + }); this_li.find('.accordion-panel').show(500); panel.data('added-height', add_height); }