Андрей Ларионов / rekamore.su

Download as
Browse Code »

Commit f8a3cafe55ae6263c8aeb3479a7e7c940e306673

Authored by Андрей Ларионов
1 parent 4c2bb42612
Exists in master and in 1 other branch usloviya-razmeschniya

диалоговые проблемы - коммуникации проекта

Showing 18 changed files with 202 additions and 46 deletions Side-by-side Diff

app/Http/Controllers/EmployerController.php
Diff comments   View file @ f8a3caf
... ... @@ -127,9 +127,9 @@ class EmployerController extends Controller
127 127 $categories = Category::query()->active()->get();
128 128 $Positions = Category::query()->active()->get();
129 129 if ($Positions->count()) {
130   - $jobs = Job_title::query()->OrderBy('name')->Notbdif()->where('position_id', $Positions[0]->id)->get();
  130 + $jobs = Job_title::query()->OrderBy('name')->where('is_remove', '=', '0')->Notbdif()->where('position_id', $Positions[0]->id)->get();
131 131 } else {
132   - $jobs = Job_title::query()->OrderBy('name')->Notbdif()->where('position_id', 0)->get();
  132 + $jobs = Job_title::query()->OrderBy('name')->where('is_remove', '=', '0')->Notbdif()->where('position_id', 0)->get();
133 133 }
134 134  
135 135 $Employer = Employer::query()->with('users')->with('ads')->with('flots')->
... ... @@ -192,17 +192,17 @@ class EmployerController extends Controller
192 192 public function vacancy_edit(Ad_employer $ad_employer) {
193 193 $id = Auth()->user()->id;
194 194  
195   - $Positions = Category::query()->active()->get();
  195 + $Positions = Category::query()->where('is_remove', '=', '0')->get();
196 196 if ($Positions->count()) {
197 197 $jobs = Job_title::query()->OrderBy('name')->where('position_id', $Positions[0]->id)->get();
198 198 } else {
199 199 $jobs = Job_title::query()->OrderBy('name')->where('position_id', 0)->get();
200 200 }
201   - $categories = Category::query()->get();
  201 +
202 202 $Employer = Employer::query()->with('users')->with('ads')->with('flots')->
203 203 where('user_id', $id)->first();
204 204  
205   - return view('employers.edit_vacancy', compact('ad_employer', 'Positions', 'categories','Employer', 'jobs'));
  205 + return view('employers.edit_vacancy', compact('ad_employer', 'Positions','Employer', 'jobs'));
206 206 }
207 207  
208 208 // Сохранение-редактирование записи
... ... @@ -324,8 +324,8 @@ class EmployerController extends Controller
324 324 $query->where('user_id', $user2->id)->where('to_user_id', $user1->id);
325 325 })->OrderBy('created_at')->get();
326 326  
327   - $id_vac = null;
328   - foreach ($Messages as $it) {
  327 + $id_vac = $Messages[$Messages->count() - 1]->ad_employer_id;
  328 + /*foreach ($Messages as $it) {
329 329 if (isset($it->response)) {
330 330 foreach ($it->response as $r) {
331 331 if (isset($r->ad_employer_id)) {
... ... @@ -336,11 +336,11 @@ class EmployerController extends Controller
336 336 }
337 337 if (!is_null($id_vac)) break;
338 338 }
  339 + */
339 340  
340 341 $ad_employer = null;
341 342 if (!is_null($id_vac)) $ad_employer = Ad_employer::query()->where('id', $id_vac)->first();
342 343 $sender = $user1;
343   -
344 344 return view('employers.dialog', compact('companion', 'sender', 'Messages', 'ad_employer'));
345 345 }
346 346  
... ... @@ -726,15 +726,16 @@ class EmployerController extends Controller
726 726 if ($request->has('_file')) {
727 727 $message->file = $request->file('_file')->store("worker/$id", 'public');
728 728 }
  729 + $message->ad_employer_id = $params['_vacancy'];
