modifications/fixes

Hayk Nazaryan
1 parent f40a8426f2
Showing 10 changed files with 25 additions and 25 deletions Side-by-side Diff
app/Http/Controllers/Admin/Ad_EmployersController.php
app/Http/Controllers/EmployerController.php
app/Http/Controllers/WorkerController.php
public/css/general.css
resources/views/info_company.blade.php
resources/views/js/modals.blade.php
resources/views/list_vacancies.blade.php
resources/views/resume/resume_blocks.blade.php
resources/views/vacance-item.blade.php
resources/views/workers/cabinet.blade.php
@@ -37,7 +37,7 @@ class Ad_EmployersController extends Controller
         $all_ad = Ad_employer::with('employer')->with('jobs')
             ->where('is_remove', '0')->get()->count();
  
-        $ad_employers = Ad_employer::where('is_remove', '0');
+        $ad_employers = Ad_employer::where(['is_remove' => '0','active_is' => '1']);
  
         $find_job = "";
         if (isset($request->category_job)) {
@@ -312,7 +312,7 @@ class EmployerController extends Controller
         $ad_employer->updated_at = now();
         $ad_employer->save();
  
-        return redirect()->route('employer.vacancy_list')
+        return redirect(url()->previous())
             ->with('success', 'Вакансия поднята');
     }
  
@@ -127,7 +127,7 @@ class WorkerController extends Controller
         }
  
         $resumes = $resumes->get()->filter(function ($worker) {
-            return Tools::getWorkerProfilePercent($worker) >= 50;
+            return Tools::getWorkerProfilePercent($worker) >= 40;
         });
  
         $res_count = $resumes->count();
@@ -70,3 +70,7 @@
     left: 6px;
     bottom: 6px;
 }
+
+.main__resume-base-body-item-inner .resume-base-body-phone a, .main__resume-base-body-item-inner .resume-base-body-email a {
+    user-select: text;
+}
@@ -238,7 +238,7 @@
                                                    class="button button_light main__employer-page-two-item-button">Подробнее</a>-->
                                             </div>
                                             <div class="main__employer-page-two-item-bottom">
-                                                <div class="main__employer-page-two-item-bottom-date">{{ $job->updated_at }}</div>
+                                                <div class="main__employer-page-two-item-bottom-date">{{ date('H:i, d.m.Y', strtotime($job->updated_at)) }}</div>
                                                 <button type="button"
                                                         class="like main__employer-page-two-item-bottom-like js-toggle">
                                                     <svg>
@@ -141,12 +141,10 @@
         var login_val = field_login.val();
         var pwd_val = field_pwd.val();
  
