Commit 92b3de35e986fd30810d5b7baa772e7d69a2578a
1 parent
dfdf584b41
Exists in
master
Задача 45 + фиксы
Showing 5 changed files with 202 additions and 91 deletions Side-by-side Diff
app/Http/Controllers/WorkerController.php
| ... | ... | @@ -250,12 +250,19 @@ class WorkerController extends Controller |
| 250 | 250 | ->with('place_worker')->with('sertificate')->with('prev_company') |
| 251 | 251 | ->with('infobloks'); |
| 252 | 252 | $Query = $Query->where('id', '=', $worker->id); |
| 253 | - $Query = $Query->get()->toArray(); | |
| 253 | + $Query = $Query->get(); | |
| 254 | 254 | |
| 255 | 255 | view()->share('Query',$Query); |
| 256 | 256 | |
| 257 | + $status_work = $this->status_work; | |
| 258 | + $infoblocks = infobloks::query()->get(); | |
| 259 | + | |
| 257 | 260 | |
| 258 | - $pdf = PDF::loadView('layout.pdf', $Query); //->setPaper('a4', 'landscape'); | |
| 261 | + $pdf = PDF::loadView('layout.pdf', [ | |
| 262 | + 'Query' => $Query, | |
| 263 | + 'status_work' => $status_work, | |
| 264 | + 'infoblocks' => $infoblocks | |
| 265 | + ])->setPaper('a4', 'landscape'); | |
| 259 | 266 | |
| 260 | 267 | return $pdf->stream(); |
| 261 | 268 | } |
public/css/style_may2024.css
resources/views/education/show.blade.php
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | @foreach($levels_education_programs as $level_name => $education_programs) |
| 93 | 93 | <li class="accordion-item"> |
| 94 | 94 | <h3 class="accordion-thumb">{{$level_name}}</h3> |
| 95 | - <div class="accordion-panel"> | |
| 95 | + <div class="accordion-panel pb-20"> | |
| 96 | 96 | <div> |
| 97 | 97 | <ul class="accordion-sub"> |
| 98 | 98 | @foreach($education_programs as $education_program) |
resources/views/layout/pdf.blade.php
| 1 | 1 | <!DOCTYPE html> |
| 2 | 2 | <html lang="ru"> |
| 3 | 3 | |
| 4 | +@php | |
| 5 | + $worker = $Query[0]; | |
| 6 | +@endphp | |
| 7 | + | |
| 4 | 8 | <head> |
| 5 | 9 | <meta charset="utf-8"> |
| 6 | 10 | <title>Резюме соискателя</title> |
| 7 | 11 | <meta name="viewport" content="width=device-width,initial-scale=1"> |
| 8 | 12 | <meta name="theme-color" content="#377D87"> |
| 9 | - <!--<link rel="stylesheet" href=" asset('css/style.css') }}">--> | |
| 10 | 13 | <style> |
| 11 | 14 | body { |
| 12 | 15 | font-family:'DejaVu Sans',sans-serif; |
| ... | ... | @@ -200,8 +203,6 @@ |
| 200 | 203 | <div class="main__resume-profile"> |
| 201 | 204 | <div class="main__content"> |
| 202 | 205 | <div class="main__spoiler"> |
| 203 | - <!-- <button type="button" class="main__spoiler-toper js-toggle active">Основная | |
| 204 | - информация</button> --> | |
| 205 | 206 | <div class="main__spoiler-body"> |
| 206 | 207 | <table class="main__table"> |
| 207 | 208 | <thead> |
| ... | ... | @@ -211,67 +212,106 @@ |
| 211 | 212 | </thead> |
| 212 | 213 | <tbody> |
| 213 | 214 | <tr> |
| 214 | - <td>Имя:</td> | |
| 215 | - <td><b>{{ $Query[0]['users']['name_man'] }}</b></td> | |
| 215 | + <td><b>Статус:</b></td> | |
| 216 | + <td>{{ $status_work[$worker->status_work] }}</td> | |
| 217 | + </tr> | |
| 218 | + <tr> | |
| 219 | + <td><b>ФИО:</b></td> | |
| 220 | + <td>{{ $worker->users->surname." ".$worker->users->name_man." ".$worker->users->surname2 }}</td> | |
| 221 | + </tr> | |
| 222 | + <tr> | |
| 223 | + <td><b>Возраст:</b></td> | |
| 224 | + <td>{{ $worker->old_year ?? '-' }}</td> | |
| 216 | 225 | </tr> |
| 217 | 226 | <tr> |
| 218 | - <td>Должность:</td> | |
| 227 | + <td><b>Желаемые вакансии:</b></td> | |
| 219 | 228 | <td> |
| 220 | - @foreach ($Query[0]['job_titles'] as $it) | |
| 221 | - <b>{{ $it['name'] }}</b><br> | |
| 229 | + @if ($Query[0]->job_titles->count()) | |
| 230 | + @foreach ($Query[0]->job_titles as $it) | |
| 231 | + @if ($it->is_remove == 0) | |
| 232 | + {{ $it->name }} / | |
| 233 | + @endif | |
| 222 | 234 | @endforeach |
| 235 | + @else | |
| 236 | + - | |
| 237 | + @endif | |
| 223 | 238 | </td> |
| 224 | 239 | </tr> |
| 225 | 240 | <tr> |
| 226 | - <td>Телефон:</td> | |
| 227 | - <td><b><a>{{ $Query[0]['telephone'] }}</a></b> | |
| 228 | - <b><a>{{ $Query[0]['telephone2'] }}</a></b> | |
| 229 | - </td> | |
| 241 | + <td><b>Пожелания по З/П:</b></td> | |
| 242 | + <td>{{ $worker->salary_expectations ?? '-' }}</td> | |
| 230 | 243 | </tr> |
| 231 | 244 | <tr> |
| 232 | - <td>E-mail:</td> | |
| 233 | - <td><b><a>{{ $Query[0]['email'] }}</a></b></td> | |
| 245 | + <td><b>Опыт работы:</b></td> | |
| 246 | + <td>{{ $worker->experience ?? '-' }}</td> | |
| 234 | 247 | </tr> |
| 235 | 248 | <tr> |
| 236 | - <td>Возраст:</td> | |
| 237 | - <td><b>{{ $Query[0]['old_year'] }}</b></td> | |
| 249 | + <td><b>Уровень английского:</b></td> | |
| 250 | + <td>{{ $worker->english_level ?? '-' }}</td> | |
| 238 | 251 | </tr> |
| 239 | 252 | <tr> |
| 240 | - <td>Статус:</td> | |
| 241 | - <td> | |
| 242 | - @php $code = $Query[0]['status_work']; @endphp | |
| 243 | - <b>@if ($code == 0) Ищу работу @elseif($code == 1) Не указано @else Не ищу работу @endif</b></td> | |
| 253 | + <td><b>Дата готовности к посадке:</b></td> | |
| 254 | + <td>{{ $worker->ready_boart_date ?? '-' }}</td> | |
| 255 | + </tr> | |
| 256 | + <tr> | |
| 257 | + <td><b>Предпочтение по типу судна:</b></td> | |
| 258 | + <td>{{ $worker->boart_type_preference ?? '-' }}</td> | |
| 259 | + </tr> | |
| 260 | + <tr> | |
| 261 | + <td><b>Наличие визы:</b></td> | |
| 262 | + <td>{{ $worker->visa_available ?? '-' }}</td> | |
| 263 | + </tr> | |
| 264 | + <tr> | |
| 265 | + <td><b>Наличие танкерных документов:</b></td> | |
| 266 | + <td>{{ $worker->tanker_documents_available ?? '-' }}</td> | |
| 267 | + </tr> | |
| 268 | + <tr> | |
| 269 | + <td><b>Наличие подтверждения для работы на ВВП:</b></td> | |
| 270 | + <td>{{ $worker->confirmation_work_for_vvp ?? '-' }}</td> | |
| 244 | 271 | </tr> |
| 245 | 272 | <tr> |
| 246 | - <td>Город проживания:</td> | |
| 247 | - <td><b>{{ $Query[0]['city'] }}</b></td> | |
| 273 | + <td><b>Наличие военного билета / приписного свидетельства:</b></td> | |
| 274 | + <td>{{ $worker->military_id_available ?? '-' }}</td> | |
| 248 | 275 | </tr> |
| 249 | 276 | <tr> |
| 250 | - <td>Уровень английского:</td> | |
| 251 | - <td><b>{{ $Query[0]['en_is'] }}</b></td> | |
| 277 | + <td><b>Город проживания:</b></td> | |
| 278 | + <td>{{ $worker->city ?? '-' }}</td> | |
| 252 | 279 | </tr> |
| 253 | 280 | <tr> |
| 254 | - <td>Опыт работы:</td> | |
| 255 | - <td><b>{{ $Query[0]['old_year'] }}</b></td> | |
| 281 | + <td><b>Телефон:</b></td> | |
| 282 | + <td>{{ $worker->telephone ?? '-' }}</td> | |
| 283 | + </tr> | |
| 284 | + <tr> | |
| 285 | + <td><b>E-mail:</b></td> | |
| 286 | + <td>{{ $worker->email ?? '-' }}</td> | |
| 287 | + </tr> | |
| 288 | + <tr> | |
| 289 | + <td><b>Контакты родственников:</b></td> | |
| 290 | + <td>{{ $worker->telephone2 ?? '-' }}</td> | |
| 256 | 291 | </tr> |
| 257 | 292 | </tbody> |
| 258 | 293 | </table> |
| 259 | 294 | </div> |
| 260 | 295 | </div> |
| 296 | + | |
| 261 | 297 | <div class="main__spoiler"> |
| 262 | 298 | <div class="main__spoiler-body"> |
| 263 | 299 | <table class="main__table"> |
| 264 | 300 | <thead> |
| 265 | - <tr> | |
| 266 | - <th colspan="2">Сертификаты / документы</th> | |
| 267 | - </tr> | |
| 301 | + <tr> | |
| 302 | + <th colspan="2">Сертификаты / документы</th> | |
| 303 | + </tr> | |
| 268 | 304 | </thead> |
| 269 | 305 | <tbody> |
| 270 | - @if (count($Query[0]['sertificate'])) | |
| 271 | - @foreach($Query[0]['sertificate'] as $it) | |
| 306 | + <tr> | |
| 307 | + <td><b>Название сертификата:</b></td> | |
| 308 | + <td><b>Действителен до:</b></td> | |
| 309 | + </tr> | |
| 310 | + @if (isset($Query[0]->sertificate) && $Query[0]->sertificate->count()) | |
| 311 | + @foreach($Query[0]->sertificate as $it) | |
| 272 | 312 | <tr> |
| 273 | - <td>{{ $it['name']." ".$it['education'] }}</td> | |
| 274 | - <td><a>{{ date('d.m.Y H:i:s', strtotime($it['date_begin']))."-".date('d.m.Y H:i:s', strtotime($it['end_begin'])) }}</a></td> | |
| 313 | + <td>{{ $it->name }}</td> | |
| 314 | + <td>{{ date('d.m.Y', strtotime($it->end_begin)) }}</td> | |
| 275 | 315 | </tr> |
| 276 | 316 | @endforeach |
| 277 | 317 | @else |
| ... | ... | @@ -284,77 +324,138 @@ |
| 284 | 324 | </table> |
| 285 | 325 | </div> |
| 286 | 326 | </div> |
| 327 | + | |
| 287 | 328 | <div class="main__spoiler"> |
| 288 | 329 | <div class="main__spoiler-body"> |
| 289 | - <table class="main__table main__table_three"> | |
| 330 | + <table class="main__table"> | |
| 290 | 331 | <thead> |
| 291 | 332 | <tr> |
| 292 | - <th colspan="3">Опыт работы</th> | |
| 333 | + <th colspan="2">Дополнительные документы</th> | |
| 293 | 334 | </tr> |
| 294 | 335 | </thead> |
| 295 | 336 | <tbody> |
| 296 | - @if (count($Query[0]['place_worker']) > 0) | |
| 297 | - @foreach($Query[0]['place_worker'] as $it) | |
| 337 | + @if ($infoblocks->count()) | |
| 338 | + @foreach ($infoblocks as $info) | |
| 339 | + @php $finder = false; @endphp | |
| 340 | + @if (isset($Query[0]->infobloks)) | |
| 341 | + @if ($Query[0]->infobloks->count()) | |
| 342 | + | |
| 343 | + @foreach($Query[0]->infobloks as $it) | |
| 344 | + @if ($info->id == $it->id) | |
| 345 | + <tr> | |
| 346 | + <td><b>{{ $it->name }}</b></td> | |
| 347 | + <td> | |
| 348 | + @if ($it->model_dop_info[0]->status == 0) Не указано | |
| 349 | + @elseif($it->model_dop_info[0]->status==1) В наличии | |
| 350 | + @else Отсутствует | |
| 351 | + @endif | |
| 352 | + </td> | |
| 353 | + </tr> | |
| 354 | + @php $finder = true; @endphp | |
| 355 | + @endif | |
| 356 | + @endforeach | |
| 357 | + @endif | |
| 358 | + @endif | |
| 359 | + @if (!$finder) | |
| 298 | 360 | <tr> |
| 299 | - <td>{{ $it['begin_work']." - ".$it['end_work'] }} | |
| 300 | - </td> | |
| 301 | - <td><b>{{ $it['name_company'] }}</b> | |
| 302 | - </td> | |
| 303 | - <td><b>{{ $it['job_title'] }}</b> | |
| 304 | - Судно: {{ $it['teplohod'] }} | |
| 361 | + <td><b>{{ $info->name }}</b></td> | |
| 362 | + <td> | |
| 363 | + Не указано | |
| 305 | 364 | </td> |
| 306 | 365 | </tr> |
| 366 | + @endif | |
| 307 | 367 | @endforeach |
| 308 | 368 | @endif |
| 309 | 369 | </tbody> |
| 310 | 370 | </table> |
| 311 | 371 | </div> |
| 312 | 372 | </div> |
| 313 | - </div> | |
| 314 | - <div class="main__resume-profile-about"> | |
| 315 | - <h2 class="main__resume-profile-about-title">О себе</h2> | |
| 316 | - <p class="main__resume-profile-about-text">{{ $Query[0]['text'] }}</p> | |
| 317 | 373 | |
| 318 | - </div> | |
| 319 | - <div class="main__resume-profile-info"> | |
| 320 | - <h2 class="main__resume-profile-info-title">Данные о прошлых компаниях</h2> | |
| 321 | - <div class="main__resume-profile-info-body"> | |
| 322 | - @if ((isset($Query[0]['prev_company'])) && (count($Query[0]['prev_company']) > 0)) | |
| 323 | - @foreach ($Query[0]['prev_company'] as $it) | |
| 324 | - <div class="main__resume-profile-info-body-item"> | |
| 325 | - <h3 class="main__resume-profile-info-body-subtitle">{{ $it['name_company'] }}</h3> | |
| 326 | - <ul class="main__resume-profile-info-body-inner"> | |
| 327 | - <li> | |
| 328 | - <b>Руководитель</b> | |
| 329 | - <span>{{ $it['direct'] }}</span> | |
| 330 | - </li> | |
| 331 | - <li> | |
| 332 | - <b>Телефон того, кто может дать рекомендацию</b> | |
| 333 | - <span> | |
| 334 | - <a>{{ $it['telephone'] }}</a> | |
| 335 | - <a>{{ $it['telephone2'] }}</a> | |
| 336 | - </span> | |
| 337 | - </li> | |
| 338 | - </ul> | |
| 339 | - </div> | |
| 340 | - @endforeach | |
| 341 | - @else | |
| 342 | - <div class="main__resume-profile-info-body-item"> | |
| 343 | - <h3 class="main__resume-profile-info-body-subtitle">Не указано</h3> | |
| 344 | - <ul class="main__resume-profile-info-body-inner"> | |
| 345 | - <li> | |
| 346 | - <b>Руководитель</b> | |
| 347 | - <span>Нет сведений</span> | |
| 348 | - </li> | |
| 349 | - <li> | |
| 350 | - <b>Телефон того, кто может дать рекомендацию</b> | |
| 351 | - <span> | |
| 352 | - <a>Нет сведений</a> | |
| 353 | - </span> | |
| 354 | - </li> | |
| 355 | - </ul> | |
| 356 | - </div> | |
| 357 | - @endif | |
| 374 | + <div class="main__spoiler"> | |
| 375 | + <div class="main__spoiler-body"> | |
| 376 | + <table class="main__table main__table_three"> | |
| 377 | + <thead> | |
| 378 | + <tr> | |
| 379 | + <th colspan="9">Опыт работы</th> | |
| 380 | + </tr> | |
| 381 | + </thead> | |
| 382 | + <tbody> | |
| 383 | + <tr> | |
| 384 | + <td><b>Должность:</b></td> | |
| 385 | + <td><b>Название т/х:</b></td> | |
| 386 | + <td><b>Тип судна:</b></td> | |
| 387 | + <td><b>Марка ГД:</b></td> | |
| 388 | + <td><b>Мощность ГД (кВТ):</b></td> | |
| 389 | + <td><b>Водоизмещение (DWT):</b></td> | |
| 390 | + <td><b>Название компании:</b></td> | |
| 391 | + <td><b>Начало контракта:</b></td> | |
| 392 | + <td><b>Окончание контракта:</b></td> | |
| 393 | + </tr> | |
| 394 | + @if (count($Query[0]->place_worker) > 0) | |
| 395 | + @foreach($Query[0]->place_worker as $it) | |
| 396 | + <tr> | |
| 397 | + <td>{{ $it->job_title }}</td> | |
| 398 | + <td>{{ $it->teplohod }}</td> | |
| 399 | + <td>{{ $it->GWT }}</td> | |
| 400 | + <td>{{ $it->Marka_GD }}</td> | |
| 401 | + <td>{{ $it->KBT }}</td> | |
| 402 | + <td>{{ $it->GRT }}</td> | |
| 403 | + <td>{{ $it->name_company }}</td> | |
| 404 | + <td>{{ date('d.m.Y', strtotime($it->begin_work)) }}</td> | |
| 405 | + <td>{{ date('d.m.Y', strtotime($it->end_work)) }}</td> | |
| 406 | + </tr> | |
| 407 | + @endforeach | |
| 408 | + @else | |
| 409 | + <td>-</td> | |
| 410 | + <td>-</td> | |
| 411 | + <td>-</td> | |
| 412 | + <td>-</td> | |
| 413 | + <td>-</td> | |
| 414 | + <td>-</td> | |
| 415 | + <td>-</td> | |
| 416 | + <td>-</td> | |
| 417 | + <td>-</td> | |
| 418 | + @endif | |
| 419 | + </tbody> | |
| 420 | + </table> | |
| 421 | + </div> | |
| 422 | + </div> | |
| 423 | + | |
| 424 | + <div class="main__spoiler"> | |
| 425 | + <div class="main__spoiler-body"> | |
| 426 | + <table class="main__table main__table_three"> | |
| 427 | + <thead> | |
| 428 | + <tr> | |
| 429 | + <th colspan="4">Данные о прошлых компаниях</th> | |
| 430 | + </tr> | |
| 431 | + </thead> | |
| 432 | + <tbody> | |
| 433 | + <tr> | |
| 434 | + <td><b>Название компании:</b></td> | |
| 435 | + <td><b>ФИО сотрудника:</b></td> | |
| 436 | + <td><b>Должность сотрудника:</b></td> | |
| 437 | + <td><b>Телефон сотрудника:</b></td> | |
| 438 | + </tr> | |
| 439 | + @if ((isset($worker->prev_company)) && ($worker->prev_company->count())) | |
| 440 | + @foreach ($worker->prev_company as $prev_company) | |
| 441 | + <tr> | |
| 442 | + <td>{{ $prev_company->name_company }}</td> | |
| 443 | + <td>{{ $prev_company->direct }}</td> | |
| 444 | + <td>{{ $prev_company->telephone }}</td> | |
| 445 | + <td>{{ $prev_company->telephone2 }}</td> | |
| 446 | + </tr> | |
| 447 | + @endforeach | |
| 448 | + @else | |
| 449 | + <tr> | |
| 450 | + <td>-</td> | |
| 451 | + <td>-</td> | |
| 452 | + <td>-</td> | |
| 453 | + <td>-</td> | |
| 454 | + </tr> | |
| 455 | + @endif | |
| 456 | + </tbody> | |
| 457 | + </table> | |
| 458 | + </div> | |
| 358 | 459 | </div> |
| 359 | 460 | </div> |
| 360 | 461 | </div> |
resources/views/worker.blade.php
| ... | ... | @@ -95,7 +95,7 @@ |
| 95 | 95 | </svg> |
| 96 | 96 | Написать |
| 97 | 97 | </div> |
| 98 | - <a class="button" href="{{ route('resume_download', ['worker' => $Query[0]->id]) }}"> | |
| 98 | + <a class="button" href="{{ route('resume_download', ['worker' => $Query[0]->id]) }}" target="_blank"> | |
| 99 | 99 | Скачать резюме |
| 100 | 100 | <svg> |
| 101 | 101 | <use xlink:href="{{ asset('images/sprite.svg#download') }}"></use> |