729 730 $message->flag_new = 1;
730 731 $id_message = $message->save();
731 732  
732   - $data['message_id'] = $id_message;
733   - $data['ad_employer_id'] = $params['_vacancy'];
734   - $data['job_title_id'] = 0;
  733 + //$data['message_id'] = $id_message;
  734 + //$data['ad_employer_id'] = $params['_vacancy'];
  735 + //$data['job_title_id'] = 0;
735 736  
736 737 $data['flag'] = 1;
737   - $ad_responce = ad_response::create($data);
  738 + //$ad_responce = ad_response::create($data);
738 739 return redirect()->route('employer.messages', ['type_message' => 'output']);
739 740 }
740 741  
... ... @@ -746,7 +747,7 @@ class EmployerController extends Controller
746 747 // Избранные люди на корабль
747 748 public function selected_people(Request $request) {
748 749 $id = $request->get('id');
749   - $favorite_people = Job_title::query()->Notbdif()->where('position_id', $id)->get();
  750 + $favorite_people = Job_title::query()->Notbdif()->where('is_remove', '=', '0')->where('position_id', $id)->get();
750 751 return view('favorite_people', compact('favorite_people'));
751 752 }
752 753 }
app/Http/Controllers/MainController.php
Diff comments   View file @ f8a3caf
... ... @@ -146,7 +146,7 @@ class MainController extends Controller
146 146  
147 147 public function vacancies(Request $request) {
148 148 //должности
149   - $Job_title = Job_title::query()->orderBy('name')->get();
  149 + $Job_title = Job_title::query()->where('is_remove', '=', '0')->orderBy('name')->get();
150 150  
151 151 $categories = Category::query()->selectRaw('count(ad_employers.id) as cnt, categories.*')
152 152 ->selectRaw('min(ad_employers.salary) as min_salary, max(ad_employers.salary) as max_salary')
app/Http/Controllers/WorkerController.php
Diff comments   View file @ f8a3caf
... ... @@ -224,7 +224,7 @@ class WorkerController extends Controller
224 224 function (Builder $query) use ($id) {$query->Where('id', $id);
225 225 })->get();
226 226  
227   - $Job_titles = Job_title::query()->OrderBy('name')->get();
  227 + $Job_titles = Job_title::query()->where('is_remove', '=', '0')->OrderBy('name')->get();
228 228 $Infoblocks = infobloks::query()->OrderBy('name')->get();
229 229  
230 230 $stat = Static_worker::query()->where('year_month', '=', $get_date)
app/Models/Message.php
Diff comments   View file @ f8a3caf
... ... @@ -14,7 +14,9 @@ class Message extends Model
14 14 'to_user_id',
15 15 'text',
16 16 'file',
17   - 'flag_new'
  17 + 'flag_new',
  18 + 'ad_employer_id',
  19 + 'job_title_id'
