Сергей П / rekamore.su

Download as
Browse Code »

Commit ddb8f38fb5c15e3fc5bd04800fd7c45b9e3d18fa

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

Коммит по редизайну вакансий объявления

Showing 8 changed files with 81 additions and 54 deletions Side-by-side Diff

app/Http/Controllers/WorkerController.php
Diff comments   View file @ ddb8f38
... ... @@ -704,6 +704,7 @@ class WorkerController extends Controller
704 704  
705 705 $Query = $Query->OrderBy('updated_at')->paginate(3);
706 706  
  707 +
707 708 return view('workers.favorite', compact('Query',
708 709 'Query_count',
709 710 'Job_title'));
app/Http/Requests/JobTitlesRequest.php
Diff comments   View file @ ddb8f38
... ... @@ -34,6 +34,12 @@ class JobTitlesRequest extends FormRequest
34 34 'min:0',
35 35 'max:9999999',
36 36 ],
  37 + 'sort' => [
  38 + 'numeric',
  39 + 'min:0',
  40 + 'max:9999999',
  41 + ]
  42 +
37 43 ];
38 44 }
39 45  
resources/views/admin/job_titles/form.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -45,13 +45,18 @@
45 45 @php
46 46 $sort_num = 100;
47 47 @endphp
48   - <select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
  48 +
  49 + <input name="sort" id="sort"
  50 + class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
  51 + placeholder="Сортировка" value="{{ old('sort') ?? $job_title->sort ?? '100' }}"
  52 + />
  53 + <!--<select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
49 54 title="Сортировка">
50   - @for($i = 1; $i <= 10; $i++)
51   - <option value="{{ $sort_num }}" @if (isset($job_title)) @if ($sort_num == $job_title->sort) selected @else @endif @endif>{{ $sort_num }}</option>
52   - @php $sort_num = $sort_num + 10; @endphp
53   - @endfor
54   - </select>
  55 + for($i = 1; $i <= 10; $i++)
  56 + <option value="{ $sort_num }}" if (isset($job_title)) if ($sort_num == $job_title->sort) selected else endif endif>{ $sort_num }}</option>
  57 + php $sort_num = $sort_num + 10; endphp
  58 + endfor
  59 + </select>-->
55 60 </label><br>
56 61  
57 62 <label class="block text-sm">
resources/views/ajax/list_vacancies.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -36,19 +36,23 @@
36 36 @else
37 37 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
38 38 @endif
39   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  39 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
40 40 </div>
41 41  
42 42 <div class="main__employer-page-two-item-text">
43   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
44   - специалистов на следующие должности:</div>
45   - <div class="main__employer-page-two-item-text-links">
46   - @if (isset($Q->jobs))
47   - @foreach ($Q->jobs as $key => $j)
48   - <a>“{{ $j->name }}” – з/п от @if (isset($Q->jobs_code[$key]->min_salary)) {{ $Q->jobs_code[$key]->min_salary }} @endif - @if (isset($Q->jobs_code[$key]->max_salary)) {{ $Q->jobs_code[$key]->max_salary }} @endif рублей (на руки)</a>
49   - @endforeach
50   - @endif
  43 + <div class="main__employer-page-two-item-text-name">
  44 + <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
51 45 </div>
  46 + <!--Судоходная компания ведет набор
  47 + специалистов на следующие должности:</div>
  48 + <div class="main__employer-page-two-item-text-links">
  49 + if (isset($Q->jobs))
  50 + foreach ($Q->jobs as $key => $j)
  51 + <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  52 + <!-- </a>
  53 + endforeach
  54 + endif
  55 + </div>-->
52 56 </div>
53 57  
54 58 <div class="main__employer-page-two-item-text">
... ... @@ -57,24 +61,25 @@
57 61 {!! $Q->text !!}
58 62 </div>
59 63 </div>
60   - <div class="main__employer-page-two-item-text">
  64 + <!--<div class="main__employer-page-two-item-text">
61 65 <div class="main__employer-page-two-item-text-name">Наши ожидания:</div>
62 66 <div class="main__employer-page-two-item-text-body">
63   - {!! $Q->description !!}
  67 + !! $Q->description !!}
64 68 </div>
65 69 </div>
66 70 <div class="main__employer-page-two-item-text">
67 71 <div class="main__employer-page-two-item-text-name">Резюме направляйте на почту:</div>
68 72 <div class="main__employer-page-two-item-text-body">
69   - {!! $Q->contacts_emails !!}
  73 + !! $Q->contacts_emails !!}
70 74 </div>
71 75 </div>
72 76 <div class="main__employer-page-two-item-text">
73 77 <div class="main__employer-page-two-item-text-name">Или звоните:</div>
74 78 <div class="main__employer-page-two-item-text-body">
75   - {!! $Q->contacts_telephones !!}
  79 + !! $Q->contacts_telephones !!}
76 80 </div>
77 81 </div>
  82 + -->
78 83  
79 84 <div class="main__employer-page-two-item-tags">
80 85 @if (!empty($Q->jobs_code[0]->position_ship))
... ... @@ -87,6 +92,7 @@
87 92 @endif
88 93 @endif
89 94 </div>
  95 +