-        console.log('login: '+login_val+' password: '+pwd_val);
-
         $.ajax({
             type: "GET",
             url: "{{ route('login') }}",
-            data: "email="+login_val+"&password="+pwd_val,
+            data: "email=" + encodeURIComponent(login_val) + "&password=" + encodeURIComponent(pwd_val),
             success: function (data) {
                 console.log('Вход в систему');
                 console.log(data);
@@ -159,8 +157,6 @@
                     console.log(d['ERROR']);
                     $('#message_error').html(d['ERROR']);
                 }
-                //console.log(d['REDIRECT']);
-                //$('#block_1').html(data);
             },
             headers: {
                 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -213,7 +213,7 @@
                                 @else
                                     @if (App\Classes\StatusUser::Status() == 1)
                                         <?php
-                                            if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 50) {
+                                            if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 40) {
                                                 $buttonId = 'ask_comment';
                                             } else {
                                                 $buttonId = 'ask_percent';
@@ -237,7 +237,7 @@
                                 </a>
                             </div>
                             <div class="main__employer-page-two-item-bottom">
-                                <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y', strtotime($Q->updated_at)) }}</div>
+                                <div class="main__employer-page-two-item-bottom-date">{{ date('H:i, d.m.Y', strtotime($Q->updated_at)) }}</div>
                                 @guest
                                     <button type="button"
                                             data-fancybox
@@ -84,15 +84,15 @@
             <div>
                 <b>Желаемые вакансии:</b>
                 <span>
-                                            @if ($res->job_titles->count())
-                                                @foreach ($res->job_titles as $job_title)
-                                                    {{ $job_title->name }}
-                                                    @if (!$loop->last) / @endif
-                                                @endforeach
-                                            @else
-                                            -
-                                            @endif
-                                        </span>
+                    @if ($res->job_titles->count())
+                        @foreach ($res->job_titles as $job_title)
+                            {{ $job_title->name }}
+                            @if (!$loop->last) / @endif
+                        @endforeach
+                    @else
+                    -
+                    @endif
+                </span>
             </div>
             <div>
                 <b>Наличие подтверждения для работы на ВВП:</b>
@@ -110,7 +110,7 @@
                 <b>Уровень английского:</b>
                 <span>{{ $res->english_level ?? '-' }}</span>
             </div>
-            <div>
+            <div class="resume-base-body-phone">
                 <b>Номер телефона:</b>
                 <span><a href="tel:{{ $res->telephone }}">{{ $res->telephone ?? '-' }}</a></span>
             </div>
@@ -118,7 +118,7 @@
                 <b>Дата готовности к посадке:</b>
                 <span>{{ $res->ready_boart_date ?? '-' }}</span>
             </div>
-            <div>
+            <div class="resume-base-body-email">
                 <b>E-mail:</b>
                 <span><a href="mailto:{{ $res->email }}">{{ $res->email }}</a></span>
             </div>
@@ -102,7 +102,7 @@
                         @else
                             @if (App\Classes\StatusUser::Status() == 1)
                                     <?php
-                                    if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 50) {
+                                    if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 40) {
                                         $buttonId = 'ask_comment';
                                     } else {
                                         $buttonId = 'ask_percent';
@@ -99,8 +99,8 @@ $user = $worker-&gt;users
                         <div class="cabinet__stats-line">
                             <span style="width:{{ $persent }}%"></span>
                         </div>
-                        @if($persent < 80)
-                            <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
+                        @if($persent < 40)
+                            <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 40%</div>
                         @endif
                     </div>
                 </div>
...	...	@@ -37,7 +37,7 @@ class Ad_EmployersController extends Controller
37	37	$all_ad = Ad_employer::with('employer')->with('jobs')
38	38	->where('is_remove', '0')->get()->count();
39	39
40		- $ad_employers = Ad_employer::where('is_remove', '0');
	40	+ $ad_employers = Ad_employer::where(['is_remove' => '0','active_is' => '1']);
41	41
42	42	$find_job = "";
43	43	if (isset($request->category_job)) {
...	...	@@ -312,7 +312,7 @@ class EmployerController extends Controller
312	312	$ad_employer->updated_at = now();
313	313	$ad_employer->save();
314	314
315		- return redirect()->route('employer.vacancy_list')
	315	+ return redirect(url()->previous())
316	316	->with('success', 'Вакансия поднята');
317	317	}
318	318
...	...	@@ -127,7 +127,7 @@ class WorkerController extends Controller
127	127	}
128	128
129	129	$resumes = $resumes->get()->filter(function ($worker) {
130		- return Tools::getWorkerProfilePercent($worker) >= 50;
	130	+ return Tools::getWorkerProfilePercent($worker) >= 40;
131	131	});
132	132
133	133	$res_count = $resumes->count();
...	...	@@ -70,3 +70,7 @@
70	70	left: 6px;
71	71	bottom: 6px;
72	72	}
	73	+
	74	+.main__resume-base-body-item-inner .resume-base-body-phone a, .main__resume-base-body-item-inner .resume-base-body-email a {
	75	+ user-select: text;
	76	+}
...	...	@@ -238,7 +238,7 @@
238	238	class="button button_light main__employer-page-two-item-button">Подробнее</a>-->
239	239	</div>
240	240	<div class="main__employer-page-two-item-bottom">
241		- <div class="main__employer-page-two-item-bottom-date">{{ $job->updated_at }}</div>
	241	+ <div class="main__employer-page-two-item-bottom-date">{{ date('H:i, d.m.Y', strtotime($job->updated_at)) }}</div>