18 20 ];
19 21  
20 22  
app/Providers/MyServiceProvider.php
Diff comments   View file @ f8a3caf
... ... @@ -82,7 +82,7 @@ class MyServiceProvider extends ServiceProvider
82 82 function($view){
83 83 $id = Auth::user();
84 84 $companies = Company::query()->limit(1)->get();
85   - $jobs = Job_title::query()->get();
  85 + $jobs = Job_title::query()->where('is_remove', '=', '0')->get();
86 86 $view->with(['UserId' => $id, 'companies' => $companies, 'jobs' => $jobs]);
87 87 }
88 88 );
... ... @@ -112,7 +112,7 @@ class MyServiceProvider extends ServiceProvider
112 112 $view_job_title = ['modals.register'];
113 113 View::composer($view_job_title,
114 114 function($view_job_title) {
115   - $Job_titles = Job_title::query()->get();
  115 + $Job_titles = Job_title::query()->where('is_remove', '=', '0')->get();
116 116 $view_job_title->with(['Job_titles' => $Job_titles]);
117 117 }
118 118 );
database/migrations/2024_04_16_141942_alter_table_messages.php
Diff comments   View file @ f8a3caf
... ... @@ -0,0 +1,34 @@
  1 +<?php
  2 +
  3 +use Illuminate\Database\Migrations\Migration;
  4 +use Illuminate\Database\Schema\Blueprint;
  5 +use Illuminate\Support\Facades\Schema;
  6 +
  7 +return new class extends Migration
  8 +{
  9 + /**
  10 + * Run the migrations.
  11 + *
  12 + * @return void
  13 + */
  14 + public function up()
  15 + {
  16 + Schema::table('messages', function (Blueprint $table) {
  17 + $table->bigInteger('ad_employer_id')->default(0);
  18 + $table->bigInteger('job_title_id')->default(0);
  19 + });
  20 + }
  21 +
  22 + /**
  23 + * Reverse the migrations.
  24 + *
  25 + * @return void
  26 + */
  27 + public function down()
  28 + {
  29 + Schema::table('messages', function (Blueprint $table) {
  30 + $table->dropColumn('ad_employer_id');
  31 + $table->dropColumn('job_title_id');
  32 + });
  33 + }
  34 +};
resources/views/employers/edit_vacancy.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -128,8 +128,8 @@
128 128 <div class="select">
129 129 <select class="js-select2" name="category_id" id="category_id">
130 130 @php $i = 1 @endphp
131   - @if ($categories->count())
132   - @foreach($categories as $j)
  131 + @if ($Positions->count())
  132 + @foreach($Positions as $j)
133 133 @if ($i == 1) <option> Выберите категорию из списка</option>
134 134 @else
135 135 <option value="{{ $j->id }}" @if ($ad_employer->category_id == $j->id) selected @endif>{{ $j->name }}</option>
resources/views/employers/messages.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -76,7 +76,7 @@
76 76 <a href="{{ route('employer.messages', ['type_message' => 'output']) }}" class="button button_light @if ($type_message == 'output') active @endif">Исходящие ({{ $count_output }})</a>
77 77 </div>
78 78 </div>
79   - <div class="cabinet__filters-item">
  79 + <!--<div class="cabinet__filters-item">
80 80 <div class="select">
81 81 <select class="js-select2" id="sort_ajax" name="sort_ajax">
82 82 <option value="default">Сортировка (по умолчанию)</option>
... ... @@ -86,7 +86,7 @@
86 86 <option value="created_at (desc)">По дате (убывание)</option>
87 87 </select>
88 88 </div>
89   - </div>
  89 + </div>-->
90 90 </div>
91 91 <div class="messages">
92 92 <!--<button type="button" class="messages__button js-toggle js-parent-toggle button button_light button_more">
... ... @@ -161,7 +161,7 @@
161 161 Удаленный пользователь
162 162 @endif
163 163 </div>
164   - <div><span>Вакансия:</span>@if (isset($it->vacancies[0])) {{ $it->vacancies[0]->name." (".($it->vacancies[0]->id).")" }} @else Удалена @endif</div>
  164 + <div><span>Вакансия: {{ $it->ad_employer_id }}</span>@if (isset($it->vacancies[0])) {{ $it->vacancies[0]->name." (".($it->vacancies[0]->id).")" }} @else Удалена @endif</div>
