diff --git a/app/Http/Controllers/EmployerController.php b/app/Http/Controllers/EmployerController.php index c004fea..fc8ea91 100644 --- a/app/Http/Controllers/EmployerController.php +++ b/app/Http/Controllers/EmployerController.php @@ -583,7 +583,21 @@ class EmployerController extends Controller // База данных public function bd(Request $request) { - $users = User_Model::query()->with('workers'); + for ($i = 0; $i < 5; $i++) { + echo "i = $i\n
"; + for ($j = 0; $j < 5; $j++) { + echo " j = $j\n
"; + for ($k = 0; $k < 5; $k++) { + if ($k == 2) { + continue; + } + echo " k = $k\n
"; + } + } + } + + dd('OK'); + $users = User_Model::query()->with('workers')->with('jobtitles'); if ($request->has('search')) { $find_key = $request->get('search'); diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php index 2679956..401d272 100644 --- a/app/Http/Controllers/MainController.php +++ b/app/Http/Controllers/MainController.php @@ -40,7 +40,7 @@ class MainController extends Controller ->get(); $Job_title = Job_title::query()->where('is_remove', '=', '0')-> - where('is_bd', '=', '0')->orderBy('name')->get(); + where('is_bd', '=', '0')->orderByDesc('sort')->get(); $Data = DB::table('job_titles')-> selectRaw('job_titles.name as jn, count(`ad_jobs`.`job_title_id`) as cnt, job_titles.id as id_job, categories.name as catname, categories.id as id_cat')-> diff --git a/resources/views/education/show.blade.php b/resources/views/education/show.blade.php index 631996f..87cff93 100644 --- a/resources/views/education/show.blade.php +++ b/resources/views/education/show.blade.php @@ -47,7 +47,7 @@
@if($education->image) - + @endif
diff --git a/resources/views/employers/bd.blade.php b/resources/views/employers/bd.blade.php index b6e65ba..3f99237 100644 --- a/resources/views/employers/bd.blade.php +++ b/resources/views/employers/bd.blade.php @@ -6,7 +6,7 @@ $('[name="job_title_list[]"]').chosen({ width: '100%' }) - $('[name="job_title"]').change(function(){ + $('[name="job_titles__name"]').change(function(){ if ($(this).is(':checked')){ $(".job-title-list-wrap").css("display", "block"); } else { @@ -124,11 +124,11 @@
-
+
Позиции работников
- Всего вакансий найдено: + Пользователей найдено: {{ $count_users->count() }}
@@ -144,8 +144,7 @@ ФИО соискателя - Номер телефона - Электронная
почта + Должность Наличие
анкеты @@ -160,30 +159,7 @@ {{ $it->surname." ".$it->name_man }}
{{ $it->surname2 }} - - - @if (!empty($it->workers[0]->telephone)) - - {{ $it->workers[0]->telephone }} - - @else - - - @endif - - @if (!empty($it->workers[0]->telephone2)) -
- {{ $it->workers[0]->telephone2 }} - - @endif - - - - @if (!empty($it->workers[0]->email)) - {{ $it->workers[0]->email }} - @else - - - @endif - + {{ $it->jobtitles[0]->name ?? '-' }} @if (isset($it->workers[0]->id)) diff --git a/resources/views/employers/bd_tupe.blade.php b/resources/views/employers/bd_tupe.blade.php index 6e3d577..7a9efbd 100644 --- a/resources/views/employers/bd_tupe.blade.php +++ b/resources/views/employers/bd_tupe.blade.php @@ -74,7 +74,7 @@
Капитан
- Всего вакансий найдено: + Пользователей найдено: 18
diff --git a/resources/views/workers/cabinet.blade.php b/resources/views/workers/cabinet.blade.php index a709596..1727ce3 100644 --- a/resources/views/workers/cabinet.blade.php +++ b/resources/views/workers/cabinet.blade.php @@ -268,21 +268,16 @@
- {{ $worker->telephon2 ?? '-' }} + {{ $worker->telephone2 ?? '-' }}
- - - -
-

О себе

-
{{ $worker->text }}
-
- - +
+

О себе

+
{{ $worker->text }}
+
Редактировать основную информацию