Задачи 33,34,35 + фиксы

Сергей П
1 parent fb45bb1863
Showing 6 changed files with 28 additions and 43 deletions Side-by-side Diff
app/Http/Controllers/EmployerController.php
app/Http/Controllers/MainController.php
resources/views/education/show.blade.php
resources/views/employers/bd.blade.php
resources/views/employers/bd_tupe.blade.php
resources/views/workers/cabinet.blade.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<br>";
+            for ($j = 0; $j < 5; $j++) {
+                echo "  j = $j\n<br>";
+                for ($k = 0; $k < 5; $k++) {
+                    if ($k == 2) {
+                        continue;
+                    }
+                    echo "    k = $k\n<br>";
+                }
+            }
+        }
+
+        dd('OK');
+        $users = User_Model::query()->with('workers')->with('jobtitles');
  
         if ($request->has('search')) {
             $find_key = $request->get('search');
@@ -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')->
@@ -47,7 +47,7 @@
                 <div class="candidate-top-wrapper">
                     <div class="candidate-thumbnail">
                         @if($education->image)
-                        <img width="150" height="150" src="asset(Storage::url($education->image)) }}" alt="">
+                        <img width="150" height="150" src="{{ asset(Storage::url($education->image)) }}" alt="">
                         @endif
                     </div>
                     <div class="candidate-information">
@@ -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 @@
  
                     <div class="cabinet__body-item">
                         <div class="cabinet__table-header">
-                            <div><!--_if (isset($it->workers[0]->job_titles[0]->name)) _ $it->workers[0]->job_titles[0]->name }}_else Не указано _endif-->
+                            <div>
                                 Позиции работников
                             </div>
                             <span>
-                                    Всего вакансий найдено:
+                                    Пользователей найдено:
                                     <b>{{ $count_users->count() }}</b>
                             </span>
                         </div>
@@ -144,8 +144,7 @@
                                         <thead>
                                         <tr>
                                             <th>ФИО соискателя</th>
-                                            <th>Номер телефона</th>
-                                            <th>Электронная<br>почта</th>
+                                            <th>Должность</th>
                                             <th>Наличие<br>анкеты</th>
                                         </tr>
                                         </thead>
@@ -160,30 +159,7 @@
                             <tr>
                                 <td>{{ $it->surname." ".$it->name_man }}<br>{{ $it->surname2 }}</td>
  
-                                <td>
-
-                                    @if (!empty($it->workers[0]->telephone))
-                                    <a href="tel:{{ $it->workers[0]->telephone }}">
-                                        {{ $it->workers[0]->telephone }}
-                                    </a>
-                                    @else
-                                        -
-                                    @endif
-
-                                    @if (!empty($it->workers[0]->telephone2))
-                                    <br><a href="tel:{{ $it->workers[0]->telephone2 }}">
-                                        {{ $it->workers[0]->telephone2 }}
-                                    </a>
-                                    @endif
-                                </td>
-
-                                <td>
-                                    @if (!empty($it->workers[0]->email))
-                                        <a href="emailto:{{ $it->workers[0]->email }}">{{ $it->workers[0]->email }}</a>
-                                    @else
-                                        -
-                                    @endif
-                                </td>
+                                <td>{{ $it->jobtitles[0]->name ?? '-' }}</td>
  
                                 <td>
                                     @if (isset($it->workers[0]->id))
@@ -74,7 +74,7 @@
                         <div class="cabinet__table-header">
                             <div>Капитан</div>
                             <span>
-                                    Всего вакансий найдено:
+                                    Пользователей найдено:
                                     <b>18</b>
                                 </span>
                         </div>
@@ -268,21 +268,16 @@
                                     <div class="cabinet__inputs-item form-group">
                                         <label class="form-group__label">Контакты родственников:</label>
                                         <div class="form-group__item">
-                                            {{ $worker->telephon2 ?? '-' }}
+                                            {{ $worker->telephone2 ?? '-' }}
                                         </div>
                                     </div>
-
-
-
-                                    <div class="width100">
-                                        <h4 class="cabinet__h4 mb-10">О себе</h4>
-                                        <div>{{ $worker->text }}</div>
-                                    </div>
                                 </div>
                             </div>
  
-
-
+                            <div class="width100">
+                                <h4 class="cabinet__h4 mb-10">О себе</h4>
+                                <div>{{ $worker->text }}</div>
+                            </div>
  
                             <div class="">
                                 <a href="{{ route('worker.basic_information') }}" class="button active">Редактировать  основную информацию</a>