165 165 <div><span>Текст:</span>{{ $it->text }}</div>
166 166 </div>
167 167 </div>
resources/views/list_vacancies.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -74,6 +74,25 @@
74 74 vacancy.val(code_vacancy);
75 75 });
76 76  
  77 + $(document).on('click', '.js_send_for_emp', function() {
  78 + var this_ = $(this);
  79 + var code_user_id = this_.attr('data-uid');
  80 + var code_to_user_id = this_.attr('data-tuid');
  81 + var code_vacancy = this_.attr('data-vacancy');
  82 + var user_id = $('#send_user_id');
  83 + var to_user_id = $('#send_to_user_id');
  84 + var vacancy = $('#send_vacancy');
  85 +
  86 + console.log('code_to_user_id='+code_to_user_id);
  87 + console.log('code_user_id='+code_user_id);
  88 + console.log('code_vacancy='+code_vacancy);
  89 + console.log('Клик на кнопке...');
  90 +
  91 + user_id.val(code_user_id);
  92 + to_user_id.val(code_to_user_id);
  93 + vacancy.val(code_vacancy);
  94 + });
  95 +
77 96 $(document).on('change', '#sort_ajax', function() {
78 97 var this_ = $(this);
79 98 var val_ = this_.val();
... ... @@ -272,7 +291,7 @@
272 291 @else
273 292 @if (App\Classes\StatusUser::Status()==1)
274 293 <button type="button" data-fancybox data-src="#send" data-vacancy="{{ $Q->id }}" data-uid="{{ $uid }}" data-tuid="{{ $Q->employer->user_id }}" data-options='{"touch":false,"autoFocus":false}'
275   - class="button main__employer-page-two-item-button js_send_it_button">Откликнуться</button>
  294 + class="button main__employer-page-two-item-button js_send_for_emp">Откликнуться</button>
276 295 @else
277 296 <button type="button" data-fancybox data-src="#send2" data-vacancy="{{ $Q->id }}" data-uid="{{ $uid }}" data-tuid="{{ $Q->employer->user_id }}" data-options='{"touch":false,"autoFocus":false}'
278 297 class="button main__employer-page-two-item-button js_send_it_button">Откликнуться</button>
resources/views/modals/send_employer.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -15,13 +15,13 @@
15 15 <div class="modal__text">Если у вас есть предложение, вы можете сделать конретное предложение</div>
16 16 <form class="modal__form" id="form_from_emp" name="form_from_emp" enctype="multipart/form-data" action="{{ route('employer.new_message') }}" method="POST">
17 17 @csrf
18   - <div class="modal__form-item" style="display:none">
  18 + <div class="modal__form-item" style="display:block">
19 19 Отправитель сообщения:
20   - <input type="hidden" id="_user_id" name="_user_id" class="input" placeholder="user_id" value="">
  20 + <input type="text" id="_user_id" name="_user_id" class="input" placeholder="user_id" value="">
21 21 Получатель сообщения:
22   - <input type="hidden" id="_to_user_id" name="_to_user_id" class="input" placeholder="to_user_id" value="">
  22 + <input type="text" id="_to_user_id" name="_to_user_id" class="input" placeholder="to_user_id" value="">
23 23 Вакансия:
24   - <input type="hidden" id="_vacancy" name="_vacancy" class="input" placeholder="vacancy" value="">
  24 + <input type="text" id="_vacancy" name="_vacancy" class="input" placeholder="vacancy" value="">
25 25 </div>
26 26 <div class="modal__form-item">
27 27 <input id="i1" type="text" name="title" class="input" placeholder="Тема" required>
resources/views/modals/send_message_noaut.blade.php
Diff comments   View file @ f8a3caf
1 1 <div id="question" class="modal modal_bg">
2 2 <div class="modal__body">
3 3 <div class="modal__title">Отправить сообщение не получится сейчас</div>
4   - <div class="modal__text">Вы должны быть авторизованы, чтобы отправить личное сообщение</div>
  4 + <div class="modal__text">Вы должны быть авторизованы, как соискатель, чтобы отправить личное сообщение</div>
5 5 <div class="modal__buttons">
6 6 <a data-fancybox data-src="#sign" data-options='{"touch":false,"autoFocus":false}' class="button">Войти</a>
7 7 <a data-fancybox data-src="#reg" data-options='{"touch":false,"autoFocus":false}' class="button button_light">Зарегистрироваться</a>
resources/views/modals/send_message_noaut2.blade.php
Diff comments   View file @ f8a3caf
1 1 <div id="question2" class="modal modal_bg">
2 2 <div class="modal__body">
3 3 <div class="modal__title">Чтобы искать сотрудников для своей компании</div>
4   - <div class="modal__text">Вы должны быть авторизованы, чтобы посмотреть списки работников</div>
  4 + <div class="modal__text">Вы должны быть авторизованы, как работодатель, чтобы посмотреть списки работников</div>
5 5 <div class="modal__buttons">
6 6 <a data-fancybox data-src="#sign" data-options='{"touch":false,"autoFocus":false}' class="button">Войти</a>
7 7 <a data-fancybox data-src="#reg" data-options='{"touch":false,"autoFocus":false}' class="button button_light">Зарегистрироваться</a>
resources/views/modals/send_worker.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -19,7 +19,7 @@
19 19  
20 20 });
21 21 </script>
22   -<div id="send" class="modal">
  22 +<div id="send3" class="modal">
