Merge branch 'master' of http://gitlab.nologostudio.ru/alarionov/rekamore-su

Андрей Ларионов
2 parents e9f19836bd eb5ae252d6
Showing 2 changed files Side-by-side Diff
app/Http/Controllers/EmployerController.php
public/css/style_may2024.css
@@ -602,7 +602,12 @@ class EmployerController extends Controller
  
         $export_options = DbExportColumns::toArray();
  
-        $jobs_titles = Job_title::select('id', 'name')->orderBy('name', 'asc')->get()->toArray();
+        $jobs_titles = Job_title::select('id', 'name')
+            ->where('is_remove', '=', 0)
+            ->orderBy('name', 'asc')
+            ->get()
+            ->toArray()
+        ;
  
         return view('employers.bd', compact('users', 'count_users', 'export_options', 'jobs_titles'));
     }
@@ -2092,7 +2092,7 @@ h1 {
   border-right-color: #377d87;
 }
 .table_spoiler tr {
-  display: none;
+  /*display: none;*/
 }
 .table_spoiler tr:nth-of-type(1), .table_spoiler tr:nth-of-type(2), .table_spoiler tr:nth-of-type(3), .table_spoiler tr:nth-of-type(4), .table_spoiler tr:nth-of-type(5), .table_spoiler tr:nth-of-type(6) {
   display: table-row;
...	...	@@ -602,7 +602,12 @@ class EmployerController extends Controller
602	602
603	603	$export_options = DbExportColumns::toArray();
604	604
605		- $jobs_titles = Job_title::select('id', 'name')->orderBy('name', 'asc')->get()->toArray();
	605	+ $jobs_titles = Job_title::select('id', 'name')
	606	+ ->where('is_remove', '=', 0)
	607	+ ->orderBy('name', 'asc')
	608	+ ->get()
	609	+ ->toArray()
	610	+ ;
606	611
607	612	return view('employers.bd', compact('users', 'count_users', 'export_options', 'jobs_titles'));
608	613	}
...	...	@@ -2092,7 +2092,7 @@ h1 {
2092	2092	border-right-color: #377d87;
2093	2093	}
2094	2094	.table_spoiler tr {
2095		- display: none;
	2095	+ /display: none;/
2096	2096	}
2097	2097	.table_spoiler tr:nth-of-type(1), .table_spoiler tr:nth-of-type(2), .table_spoiler tr:nth-of-type(3), .table_spoiler tr:nth-of-type(4), .table_spoiler tr:nth-of-type(5), .table_spoiler tr:nth-of-type(6) {
2098	2098	display: table-row;