242	242	<button type="button"
243	243	class="like main__employer-page-two-item-bottom-like js-toggle">
244	244	<svg>
...	...	@@ -141,12 +141,10 @@
141	141	var login_val = field_login.val();
142	142	var pwd_val = field_pwd.val();
143	143
144		- console.log('login: '+login_val+' password: '+pwd_val);
145		-
146	144	$.ajax({
147	145	type: "GET",
148	146	url: "{{ route('login') }}",
149		- data: "email="+login_val+"&password="+pwd_val,
	147	+ data: "email=" + encodeURIComponent(login_val) + "&password=" + encodeURIComponent(pwd_val),
150	148	success: function (data) {
151	149	console.log('Вход в систему');
152	150	console.log(data);
...	...	@@ -159,8 +157,6 @@
159	157	console.log(d['ERROR']);
160	158	$('#message_error').html(d['ERROR']);
161	159	}
162		- //console.log(d['REDIRECT']);
163		- //$('#block_1').html(data);
164	160	},
165	161	headers: {
166	162	'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
...	...	@@ -213,7 +213,7 @@
213	213	@else
214	214	@if (App\Classes\StatusUser::Status() == 1)
215	215	<?php
216		- if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 50) {
	216	+ if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 40) {
217	217	$buttonId = 'ask_comment';
218	218	} else {
219	219	$buttonId = 'ask_percent';
...	...	@@ -237,7 +237,7 @@
237	237	</a>
238	238	</div>
239	239	<div class="main__employer-page-two-item-bottom">
240		- <div class="main__employer-page-two-item-bottom-date">{{ date('d.m.Y', strtotime($Q->updated_at)) }}</div>
	240	+ <div class="main__employer-page-two-item-bottom-date">{{ date('H:i, d.m.Y', strtotime($Q->updated_at)) }}</div>
241	241	@guest
242	242	<button type="button"
243	243	data-fancybox
...	...	@@ -84,15 +84,15 @@
84	84	<div>
85	85	<b>Желаемые вакансии:</b>
86	86	<span>
87		- @if ($res->job_titles->count())
88		- @foreach ($res->job_titles as $job_title)
89		- {{ $job_title->name }}
90		- @if (!$loop->last) / @endif
91		- @endforeach
92		- @else
93		- -
94		- @endif
95		- </span>
	87	+ @if ($res->job_titles->count())
	88	+ @foreach ($res->job_titles as $job_title)
	89	+ {{ $job_title->name }}
	90	+ @if (!$loop->last) / @endif
	91	+ @endforeach
	92	+ @else
	93	+ -
	94	+ @endif
	95	+ </span>
96	96	</div>
97	97	<div>
98	98	<b>Наличие подтверждения для работы на ВВП:</b>
...	...	@@ -110,7 +110,7 @@
110	110	<b>Уровень английского:</b>
111	111	<span>{{ $res->english_level ?? '-' }}</span>
112	112	</div>
113		- <div>
	113	+ <div class="resume-base-body-phone">
114	114	<b>Номер телефона:</b>
115	115	<span><a href="tel:{{ $res->telephone }}">{{ $res->telephone ?? '-' }}</a></span>
116	116	</div>
...	...	@@ -118,7 +118,7 @@
118	118	<b>Дата готовности к посадке:</b>
119	119	<span>{{ $res->ready_boart_date ?? '-' }}</span>
120	120	</div>
121		- <div>
	121	+ <div class="resume-base-body-email">
122	122	<b>E-mail:</b>
123	123	<span><a href="mailto:{{ $res->email }}">{{ $res->email }}</a></span>
124	124	</div>
...	...	@@ -102,7 +102,7 @@
102	102	@else
103	103	@if (App\Classes\StatusUser::Status() == 1)
104	104	<?php
105		- if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 50) {
	105	+ if (\App\Classes\Tools::getWorkerProfilePercent(Auth()->user()->workers[0]) >= 40) {
106	106	$buttonId = 'ask_comment';
107	107	} else {
108	108	$buttonId = 'ask_percent';
...	...	@@ -99,8 +99,8 @@ $user = $worker->users
99	99	<div class="cabinet__stats-line">
100	100	<span style="width:{{ $persent }}%"></span>
101	101	</div>
102		- @if($persent < 80)
103		- <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 80%</div>
	102	+ @if($persent < 40)
	103	+ <div class="cabinet__stats-bottom">Заполните профиль, чтобы повысить процент анкеты на 40%</div>
104	104	@endif
105	105	</div>
106	106	</div>