23 23 <div class="modal__body">
24 24 <div class="modal__title">Отправить сообщение работодателю</div>
25 25 <div class="modal__text">Если вы готовы владеете компитентыми навыками, напишите данному работодателю письмо</div>
resources/views/modals/send_worker_new.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -10,17 +10,80 @@
10 10  
11 11 $(document).on('change', '#btn_send_file', function() {
12 12  
13   - var send_name = $('#send_name');
14   - var send_name_val = send_name.val();
15   - var send_name_file = $('#send_name_file');
  13 + var send_name = $('#send_name');
  14 + var send_name_val = send_name.val();
  15 + var send_name_file = $('#send_name_file');
16 16  
17   - console.log(send_name_val);
18   - send_name_file.html(send_name_val);
  17 + console.log(send_name_val);
  18 + send_name_file.html(send_name_val);
19 19  
20 20 });
21 21 </script>
22 22 <div id="send" class="modal">
23 23 <div class="modal__body">
24   - <div class="modal__title">fghfghfghfgh</div>
  24 + <div class="modal__title">Отправить сообщение работодателю</div>
  25 + <div class="modal__text">Если вы готовы владеете компитентыми навыками, напишите данному работодателю письмо</div>
  26 + <form class="modal__form" id="form_worker" name="form_worker" enctype="multipart/form-data" action="{{ route('worker.new_message') }}" method="POST">
  27 + @csrf
  28 + <div class="modal__form-item">
  29 + Отправитель сообщения:
  30 + <input type="text" id="send_user_id" name="send_user_id" class="input" placeholder="user_id" value="">
  31 + Получатель сообщения:
  32 + <input type="text" id="send_to_user_id" name="send_to_user_id" class="input" placeholder="to_user_id" value="">
  33 + Вакансия:
  34 + <input type="text" id="send_vacancy" name="send_vacancy" class="input" placeholder="vacancy" value="">
  35 + </div>
  36 + <div class="modal__form-item send_title_div error_">
  37 + <input id="send_title" name="send_title" type="text" class="input" placeholder="Тема" required>
  38 + <label for="title">Не заполнено поле</label>
  39 + </div>
  40 + <div class="modal__form-item send_title_div error_">
  41 + <select class="js-select2" name="send_job_title_id" id="send_job_title_id">
  42 + @if ($jobs->count())
  43 + @foreach($jobs as $j)
  44 + <option value="{{ $j->id }}">{{ $j->name }} ({{ $j->id }})</option>
  45 + @endforeach
  46 + @endif
  47 + </select>
  48 + <label for="title">Не заполнено поле</label>
  49 + </div>
  50 + <div class="modal__form-item send_text_div">
  51 + <textarea id="i2" class="textarea" id="send_text" name="send_text" placeholder="Напишите текст с предложением о работе" required></textarea>
  52 + <label for="i2">Не заполнено поле</label>
  53 + </div>
  54 + <div class="modal__form-item">
  55 + <div class="file">
  56 + <label class="file__input" id="btn_send_file" name="btn_send_file">
  57 + <input type="file" name="send_file" id="send_name">
  58 + <span class="button button_light">
  59 + <svg>
  60 + <use xlink:href="{{ asset('images/sprite.svg#share') }}"></use>
  61 + </svg>
  62 + Прикрепить файл-документ
  63 + </span>
  64 + </label>
  65 +
  66 + <div class="file__list" id="div_file" name="div_file">
  67 + <div class="file__list-item">
  68 + <div class="file__list-item-left">
  69 + <svg>
  70 + <use xlink:href="{{ asset('images/sprite.svg#clip') }}"></use>
  71 + </svg>
  72 + <span id="send_name_file" name="send_name_file"></span>
  73 + </div>
  74 + <button type="button" class="file__list-item-right js-parent-remove">
  75 + <svg>
  76 + <use xlink:href="{{ asset('images/sprite.svg#cross-bold') }}"></use>
  77 + </svg>
  78 + </button>
  79 + </div>
  80 + </div>
  81 + </div>
  82 + </div>
  83 + <div class="modal__form-item">
  84 + <button type="submit" id="submit_form_worker" name="submit_form_worker" class="button">Отправить</button>
  85 + </div>
  86 + </form>
