Commit f9f63a2c48c7d95ac964c386ada77ee53e732efb
Exists in
master
Коммит понедельника
Showing 22 changed files Side-by-side Diff
- app/Http/Controllers/Ad_jobsController.php
- app/Http/Controllers/Admin/EmployersController.php
- app/Http/Controllers/Admin/JobTitlesController.php
- app/Http/Controllers/Admin/UsersController.php
- app/Http/Controllers/EmployerController.php
- app/Http/Controllers/MainController.php
- app/Http/Controllers/WorkerController.php
- app/Http/Requests/DocumentsRequest.php
- app/Http/Requests/PrevCompanyRequest.php
- app/Providers/MyServiceProvider.php
- resources/views/admin/employer/index.blade.php
- resources/views/ajax/resume_1.blade.php
- resources/views/employers/add_ad_jobs.blade.php
- resources/views/employers/ajax/list_vacancy.blade.php
- resources/views/employers/edit_ad_jobs.blade.php
- resources/views/employers/list_vacancy.blade.php
- resources/views/js/favorite-worker.blade.php
- resources/views/layout/frontend.blade.php
- resources/views/vacance-item.blade.php
- resources/views/worker.blade.php
- resources/views/workers/docs.blade.php
- resources/views/workers/prev_company_form.blade.php
app/Http/Controllers/Ad_jobsController.php
| ... | ... | @@ -44,11 +44,25 @@ class Ad_jobsController extends Controller |
| 44 | 44 | $id = Auth()->user()->id; |
| 45 | 45 | |
| 46 | 46 | $Positions = Category::query()->active()->get(); |
| 47 | - if ($Positions->count()) { | |
| 48 | - $jobs = Job_title::query()->OrderBy('name')->Notbdif()->where('position_id', $Positions[0]->id)->get(); | |
| 47 | + /*if ($Positions->count()) { | |
| 48 | + $jobs = Job_title::query()->orderByDesc('sort')->OrderBy('name')-> | |
| 49 | + where('is_remove', '=', '0')-> | |
| 50 | + where('is_bd', '=', '0')-> | |
| 51 | + where('position_id', $Positions[0]->id)-> | |
| 52 | + get(); | |
| 49 | 53 | } else { |
| 50 | - $jobs = Job_title::query()->OrderBy('name')->Notbdif()->where('position_id', 0)->get(); | |
| 54 | + $jobs = Job_title::query()->orderByDesc('sort')->OrderBy('name')-> | |
| 55 | + where('is_remove', '=', '0')-> | |
| 56 | + where('is_bd', '=', '0')-> | |
| 57 | + where('position_id', 0)-> | |
| 58 | + get(); | |
| 51 | 59 | } |
| 60 | + */ | |
| 61 | + $jobs = Job_title::query()->orderByDesc('sort')->OrderBy('name')-> | |
| 62 | + where('is_remove', '=', '0')-> | |
| 63 | + where('is_bd', '=', '0')-> | |
| 64 | + get(); | |
| 65 | + | |
| 52 | 66 | $categories = Category::query()->get(); |
| 53 | 67 | $Employer = Employer::query()->with('users')->with('ads')->with('flots')-> |
| 54 | 68 | where('user_id', $id)->first(); |
| ... | ... | @@ -73,11 +87,25 @@ class Ad_jobsController extends Controller |
| 73 | 87 | $job_title_id = ''; |
| 74 | 88 | |
| 75 | 89 | $Positions = Category::query()->active()->get(); |
| 76 | - if ($Positions->count()) { | |
| 77 | - $jobs123 = Job_title::query()->OrderBy('name')->where('position_id', $ad_job->job_title->position_id )->get(); | |
| 90 | + /*if ($Positions->count()) { | |
| 91 | + $jobs123 = Job_title::query()-> | |
| 92 | + orderByDesc('sort')->OrderBy('name')-> | |
| 93 | + where('is_remove', '=', '0')-> | |
| 94 | + where('is_bd', '=', '0')-> | |
| 95 | + where('position_id', $ad_job->job_title->position_id )->get(); | |
| 78 | 96 | } else { |
| 79 | - $jobs123 = Job_title::query()->OrderBy('name')->where('position_id', 0)->get(); | |
| 80 | - } | |
| 97 | + $jobs123 = Job_title::query()-> | |
| 98 | + orderByDesc('sort')->OrderBy('name')-> | |
| 99 | + where('is_remove', '=', '0')-> | |
| 100 | + where('is_bd', '=', '0')-> | |
| 101 | + where('position_id', 0)->get(); | |
| 102 | + }*/ | |
| 103 | + | |
| 104 | + $jobs123 = Job_title::query()-> | |
| 105 | + orderByDesc('sort')->OrderBy('name')-> | |
| 106 | + where('is_remove', '=', '0')-> | |
| 107 | + where('is_bd', '=', '0')-> | |
| 108 | + get(); | |
| 81 | 109 | |
| 82 | 110 | $Employer = Employer::query()->with('users')->with('ads')->with('flots')-> |
| 83 | 111 | where('user_id', $id)->first(); |
app/Http/Controllers/Admin/EmployersController.php
| ... | ... | @@ -28,7 +28,7 @@ class EmployersController extends Controller |
| 28 | 28 | $user->update($request->all()); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - $users = User::with('employers')->select(['users.*','users.id as usr_id', 'emp.id as emp_id', 'emp.code as code_id', 'emp.logo as emp_logo', 'emp.*']) | |
| 31 | + $users = User::with('employers')->select(['users.*','users.id as usr_id', 'emp.id as emp_id', 'emp.code as code_id', 'emp.logo as emp_logo', 'emp.name_company as name_company', 'emp.*']) | |
| 32 | 32 | ->join('employers as emp','emp.user_id','users.id') |
| 33 | 33 | ->where('users.is_worker', '0')->Realuser(); //->Notadmin(); |
| 34 | 34 | $all_employer = $users->count(); |
app/Http/Controllers/Admin/JobTitlesController.php
| ... | ... | @@ -18,7 +18,8 @@ class JobTitlesController extends Controller |
| 18 | 18 | */ |
| 19 | 19 | public function index() |
| 20 | 20 | { |
| 21 | - $Jobs = Job_title::query()->where('is_remove', '=', '0')->orderBy('name')->paginate(15); | |
| 21 | + $Jobs = Job_title::query()->where('is_remove', '=', '0')-> | |
| 22 | + orderByDesc('sort')->orderBy('name')->paginate(15); | |
| 22 | 23 | return view('admin.job_titles.index', compact('Jobs')); |
| 23 | 24 | } |
| 24 | 25 |
app/Http/Controllers/Admin/UsersController.php
| ... | ... | @@ -94,7 +94,8 @@ class UsersController extends Controller |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | public function edit_bd(User $user) { |
| 97 | - $list_job_titles = Job_title::query()->active()->where('is_bd', '=' , '2')->orderBy('name', 'asc')->get(); | |
| 97 | + $list_job_titles = Job_title::query()->active()->where('is_bd', '=' , '2')-> | |
| 98 | + orderByDesc('sort')->orderBy('name', 'asc')->get(); | |
| 98 | 99 | return view('admin.users.edit', compact('user', 'list_job_titles')); |
| 99 | 100 | } |
| 100 | 101 |
app/Http/Controllers/EmployerController.php
| ... | ... | @@ -212,11 +212,18 @@ class EmployerController extends Controller |
| 212 | 212 | // Список вакансий |
| 213 | 213 | public function vacancy_list(Request $request) { |
| 214 | 214 | $id = Auth()->user()->id; |
| 215 | + | |
| 216 | + //dd($request->all()); | |
| 215 | 217 | $Employer = Employer::query()->where('user_id', $id)->first(); |
| 216 | 218 | $vacancy_list = Ad_employer::query()->with('jobs')-> |
| 217 | 219 | with('jobs_code')-> |
| 218 | 220 | where('employer_id', $Employer->id); |
| 219 | 221 | |
| 222 | + if (($request->has('search')) && (!empty($request->get('search')))) { | |
| 223 | + $search = $request->get('search'); | |
| 224 | + $vacancy_list = $vacancy_list->where('name', 'LIKE', "%$search%"); | |
| 225 | + } | |
| 226 | + | |
| 220 | 227 | if ($request->get('sort')) { |
| 221 | 228 | $sort = $request->get('sort'); |
| 222 | 229 | switch ($sort) { |
| ... | ... | @@ -740,7 +747,7 @@ class EmployerController extends Controller |
| 740 | 747 | // Рассылка сообщений |
| 741 | 748 | public function send_all_messages() { |
| 742 | 749 | $id = Auth()->user()->id; |
| 743 | - $sending = Employer::query()->where('id', '=', "$id")->first(); | |
| 750 | + $sending = Employer::query()->where('user_id', '=', "$id")->first(); | |
| 744 | 751 | if ($sending->sending_is) |
| 745 | 752 | return view('employers.send_all'); |
| 746 | 753 | else |
| ... | ... | @@ -802,7 +809,11 @@ class EmployerController extends Controller |
| 802 | 809 | // Избранные люди на корабль |
| 803 | 810 | public function selected_people(Request $request) { |
| 804 | 811 | $id = $request->get('id'); |
| 805 | - $favorite_people = Job_title::query()->Notbdif()->where('is_remove', '=', '0')->where('position_id', $id)->get(); | |
| 812 | + $favorite_people = Job_title::query()->orderByDesc('sort')->OrderBy('name')-> | |
| 813 | + where('is_remove', '=', '0')-> | |
| 814 | + where('is_bd', '=', '0')-> | |
| 815 | + where('position_id', $id)-> | |
| 816 | + get(); | |
| 806 | 817 | return view('favorite_people', compact('favorite_people')); |
| 807 | 818 | } |
| 808 | 819 | } |
app/Http/Controllers/MainController.php
| ... | ... | @@ -90,7 +90,11 @@ class MainController extends Controller |
| 90 | 90 | $Main_Job[$name_cat][] = $it_arr; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - $employers = employers_main::query()->with('employer')->orderBy('id')->limit(8)->get(); | |
| 93 | + $employers = employers_main::query()->with('employer')-> | |
| 94 | + whereHas('employer', function ($query) { | |
| 95 | + $query->where('status_hidden', '=', '0'); | |
| 96 | + })-> | |
| 97 | + orderBy('id')->limit(8)->get(); | |
| 94 | 98 | $vacancy = Ad_jobs::query()->with('job_title')->orderBy('position_ship')->get(); |
| 95 | 99 | return view('index', compact('news', 'Job_title', 'categories', 'employers', 'vacancy', 'Main_Job')); |
| 96 | 100 | } |
app/Http/Controllers/WorkerController.php
| ... | ... | @@ -96,7 +96,10 @@ class WorkerController extends Controller |
| 96 | 96 | }); |
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - $Job_title = Job_title::query()->get(); | |
| 99 | + $Job_title = Job_title::query()-> | |
| 100 | + where('is_remove', '=', '0')-> | |
| 101 | + where('is_bd', '=' , '1')-> | |
| 102 | + get(); | |
| 100 | 103 | |
| 101 | 104 | if ($request->get('sort')) { |
| 102 | 105 | $sort = $request->get('sort'); |
| ... | ... | @@ -169,7 +172,7 @@ class WorkerController extends Controller |
| 169 | 172 | |
| 170 | 173 | $get_date = date('Y.m'); |
| 171 | 174 | $c = Static_worker::query()->where('year_month', '=', $get_date) |
| 172 | - ->where('user_id', '=', $worker->id) | |
| 175 | + ->where('user_id', '=', $worker->user_id) | |
| 173 | 176 | ->get(); |
| 174 | 177 | |
| 175 | 178 | if ($c->count() > 0) { |
| ... | ... | @@ -181,7 +184,7 @@ class WorkerController extends Controller |
| 181 | 184 | $crt->lookin = 1; |
| 182 | 185 | $crt->year_month = $get_date; |
| 183 | 186 | $crt->user_id = $worker->user_id; |
| 184 | - $crt->save(); | |
| 187 | + $status = $crt->save(); | |
| 185 | 188 | } |
| 186 | 189 | $stat = Static_worker::query()->where('year_month', '=', $get_date) |
| 187 | 190 | ->where('user_id', '=', $worker->id) |
app/Http/Requests/DocumentsRequest.php
| ... | ... | @@ -27,12 +27,20 @@ class DocumentsRequest extends FormRequest |
| 27 | 27 | 'job_title' => ['required', 'string', 'max:255'], |
| 28 | 28 | 'teplohod' => ['required', 'string', 'max:255'], |
| 29 | 29 | 'name_company' => ['required', 'string', 'max:255'], |
| 30 | + 'GWT' => ['required', 'string', 'max:255'], | |
| 31 | + 'GRT' => ['required', 'string', 'max:255'], | |
| 30 | 32 | ]; |
| 31 | 33 | } |
| 32 | 34 | |
| 33 | 35 | public function messages() { |
| 34 | 36 | return [ |
| 35 | - 'required' => 'Укажите обязательное поле «:attribute»', | |
| 37 | + 'job_title.required' => 'Укажите обязательное поле "Должность"', | |
| 38 | + 'teplohod.required' => 'Укажите обязательное поле "Название т/х"', | |
| 39 | + 'name_company.required' => 'Укажите обязательное поле "Название компании"', | |
| 40 | + 'GWT.required' => 'Укажите обязательное поле "Тип судна"', | |
| 41 | + 'GRT.required' => 'Укажите обязательное поле "Водоизмещение"', | |
| 42 | + | |
| 43 | + //'required' => 'Укажите обязательное поле «:attribute»', | |
| 36 | 44 | 'min' => [ |
| 37 | 45 | 'string' => 'Поле «:attribute» должно быть не меньше :min символов', |
| 38 | 46 | 'integer' => 'Поле «:attribute» должно быть :min или больше', |
app/Http/Requests/PrevCompanyRequest.php
| ... | ... | @@ -27,13 +27,11 @@ class PrevCompanyRequest extends FormRequest |
| 27 | 27 | 'name_company' => [ |
| 28 | 28 | 'required', |
| 29 | 29 | 'string', |
| 30 | - 'min:3', | |
| 31 | 30 | 'max:255', |
| 32 | 31 | ], |
| 33 | 32 | 'direct' => [ |
| 34 | 33 | 'required', |
| 35 | 34 | 'string', |
| 36 | - 'min:3', | |
| 37 | 35 | 'max:255' |
| 38 | 36 | ], |
| 39 | 37 | ]; |
| ... | ... | @@ -41,7 +39,9 @@ class PrevCompanyRequest extends FormRequest |
| 41 | 39 | |
| 42 | 40 | public function messages() { |
| 43 | 41 | return [ |
| 44 | - 'required' => 'Поле :attribute обязательно для ввода', | |
| 42 | + //'required' => 'Поле :attribute обязательно для ввода', | |
| 43 | + 'name_company.required' => 'Укажите обязательное поле "Название компании"', | |
| 44 | + 'direct.required' => 'Укажите обязательное поле "ФИО сотрудника"', | |
| 45 | 45 | 'unique' => 'Поле :attribute должно быть уникальным', |
| 46 | 46 | 'mimes' => 'Допускаются файлы только с расширением jpeg,jpg,png', |
| 47 | 47 | 'numeric' => 'Поле :attribute должно быть числом', |
app/Providers/MyServiceProvider.php
| ... | ... | @@ -82,7 +82,11 @@ 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()->where('is_remove', '=', '0')->get(); | |
| 85 | + //$jobs = Job_title::query()->where('is_remove', '=', '0')->get(); | |
| 86 | + $jobs = Job_title::query()->where('is_remove', '=', '0')-> | |
| 87 | + where('is_bd', '=' , '0')-> | |
| 88 | + OrderByDesc('sort')->OrderBy('name')->get(); | |
| 89 | + | |
| 86 | 90 | $view->with(['UserId' => $id, 'companies' => $companies, 'jobs' => $jobs]); |
| 87 | 91 | } |
| 88 | 92 | ); |
| ... | ... | @@ -112,8 +116,12 @@ class MyServiceProvider extends ServiceProvider |
| 112 | 116 | $view_job_title = ['modals.register']; |
| 113 | 117 | View::composer($view_job_title, |
| 114 | 118 | function($view_job_title) { |
| 119 | + //$Job_titles = Job_title::query()->where('is_remove', '=', '0')-> | |
| 120 | + // where('is_bd', '=' , '1')->get(); | |
| 115 | 121 | $Job_titles = Job_title::query()->where('is_remove', '=', '0')-> |
| 116 | - where('is_bd', '=' , '1')->get(); | |
| 122 | + where('is_bd', '=' , '1')-> | |
| 123 | + OrderByDesc('sort')->OrderBy('name')->get(); | |
| 124 | + | |
| 117 | 125 | $view_job_title->with(['Job_titles' => $Job_titles]); |
| 118 | 126 | } |
| 119 | 127 | ); |
resources/views/admin/employer/index.blade.php
| ... | ... | @@ -174,6 +174,9 @@ |
| 174 | 174 | <td class="px-4 py-3 text-xs"> |
| 175 | 175 | <div class="flex items-center text-sm"> |
| 176 | 176 | <div> |
| 177 | + @if (isset($user->name_company)) | |
| 178 | + <p class="font-semibold">{{$user->name_company}}</p> | |
| 179 | + @endif | |
| 177 | 180 | <p class="font-semibold">{{$user->name}}</p> |
| 178 | 181 | <p class="font-semibold">{{ empty($user->employers->email) ? $user->email : $user->employers->email }}</p> |
| 179 | 182 | <p class="text-xs text-gray-600 dark:text-gray-400"> |
resources/views/ajax/resume_1.blade.php
| 1 | - | |
| 1 | +@if ($resumes->count()) | |
| 2 | + @foreach ($resumes as $res) | |
| 2 | 3 | <div class="main__resume-base-body-item"> |
| 3 | 4 | <div class="main__resume-base-body-item-buttons"> |
| 4 | 5 | <button type="button" data-id="{{ $res->id }}" id="elem{{ $res->id }}" class="like js-toggle js_box_favorit {{ \App\Classes\LikesClass::get_status_worker($res) }}" data-val="{{ $res->id }}"> |
resources/views/employers/add_ad_jobs.blade.php
| ... | ... | @@ -59,7 +59,7 @@ |
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | 61 | |
| 62 | - <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group"> | |
| 62 | + <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none"> | |
| 63 | 63 | <label class="form-group__label">Категория вакансии</label> |
| 64 | 64 | <div class="form-group__item"> |
| 65 | 65 | <div class="select"> |
| ... | ... | @@ -82,17 +82,15 @@ |
| 82 | 82 | <div class="form-group__item"> |
| 83 | 83 | <div class="select"> |
| 84 | 84 | <select class="js-select2" name="job_title_id" id="job_title_id"> |
| 85 | - @php $i = 1 @endphp | |
| 86 | - @if ($jobs->count()) | |
| 87 | - @foreach($jobs as $j) | |
| 88 | - @if ($i == 1) <option selected> Выберите должность из списка</option> | |
| 89 | - @else | |
| 90 | - <option value="{{ $j->id }}">{{ $j->name }}</option> | |
| 91 | - @endif | |
| 92 | - @php $i++ @endphp | |
| 93 | - @endforeach | |
| 94 | - @endif | |
| 85 | + @php $i = 1; | |
| 86 | + @endphp | |
| 87 | + <option value="0"> Выберите должность из списка</option> | |
| 88 | + @foreach($jobs as $j) | |
| 89 | + <option value="{{ $j->id }}">{{ $j->name }}</option> | |
| 90 | + @php $i++ @endphp | |
| 91 | + @endforeach | |
| 95 | 92 | </select> |
| 93 | + | |
| 96 | 94 | @error('job_title_id') |
| 97 | 95 | <span class="text-xs text-red-600 dark:text-red-400"> |
| 98 | 96 | {{ $message }} |
resources/views/employers/ajax/list_vacancy.blade.php
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | <tr> |
| 18 | 18 | <td>{{ $it->id }}</td> |
| 19 | 19 | <td>{{ $it->name }}</td> |
| 20 | - <td>{{ date('d.m.Y H:i:s', strtotime($it->created_at)) }} <br>/ {{ date('d.m.Y H:i:s', strtotime($it->updated_at)) }}</td> | |
| 20 | + <td>{{ date('d.m.Y', strtotime($it->created_at)) }} <br>/ {{ date('d.m.Y', strtotime($it->updated_at)) }}</td> | |
| 21 | 21 | <td style="display:none"> <a href="{{ route('employer.add_job_in_vac', ['ad_employer' => $it->id]) }}" class="button">Добавить</a> |
| 22 | 22 | |
| 23 | 23 | @if ($it->jobs->count()) |
resources/views/employers/edit_ad_jobs.blade.php
| ... | ... | @@ -59,7 +59,7 @@ |
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | 61 | |
| 62 | - <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group"> | |
| 62 | + <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group" style="display:none"> | |
| 63 | 63 | <label class="form-group__label">Категория должности</label> |
| 64 | 64 | <div class="form-group__item"> |
| 65 | 65 | <div class="select"> |
| ... | ... | @@ -81,6 +81,8 @@ |
| 81 | 81 | <label class="form-group__label">Должность соискателя</label> |
| 82 | 82 | <div class="form-group__item"> |
| 83 | 83 | <div class="select"> |
| 84 | + <pre><? print_r($jobs123)?></pre> | |
| 85 | + | |
| 84 | 86 | <select class="js-select2" name="job_title_id" id="job_title_id"> |
| 85 | 87 | @php $i = 1; |
| 86 | 88 | @endphp |
resources/views/employers/list_vacancy.blade.php
| ... | ... | @@ -10,12 +10,12 @@ |
| 10 | 10 | |
| 11 | 11 | $.ajax({ |
| 12 | 12 | type: "GET", |
| 13 | - url: "{{ route('employer.vacancy_list') }}", | |
| 14 | - data: "sort="+val_, | |
| 13 | + url: "{{ url()->current() }}", | |
| 14 | + data: "sort="+val_+"&search=@if ((isset($_GET['search']))&&(!empty($_GET['search']))){{$_GET['search']}}@endif", | |
| 15 | 15 | success: function (data) { |
| 16 | 16 | console.log('Выбор сортировки'); |
| 17 | 17 | console.log(data); |
| 18 | - history.pushState({}, '', "{{ route('employer.vacancy_list') }}?sort="+val_+"@if (isset($_GET['page']))&page={{ $_GET['page'] }}@endif"); | |
| 18 | + history.pushState({}, '', "{{ route('employer.vacancy_list') }}?search=@if ((isset($_GET['search']))&&(!empty($_GET['search']))){{$_GET['search']}}@endif"+"&sort="+val_+"@if (isset($_GET['page']))&page={{ $_GET['page'] }}@endif"); | |
| 19 | 19 | $('#main_ockar').html(data); |
| 20 | 20 | }, |
| 21 | 21 | headers: { |
| ... | ... | @@ -54,8 +54,8 @@ |
| 54 | 54 | <div class="cabinet__body-item"> |
| 55 | 55 | <div class="cabinet__filters"> |
| 56 | 56 | <div class="cabinet__filters-item"> |
| 57 | - <form class="search"> | |
| 58 | - <input type="search" class="input" placeholder="Поиск…" required> | |
| 57 | + <form class="search" action="{{ url()->current() }}" method="GET"> | |
| 58 | + <input type="search" name="search" class="input" placeholder="Поиск…" value="@if ((isset($_GET['search'])) && (!empty($_GET['search']))) {{ $_GET['search'] }}@endif"> | |
| 59 | 59 | <button type="submit" class="button">Найти</button> |
| 60 | 60 | <span> |
| 61 | 61 | <svg> |
| ... | ... | @@ -97,7 +97,7 @@ |
| 97 | 97 | <tr> |
| 98 | 98 | <td>{{ $it->id }}</td> |
| 99 | 99 | <td>{{ $it->name }}</td> |
| 100 | - <td>{{ date('d.m.Y H:i:s', strtotime($it->created_at)) }} <br>/ {{ date('d.m.Y H:i:s', strtotime($it->updated_at)) }}</td> | |
| 100 | + <td>{{ date('d.m.Y', strtotime($it->created_at)) }} <br>/ {{ date('d.m.Y', strtotime($it->updated_at)) }}</td> | |
| 101 | 101 | <td style="display:none"> <a href="{{ route('employer.add_job_in_vac', ['ad_employer' => $it->id]) }}" class="button">Добавить</a> |
| 102 | 102 | |
| 103 | 103 | @if ($it->jobs->count()) |
| ... | ... | @@ -149,6 +149,13 @@ |
| 149 | 149 | </svg> |
| 150 | 150 | </a> |
| 151 | 151 | @endif |
| 152 | + @if ($Employer->social_is == 1) | |
| 153 | + <a href="https://telegram.me/share/url?url={{ route('vacancie', ['vacancy' => $it->id]) }}&text={{ $it->text }}" class="table__controls-item"> | |
| 154 | + <svg> | |
| 155 | + <use xlink:href="{{ asset('images/sprite.svg#tg') }}"></use> | |
| 156 | + </svg> | |
| 157 | + </a> | |
| 158 | + @endif | |
| 152 | 159 | <!--<a class="btn_telegram_share table__controls-item" href="https://telegram.me/share/url?url=ВАШ_URL&text={{ $it->name }}"> |
| 153 | 160 | <svg> |
| 154 | 161 | <use xlink:href=" asset('images/sprite.svg#arrow-radius') }}"></use> |
resources/views/js/favorite-worker.blade.php
resources/views/layout/frontend.blade.php
resources/views/vacance-item.blade.php
| ... | ... | @@ -103,7 +103,8 @@ |
| 103 | 103 | </div> |
| 104 | 104 | </div> |
| 105 | 105 | @endif |
| 106 | - <h2 class="main__employer-page-title">Описание вакансии</h2> | |
| 106 | + <h2 class="main__employer-page-title">{{ $Query[0]->name }}</h2> | |
| 107 | + <h3 class="main__employer-page-title_">Описание вакансии</h3> | |
| 107 | 108 | |
| 108 | 109 | </div> |
| 109 | 110 |
resources/views/worker.blade.php
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 | <use xlink:href="{{ asset('images/sprite.svg#download') }}"></use> |
| 74 | 74 | </svg> |
| 75 | 75 | </a> |
| 76 | - <button type="button" class="like js-toggle"> | |
| 76 | + <button type="button" class="like js-toggle js_box_favorit {{ \App\Classes\LikesClass::get_status_worker($Query[0]) }}" data-val="{{ $Query[0]->id }}" id="elem{{ $Query[0]->id }}"> | |
| 77 | 77 | <svg> |
| 78 | 78 | <use xlink:href="{{ asset('images/sprite.svg#heart') }}"></use> |
| 79 | 79 | </svg> |
| ... | ... | @@ -103,7 +103,9 @@ |
| 103 | 103 | <td> |
| 104 | 104 | @if ($Query[0]->job_titles->count()) |
| 105 | 105 | @foreach ($Query[0]->job_titles as $it) |
| 106 | + @if ($it->is_remove == 0) | |
| 106 | 107 | <b>{{ $it->name }}</b> |
| 108 | + @endif | |
| 107 | 109 | @endforeach |
| 108 | 110 | @endif |
| 109 | 111 | </td> |
| ... | ... | @@ -114,7 +116,7 @@ |
| 114 | 116 | </tr> |
| 115 | 117 | <tr> |
| 116 | 118 | <td>E-mail:</td> |
| 117 | - <td><b><a href="emailto:{{ $Query[0]->email }}">{{ $Query[0]->email }}</a></b></td> | |
| 119 | + <td><b><a href="mailto:{{ $Query[0]->email }}">{{ $Query[0]->email }}</a></b></td> | |
| 118 | 120 | </tr> |
| 119 | 121 | <tr> |
| 120 | 122 | <td>Возраст:</td> |
resources/views/workers/docs.blade.php
| ... | ... | @@ -39,7 +39,7 @@ |
| 39 | 39 | <div class="cabinet__inputs"> |
| 40 | 40 | <input type="hidden" name="worker_id" id="worker_id" value="{{ $worker->id }}"/> |
| 41 | 41 | <div class="cabinet__inputs-item form-group"> |
| 42 | - <label class="form-group__label">Должность</label> | |
| 42 | + <label class="form-group__label">Должность*</label> | |
| 43 | 43 | <div class="form-group__item"> |
| 44 | 44 | <input type="text" name="job_title" id="job_title" class="input" value="{{ old('job_title') ?? $doc->job_title ?? '' }}"> |
| 45 | 45 | </div> |
| ... | ... | @@ -54,13 +54,13 @@ |
| 54 | 54 | </div> |
| 55 | 55 | </div>--> |
| 56 | 56 | <div class="cabinet__inputs-item form-group"> |
| 57 | - <label class="form-group__label">Название т/х</label> | |
| 57 | + <label class="form-group__label">Название т/х*</label> | |
| 58 | 58 | <div class="form-group__item"> |
| 59 | 59 | <input type="text" name="teplohod" id="teplohod" class="input" value="{{ old('teplohod') ?? $doc->teplohod ?? '' }}"> |
| 60 | 60 | </div> |
| 61 | 61 | </div> |
| 62 | 62 | <div class="cabinet__inputs-item form-group"> |
| 63 | - <label class="form-group__label">Тип судна</label> | |
| 63 | + <label class="form-group__label">Тип судна*</label> | |
| 64 | 64 | <div class="form-group__item"> |
| 65 | 65 | <input type="text" name="GWT" id="GWT" class="input" value="{{ old('GWT') ?? $doc->GWT ?? '' }}"> |
| 66 | 66 | </div> |
| ... | ... | @@ -81,14 +81,14 @@ |
| 81 | 81 | </div> |
| 82 | 82 | |
| 83 | 83 | <div class="cabinet__inputs-item form-group"> |
| 84 | - <label class="form-group__label">Водоизмещение (GRT)</label> | |
| 84 | + <label class="form-group__label">Водоизмещение (GRT)*</label> | |
| 85 | 85 | <div class="form-group__item"> |
| 86 | 86 | <input type="text" name="GRT" id="GRT" class="input" value="{{ old('GRT') ?? $doc->GRT ?? '' }}"> |
| 87 | 87 | </div> |
| 88 | 88 | </div> |
| 89 | 89 | |
| 90 | 90 | <div class="cabinet__inputs-item form-group"> |
| 91 | - <label class="form-group__label">Название компании</label> | |
| 91 | + <label class="form-group__label">Название компании*</label> | |
| 92 | 92 | <div class="form-group__item"> |
| 93 | 93 | <input type="text" name="name_company" id="name_company" class="input" value="{{ old('name_company') ?? $doc->name_company ?? '' }}"> |
| 94 | 94 | </div> |
resources/views/workers/prev_company_form.blade.php
| ... | ... | @@ -53,13 +53,13 @@ |
| 53 | 53 | @csrf |
| 54 | 54 | <input type="hidden" name="worker_id" id="worker_id" class="input" value="{{ $worker->id }}"> |
| 55 | 55 | <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group"> |
| 56 | - <label class="form-group__label">Название компании</label> | |
| 56 | + <label class="form-group__label">Название компании*</label> | |
| 57 | 57 | <div class="form-group__item"> |
| 58 | 58 | <input type="text" name="name_company" id="name_company" class="input" value="{{ old('name_company') ?? '' }}"> |
| 59 | 59 | </div> |
| 60 | 60 | </div> |
| 61 | 61 | <div class="cabinet__inputs-item cabinet__inputs-item_fullwidth form-group"> |
| 62 | - <label class="form-group__label">ФИО сотрудника</label> | |
| 62 | + <label class="form-group__label">ФИО сотрудника*</label> | |
| 63 | 63 | <div class="form-group__item"> |
| 64 | 64 | <input type="text" name="direct" id="direct" class="input" value="{{ old('direct') ?? '' }}"> |
| 65 | 65 | </div> |