Merge branch 'task-132687' into 'master'

task-132687 minor changes

Merge branch 'task-132687' into 'master'
task-132687 minor changes
Fedor K
2 parents 7cc82d4c7e 8a601d5d60
Showing 4 changed files Side-by-side Diff
app/Classes/Tools.php
resources/views/education/index.blade.php
resources/views/employers/bd.blade.php
resources/views/workers/cabinet.blade.php
@@ -29,9 +29,15 @@ class Tools
     {
         $persent = 0;
  
-        if (
-            (!empty($Worker->users->surname)) &&
+        if((!empty($Worker->users->surname)) &&
             (!empty($Worker->users->name_man)) &&
+            (!empty($Worker->telephone)) &&
+            (!empty($Worker->email))
+        ) {
+            $persent += 10;
+        }
+
+        if (
             (!empty($Worker->users->surname2)) &&
             (!empty($Worker->old_year)) &&
             ($Worker->job_titles->count() > 0) &&
@@ -44,18 +50,16 @@ class Tools
             (!empty($Worker->confirmation_work_for_vvp)) &&
             (!empty($Worker->military_id_available)) &&
             (!empty($Worker->city)) &&
-            (!empty($Worker->telephone)) &&
-            (!empty($Worker->email)) &&
             (!empty($Worker->telephone2))
         ) {
-            $persent += 50;
+            $persent += 40;
         }
  
         if ($Worker->sertificate->count() > 0) {
             $persent += 10;
         }
  
-        if ($Worker->infobloks->count() > 0) {
+        if ($Worker->infobloks->where(fn($ib) => $ib->pivot->status === 1)->count() > 0) {
             $persent += 10;
         }
  
@@ -76,7 +76,7 @@
             <div class="filters">
                 <div class="filters__label">Показано {{ $educations->firstItem() }} – {{ $educations->lastItem() }} из {{ $count_edu }} результатов поиска</div>
                 <div class="filters__body">
-                    <div class="select filters__select">
+                    {{--<div class="select filters__select">
                         <select class="js-select2" id="sort_ajax" name="sort_ajax">
                             <option value="default">Сортировка (по умолчанию)</option>
                             <option value="name_up">По имени (возрастание)</option>
@@ -84,7 +84,7 @@
                             <option value="created_at_up">По дате (возрастание)</option>
                             <option value="created_at_down">По дате (убывание)</option>
                         </select>
-                    </div>
+                    </div>--}}
                 </div>
             </div>
  
@@ -161,7 +161,7 @@
                     @if ($users->count())
                         @foreach ($users as $key => $it)
                             <tr>
-                                <td style="max-width: 40px; min-width: 30px; font-size: 3rem">{{ $it->workers[0]->comment }}</td>
+                                <td style="max-width: 40px; min-width: 30px; font-size: 1.5rem">{{ $it->workers[0]->comment }}</td>
  
                                 <td>{{ $it->surname." ".$it->name_man }}<br>{{ $it->surname2 }}</td>
  
@@ -95,7 +95,9 @@ $user = $worker-&gt;users
                         <div class="cabinet__stats-line">
                             <span style="width:{{ $persent }}%"></span>
                         </div>
-                        <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
+                        @if($persent < 80)
+                            <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
+                        @endif
                     </div>
                 </div>
...	...	@@ -29,9 +29,15 @@ class Tools
29	29	{
30	30	$persent = 0;
31	31
32		- if (
33		- (!empty($Worker->users->surname)) &&
	32	+ if((!empty($Worker->users->surname)) &&
34	33	(!empty($Worker->users->name_man)) &&
	34	+ (!empty($Worker->telephone)) &&
	35	+ (!empty($Worker->email))
	36	+ ) {
	37	+ $persent += 10;
	38	+ }
	39	+
	40	+ if (
35	41	(!empty($Worker->users->surname2)) &&
36	42	(!empty($Worker->old_year)) &&
37	43	($Worker->job_titles->count() > 0) &&
...	...	@@ -44,18 +50,16 @@ class Tools
44	50	(!empty($Worker->confirmation_work_for_vvp)) &&
45	51	(!empty($Worker->military_id_available)) &&
46	52	(!empty($Worker->city)) &&
47		- (!empty($Worker->telephone)) &&
48		- (!empty($Worker->email)) &&
49	53	(!empty($Worker->telephone2))
50	54	) {
51		- $persent += 50;
	55	+ $persent += 40;
52	56	}
53	57
54	58	if ($Worker->sertificate->count() > 0) {
55	59	$persent += 10;
56	60	}
57	61
58		- if ($Worker->infobloks->count() > 0) {
	62	+ if ($Worker->infobloks->where(fn($ib) => $ib->pivot->status === 1)->count() > 0) {
59	63	$persent += 10;
60	64	}
61	65
...	...	@@ -76,7 +76,7 @@
76	76	<div class="filters">
77	77	<div class="filters__label">Показано {{ $educations->firstItem() }} – {{ $educations->lastItem() }} из {{ $count_edu }} результатов поиска</div>
78	78	<div class="filters__body">
79		- <div class="select filters__select">
	79	+ {{--<div class="select filters__select">
80	80	<select class="js-select2" id="sort_ajax" name="sort_ajax">
81	81	<option value="default">Сортировка (по умолчанию)</option>
82	82	<option value="name_up">По имени (возрастание)</option>
...	...	@@ -84,7 +84,7 @@
84	84	<option value="created_at_up">По дате (возрастание)</option>
85	85	<option value="created_at_down">По дате (убывание)</option>
86	86	</select>
87		- </div>
	87	+ </div>--}}
88	88	</div>
89	89	</div>
90	90
...	...	@@ -161,7 +161,7 @@
161	161	@if ($users->count())
162	162	@foreach ($users as $key => $it)
163	163	<tr>
164		- <td style="max-width: 40px; min-width: 30px; font-size: 3rem">{{ $it->workers[0]->comment }}</td>
	164	+ <td style="max-width: 40px; min-width: 30px; font-size: 1.5rem">{{ $it->workers[0]->comment }}</td>
165	165
166	166	<td>{{ $it->surname." ".$it->name_man }}<br>{{ $it->surname2 }}</td>
167	167
...	...	@@ -95,7 +95,9 @@ $user = $worker->users
95	95	<div class="cabinet__stats-line">
96	96	<span style="width:{{ $persent }}%"></span>
97	97	</div>
98		- <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
	98	+ @if($persent < 80)
	99	+ <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
	100	+ @endif
99	101	</div>
100	102	</div>
101	103