25 87 </div>
26 88 </div>
  89 +
resources/views/resume.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -331,11 +331,28 @@
331 331 <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use>
332 332 </svg>
333 333 </button>
334   - <button type="button" class="chat js-toggle js_it_button" data-fancybox data-src="#send2" data-vacancy="0" data-uid="{{ $idiot}}" data-tuid="{{ $res->id }}" data-options='{"touch":false,"autoFocus":false}'>
335   - <svg>
336   - <use xlink:href="{{ asset('images/sprite.svg#chat') }}"></use>
337   - </svg>
338   - </button>
  334 + @guest
  335 + <button type="button" data-fancybox data-src="#question" data-options='{"touch":false,"autoFocus":false}'
  336 + class="chat js-toggle js_it_button">
  337 + <svg>
  338 + <use xlink:href="{{ asset('images/sprite.svg#chat') }}"></use>
  339 + </svg>
  340 + </button>
  341 + @else
  342 + @if (App\Classes\StatusUser::Status()==0)
  343 + <button type="button" class="chat js-toggle js_it_button" data-fancybox data-src="#send2" data-vacancy="0" data-uid="{{ $idiot}}" data-tuid="{{ $res->users->id }}" data-options='{"touch":false,"autoFocus":false}'>
  344 + <svg>
  345 + <use xlink:href="{{ asset('images/sprite.svg#chat') }}"></use>
  346 + </svg>
  347 + </button>
  348 + @else
  349 + <button type="button" data-fancybox data-src="#question2" data-options='{"touch":false,"autoFocus":false}'
  350 + class="chat js-toggle js_it_button">
  351 + <svg>
  352 + <use xlink:href="{{ asset('images/sprite.svg#chat') }}"></use>
  353 + </svg>
  354 + </button> @endif
  355 + @endif
339 356 </div>
340 357 <div class="main__resume-base-body-item-wrapper">
341 358 <img src="@isset ($res->photo) {{ asset(Storage::url($res->photo)) }} @else {{ asset('images/default_man.jpg')}} @endif" alt="" class="main__resume-base-body-item-photo">
resources/views/vacance-item.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -23,6 +23,26 @@
23 23 vacancy.val(code_vacancy);
24 24 });
25 25 </script>
  26 + <script>
  27 + $(document).on('click', '.js_send_for_emp', function() {
  28 + var this_ = $(this);
  29 + var code_user_id = this_.attr('data-uid');
  30 + var code_to_user_id = this_.attr('data-tuid');
  31 + var code_vacancy = this_.attr('data-vacancy');
  32 + var user_id = $('#send_user_id');
  33 + var to_user_id = $('#send_to_user_id');
  34 + var vacancy = $('#send_vacancy');
  35 +
  36 + console.log('code_to_user_id='+code_to_user_id);
  37 + console.log('code_user_id='+code_user_id);
  38 + console.log('code_vacancy='+code_vacancy);
  39 + console.log('Клик на кнопке...');
  40 +
  41 + user_id.val(code_user_id);
  42 + to_user_id.val(code_to_user_id);
  43 + vacancy.val(code_vacancy);
  44 + });
  45 + </script>
