фиксы

Сергей П
1 parent 1a7e890836
Showing 3 changed files with 20 additions and 4 deletions Side-by-side Diff
app/Http/Controllers/WorkerController.php
public/css/style_may2024.css
resources/views/education/show.blade.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'));
     }
@@ -9266,4 +9266,4 @@ main + .news {
 body .cke_notifications_area{
     opacity: 0;
     display: none !important;
-} 
+}
@@ -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);
             }
...	...	@@ -160,7 +160,11 @@ class WorkerController extends Controller
160	160	->first();
161	161	$user->workers[0]->job_titles = $user->workers[0]->job_titles->pluck('id')->toArray();
162	162
163		- $job_titles = Job_title::all()->where('is_bd', '=', 1)->sortByDesc('sort');
	163	+ $job_titles = Job_title::query()
	164	+ ->where('is_remove', '=', 0)
	165	+ ->where('is_bd', '=', 1)
	166	+ ->sortByDesc('sort')
	167	+ ;
164	168
165	169	return view('workers.form_basic_information', compact('user', 'job_titles'));
166	170	}
...	...	@@ -9266,4 +9266,4 @@ main + .news {
9266	9266	body .cke_notifications_area{
9267	9267	opacity: 0;
9268	9268	display: none !important;
9269		-}
	9269	+}
...	...	@@ -22,7 +22,13 @@
22	22	thumb.removeClass('ui-state-active');
23	23
24	24	var panel_height = panel.height() - parseInt(added_height);
25		- panel.animate({height: panel_height + "px"}, 500 );
	25	+ panel.animate({height: panel_height + "px"}, {
	26	+ easing: 'swing',
	27	+ duration: 500,
	28	+ complete: function () {
	29	+ panel.css('height', 'auto');
	30	+ }
	31	+ });
26	32	panel.data('added-height', 0);
27	33	} else {
28	34	parent_ul.find('.accordion-thumb').removeClass('ui-state-active');
...	...	@@ -30,7 +36,13 @@
30	36
31	37	var add_height = this_li.find('.accordion-panel').height() + 20;
32	38	var panel_height = panel.height() + parseInt(add_height) - parseInt(added_height);
33		- panel.animate({height: panel_height + "px"}, 500 );
	39	+ panel.animate({height: panel_height + "px"}, {
	40	+ easing: 'swing',
	41	+ duration: 500,
	42	+ complete: function () {
	43	+ panel.css('height', 'auto');
	44	+ }
	45	+ });
34	46	this_li.find('.accordion-panel').show(500);
35	47	panel.data('added-height', add_height);
36	48	}