...	...	@@ -583,7 +583,21 @@ class EmployerController extends Controller
583	583
584	584	// База данных
585	585	public function bd(Request $request) {
586		- $users = User_Model::query()->with('workers');
	586	+ for ($i = 0; $i < 5; $i++) {
	587	+ echo "i = $i\n<br>";
	588	+ for ($j = 0; $j < 5; $j++) {
	589	+ echo " j = $j\n<br>";
	590	+ for ($k = 0; $k < 5; $k++) {
	591	+ if ($k == 2) {
	592	+ continue;
	593	+ }
	594	+ echo " k = $k\n<br>";
	595	+ }
	596	+ }
	597	+ }
	598	+
	599	+ dd('OK');
	600	+ $users = User_Model::query()->with('workers')->with('jobtitles');
587	601
588	602	if ($request->has('search')) {
589	603	$find_key = $request->get('search');
...	...	@@ -40,7 +40,7 @@ class MainController extends Controller
40	40	->get();
41	41
42	42	$Job_title = Job_title::query()->where('is_remove', '=', '0')->
43		- where('is_bd', '=', '0')->orderBy('name')->get();
	43	+ where('is_bd', '=', '0')->orderByDesc('sort')->get();
44	44
45	45	$Data = DB::table('job_titles')->
46	46	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')->
...	...	@@ -47,7 +47,7 @@
47	47	<div class="candidate-top-wrapper">
48	48	<div class="candidate-thumbnail">
49	49	@if($education->image)
50		- <img width="150" height="150" src="asset(Storage::url($education->image)) }}" alt="">
	50	+ <img width="150" height="150" src="{{ asset(Storage::url($education->image)) }}" alt="">
51	51	@endif
52	52	</div>
53	53	<div class="candidate-information">
...	...	@@ -6,7 +6,7 @@
6	6	$('[name="job_title_list[]"]').chosen({
7	7	width: '100%'
8	8	})
9		- $('[name="job_title"]').change(function(){
	9	+ $('[name="job_titles__name"]').change(function(){
10	10	if ($(this).is(':checked')){
11	11	$(".job-title-list-wrap").css("display", "block");
12	12	} else {
...	...	@@ -124,11 +124,11 @@
124	124
125	125	<div class="cabinet__body-item">
126	126	<div class="cabinet__table-header">
127		- <div><!--_if (isset($it->workers[0]->job_titles[0]->name)) _ $it->workers[0]->job_titles[0]->name }}_else Не указано _endif-->
	127	+ <div>
128	128	Позиции работников
129	129	</div>
130	130	<span>
131		- Всего вакансий найдено:
	131	+ Пользователей найдено:
132	132	<b>{{ $count_users->count() }}</b>
133	133	</span>
134	134	</div>
...	...	@@ -144,8 +144,7 @@
144	144	<thead>
145	145	<tr>
146	146	<th>ФИО соискателя</th>
147		- <th>Номер телефона</th>
148		- <th>Электронная<br>почта</th>
	147	+ <th>Должность</th>
149	148	<th>Наличие<br>анкеты</th>
150	149	</tr>
151	150	</thead>
...	...	@@ -160,30 +159,7 @@
160	159	<tr>
161	160	<td>{{ $it->surname." ".$it->name_man }}<br>{{ $it->surname2 }}</td>
162	161
163		- <td>
164		-
165		- @if (!empty($it->workers[0]->telephone))
166		- <a href="tel:{{ $it->workers[0]->telephone }}">
167		- {{ $it->workers[0]->telephone }}
168		- </a>
169		- @else
170		- -
171		- @endif
172		-
173		- @if (!empty($it->workers[0]->telephone2))
174		- <br><a href="tel:{{ $it->workers[0]->telephone2 }}">
175		- {{ $it->workers[0]->telephone2 }}
176		- </a>
177		- @endif
178		- </td>
179		-
180		- <td>
181		- @if (!empty($it->workers[0]->email))
182		- <a href="emailto:{{ $it->workers[0]->email }}">{{ $it->workers[0]->email }}</a>
183		- @else
184		- -
185		- @endif
186		- </td>
	162	+ <td>{{ $it->jobtitles[0]->name ?? '-' }}</td>
187	163
188	164	<td>
189	165	@if (isset($it->workers[0]->id))
...	...	@@ -74,7 +74,7 @@
74	74	<div class="cabinet__table-header">
75	75	<div>Капитан</div>
76	76	<span>
77		- Всего вакансий найдено:
	77	+ Пользователей найдено:
78	78	<b>18</b>
79	79	</span>
80	80	</div>
...	...	@@ -268,21 +268,16 @@
268	268	<div class="cabinet__inputs-item form-group">
269	269	<label class="form-group__label">Контакты родственников:</label>
270	270	<div class="form-group__item">
271		- {{ $worker->telephon2 ?? '-' }}
	271	+ {{ $worker->telephone2 ?? '-' }}
272	272	</div>
273	273	</div>
274		-
275		-
276		-
277		- <div class="width100">
278		- <h4 class="cabinet__h4 mb-10">О себе</h4>
279		- <div>{{ $worker->text }}</div>
280		- </div>
281	274	</div>
282	275	</div>
283	276
284		-
285		-
	277	+ <div class="width100">
	278	+ <h4 class="cabinet__h4 mb-10">О себе</h4>
	279	+ <div>{{ $worker->text }}</div>
	280	+ </div>
286	281
287	282	<div class="">
288	283	<a href="{{ route('worker.basic_information') }}" class="button active">Редактировать основную информацию</a>