26 46 @include('js.favorite-vacancy-45')
27 47 @endsection
28 48  
... ... @@ -143,7 +163,7 @@
143 163 @else
144 164 @if (App\Classes\StatusUser::Status()==1)
145 165 <button type="button" data-fancybox data-src="#send" data-vacancy="{{ $Q->id }}" data-uid="{{ $uid }}" data-tuid="{{ $Q->employer->user_id }}" data-options='{"touch":false,"autoFocus":false}'
146   - class="button main__employer-page-two-item-button js_send_it_button">Откликнуться</button>
  166 + class="button main__employer-page-two-item-button js_send_for_emp">Откликнуться</button>
147 167 @else
148 168 <button type="button" data-fancybox data-src="#send2" data-vacancy="{{ $Q->id }}" data-uid="{{ $uid }}" data-tuid="{{ $Q->employer->user_id }}" data-options='{"touch":false,"autoFocus":false}'
149 169 class="button main__employer-page-two-item-button js_send_it_button">Откликнуться</button>
resources/views/worker.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -61,7 +61,7 @@
61 61 <li><b>@if (isset($Query[0]->users)) {{ $Query[0]->users->surname." ".$Query[0]->users->name_man." ".$Query[0]->users->surname2 }} @else Неизвестно @endif</b></li>
62 62 </ul>
63 63 <div class="thing__profile">
64   - <img src="@if (isset($Query[0]->photo)) {{ asset(Storage::url($Query[0]->photo)) }} @elseif(!empty($Query[0]->users->file)) {{ asset(Storage::url($Query[0]->users->file)) }} @else {{ asset('images/default_man.jpg') }} @endif" alt="" class="main__resume-base-body-item-photo">
  64 + <img src="@if (isset($Query[0]->photo)) {{ asset(Storage::url($Query[0]->photo)) }} @else {{ asset('images/default_man.jpg') }} @endif" alt="" class="main__resume-base-body-item-photo">
65 65 <div class="thing__profile-body">
66 66 <h1 class="thing__title">@if (isset($Query[0]->users)) {{ $Query[0]->users->surname." ".$Query[0]->users->name_man." ".$Query[0]->users->surname2 }} @else Неизвестно @endif</h1>
67 67 <p class="thing__text">Сложно сказать, почему ключевые особенности структуры проекта рассмотрены
resources/views/workers/messages.blade.php
Diff comments   View file @ f8a3caf
... ... @@ -32,7 +32,7 @@
32 32 <a href="{{ route('worker.messages', ['type_message' => 'output']) }}" class="button button_light @if ($type_message == 'output') active @endif">Исходящие ({{ $count_output }})</a>
33 33 </div>
34 34 </div>
35   - <div class="cabinet__filters-item">
  35 + <!--<div class="cabinet__filters-item">
36 36 <div class="select">
37 37 <select class="js-select2" id="sort_ajax" name="sort_ajax">
38 38 <option value="default">Сортировка (по умолчанию)</option>
... ... @@ -42,7 +42,7 @@
42 42 <option value="created_at (desc)">По дате (убывание)</option>
43 43 </select>
44 44 </div>
45   - </div>
  45 + </div>-->
46 46 </div>
47 47  
48 48 @if ($messages->count())