90 96 <div class="main__employer-page-two-item-buttons">
91 97 @guest
92 98 <button type="button" data-fancybox data-src="#question" data-options='{"touch":false,"autoFocus":false}'
resources/views/info_company_new.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -207,17 +207,19 @@
207 207 @else
208 208 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $job->name }}">
209 209 @endif
210   - <span>{{ $job->name }}</span>
  210 + <span>{{ $company[0]->name_company }}</span>
211 211 </div>
212 212 <!--<div class="main__employer-page-two-item-title"> $item->flot }}</div>-->
213 213 <div class="main__employer-page-two-item-text">
214   - @if ((isset($job->jobs)) && ($job->jobs->count()))
215   - @foreach($job->jobs as $item)
  214 + <h3>{{ $job->name }}</h3>
  215 + <!--if ((isset($job->jobs)) && ($job->jobs->count()))
  216 + foreach($job->jobs as $item)
216 217 <a class="main__employer-page-two-item-text-name">
217   - {{ $item->name }}
  218 + { $item->name }}
218 219 </a>
219   - @endforeach
220   - @endif
  220 + endforeach
  221 + endif
  222 + -->
221 223 <span>Описание:
222 224 {!! $job->text !!}
223 225 </span>
resources/views/list_vacancies.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -233,20 +233,23 @@
233 233 @else
234 234 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
235 235 @endif
236   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  236 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
237 237 </div>
238 238  
239 239 <div class="main__employer-page-two-item-text">
240   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
  240 + <div class="main__employer-page-two-item-text-name">
  241 + <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
  242 + </div>
  243 + <!--Судоходная компания ведет набор
241 244 специалистов на следующие должности:</div>
242 245 <div class="main__employer-page-two-item-text-links">
243   - @if (isset($Q->jobs))
244   - @foreach ($Q->jobs as $key => $j)
245   - <a>“{{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
246   - </a>
247   - @endforeach
248   - @endif
249   - </div>
  246 + if (isset($Q->jobs))
  247 + foreach ($Q->jobs as $key => $j)
  248 + <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  249 + <!-- </a>
  250 + endforeach
  251 + endif
  252 + </div>-->
250 253 </div>
251 254  
252 255 <div class="main__employer-page-two-item-text">
resources/views/vacance-item.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -110,19 +110,19 @@
110 110  
111 111 @foreach ($Query as $Q)
112 112 <div class="main__vacancies-item-page main__employer-page-two-item">
113   - <div class="main__employer-page-two-item-text">
  113 + <!--<div class="main__employer-page-two-item-text">
114 114 <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
115 115 специалистов на следующие должности:</div>
116 116 <div class="main__employer-page-two-item-text-links">
117   - @if (isset($Q->jobs))
118   - @foreach ($Q->jobs as $key => $j)
119   - <a>“{{ $j->name }}”
120   - <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
121   - </a>
122   - @endforeach
123   - @endif
  117 + if (isset($Q->jobs))
  118 + foreach ($Q->jobs as $key => $j)
  119 + <a>“{ $j->name }}”
  120 + <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  121 + <!--</a>
  122 + endforeach
  123 + endif
124 124 </div>
125   - </div>
  125 + </div>-->
126 126 <div class="main__employer-page-two-item-text">
127 127 <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>
128 128 <div class="main__employer-page-two-item-text-body">
... ... @@ -186,7 +186,7 @@
186 186  
187 187 @endforeach
188 188  
189   - </div> <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
  189 + <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
190 190 <svg>
191 191 <use xlink:href="{{ asset('images/sprite.svg#back') }}"></use>
192 192 </svg>
... ... @@ -194,6 +194,7 @@
194 194 Вернуться к списку вакансий
195 195 </span>
196 196 </a>
  197 + </div>
197 198 </main>
198 199 </div>
199 200 @endsection
resources/views/workers/favorite.blade.php
Diff comments   View file @ ddb8f38
... ... @@ -68,20 +68,23 @@
68 68 @else
69 69 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Q->employer->name }}" class="main__vacancies-thing-pic">
70 70 @endif
71   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  71 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif </span>
72 72 </div>
73 73 <div class="main__employer-page-two-item-text">
74   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
  74 + <div class="main__employer-page-two-item-text-name">
  75 + <h2>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h2>
  76 + </div>
  77 + <!-- Судоходная компания ведет набор
75 78 специалистов на следующие должности:</div>
76 79 <div class="main__employer-page-two-item-text-links">
77   - @if (isset($Q->jobs))
78   - @foreach ($Q->jobs as $key => $j)
79   - <a>“{{ $j->name }}”
80   - <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
81   - </a>
82   - @endforeach
83   - @endif
84   - </div>
  80 + if (isset($Q->jobs))
  81 + foreach ($Q->jobs as $key => $j)
  82 + <a>“{ $j->name }}”
  83 + <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  84 + <!-- </a>
  85 + endforeach
  86 + endif
  87 + </div>-->
85 88 </div>
86 89 <div class="main__employer-page-two-item-text">
87 90 <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>