From 567d6161f9a1a6c8a9ddd98a05e170253105b502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Wed, 8 Nov 2023 19:06:54 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B4=D0=B0=D0=BA=D1=86=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BE=D0=B4=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/EmployersController.php |   18 ++++-
 resources/views/admin/education/form.blade.php     |   81 ++++++++++----------
 resources/views/admin/education/index.blade.php    |   11 ++-
 resources/views/admin/employer/index.blade.php     |   46 ++++++++++-
 4 files changed, 109 insertions(+), 47 deletions(-)

diff --git a/app/Http/Controllers/Admin/EmployersController.php b/app/Http/Controllers/Admin/EmployersController.php
index caa16b6..fddae54 100644
--- a/app/Http/Controllers/Admin/EmployersController.php
+++ b/app/Http/Controllers/Admin/EmployersController.php
@@ -18,18 +18,28 @@ class EmployersController extends Controller
 {
     public function index(Request $request) {
         //$all_employer = User::where('is_worker', '0')->count();
-
+       $all_public = -1;
+       $all_status = -1;
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
             $user->update($request->all());
         }
 
-        $users = User::with('employers')->select(['users.*','users.id as usr_id', 'emp.id as emp_id', 'emp.logo as emp_logo', 'emp.*'])
+        $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.*'])
             ->join('employers as emp','emp.user_id','users.id')
-            ->where('users.is_worker', '0')->Realuser()->Notadmin();
+            ->where('users.is_worker', '0')->Realuser(); //->Notadmin();
         $all_employer = $users->count();
 
+        $all_public = Employer::where('status_hidden', '=', '0')->
+                                count();
+
+        $all_status = Employer::where(function($query) {
+                                    $query->Where('category', '=', 'Не оплачен')
+                                        ->orWhere('category', '=', 'Не определен')
+                                        ->orWhere('category', '=', 'Согласование');
+                                })->count();
+
         $find_cat = "";
         if (isset($request->category)) {
             if ($request->category != 'Все категории') {
@@ -61,6 +71,8 @@ class EmployersController extends Controller
                                                             'find_key',
                                                                       'find_cat',
                                                                       'all_employer',
+                                                                      'all_public',
+                                                                      'all_status',
                                                                       'select_category'));
         }
     }
diff --git a/resources/views/admin/education/form.blade.php b/resources/views/admin/education/form.blade.php
index 65bf479..e697afb 100644
--- a/resources/views/admin/education/form.blade.php
+++ b/resources/views/admin/education/form.blade.php
@@ -20,45 +20,6 @@
     </label><br>
 
     <label class="block text-sm">
-        <span class="text-gray-700 dark:text-gray-400">Адрес</span>
-        <input name="address" id="address"
-               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"
-               placeholder="Адрес" value="{{ old('address') ?? $education->address ?? '' }}"
-        />
-        @error('address')
-        <span class="text-xs text-red-600 dark:text-red-400">
-                  {{ $message }}
-            </span>
-        @enderror
-    </label><br>
-
-    <label class="block text-sm">
-        <span class="text-gray-700 dark:text-gray-400">Email</span>
-        <input name="email" id="email"
-               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"
-               placeholder="Email" value="{{ old('email') ?? $education->email ?? '' }}"
-        />
-        @error('email')
-        <span class="text-xs text-red-600 dark:text-red-400">
-                  {{ $message }}
-            </span>
-        @enderror
-    </label><br>
-
-    <label class="block text-sm">
-        <span class="text-gray-700 dark:text-gray-400">Телефон</span>
-        <input name="telephone" id="telephone"
-               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"
-               placeholder="Телефон" value="{{ old('telephone') ?? $education->telephone ?? '' }}"
-        />
-        @error('telephone')
-        <span class="text-xs text-red-600 dark:text-red-400">
-                  {{ $message }}
-            </span>
-        @enderror
-    </label><br>
-
-    <label class="block text-sm">
         <span class="text-gray-700 dark:text-gray-400">Текст</span>
         <textarea class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray ckeditor_" name="text" placeholder="Текст (html)" required
                   rows="10">{{ old('text') ?? $education->text ?? '' }}</textarea>
@@ -85,6 +46,47 @@
         @endisset
     </label><br>
 
+    <hr>
+    <h5 class="text-gray-700 dark:text-gray-400">Контакты: </h5>
+        <label class="block text-sm">
+            <span class="text-gray-700 dark:text-gray-400">Адрес</span>
+            <input name="address" id="address"
+                   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"
+                   placeholder="Адрес" value="{{ old('address') ?? $education->address ?? '' }}"
+            />
+            @error('address')
+            <span class="text-xs text-red-600 dark:text-red-400">
+                  {{ $message }}
+            </span>
+            @enderror
+        </label><br>
+
+        <label class="block text-sm">
+            <span class="text-gray-700 dark:text-gray-400">Email</span>
+            <input name="email" id="email"
+                   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"
+                   placeholder="Email" value="{{ old('email') ?? $education->email ?? '' }}"
+            />
+            @error('email')
+            <span class="text-xs text-red-600 dark:text-red-400">
+                  {{ $message }}
+            </span>
+            @enderror
+        </label><br>
+
+        <label class="block text-sm">
+            <span class="text-gray-700 dark:text-gray-400">Телефон</span>
+            <input name="telephone" id="telephone"
+                   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"
+                   placeholder="Телефон" value="{{ old('telephone') ?? $education->telephone ?? '' }}"
+            />
+            @error('telephone')
+            <span class="text-xs text-red-600 dark:text-red-400">
+                  {{ $message }}
+            </span>
+            @enderror
+        </label><br>
+
     <div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">
         <div>
             <button type="submit" class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
@@ -100,6 +102,7 @@
 
     @isset($education)
         <hr>
+        <h5 class="text-gray-700 dark:text-gray-400">Специалитеты и категории:</h5>
         <form method="GET" action="{{ route('admin.add-program-education') }}">
             <label class="block text-sm">
                 <span class="text-gray-700 dark:text-gray-400">Категория образования</span>
diff --git a/resources/views/admin/education/index.blade.php b/resources/views/admin/education/index.blade.php
index 876db53..7fa824f 100644
--- a/resources/views/admin/education/index.blade.php
+++ b/resources/views/admin/education/index.blade.php
@@ -25,7 +25,7 @@
                     <th class="px-4 py-3">№</th>
                     <th class="px-4 py-3">Название образования</th>
                     <th class="px-4 py-3">Редактировать</th>
-                    <th class="px-4 py-3">Дата создания</th>
+                    <th class="px-4 py-3">Дата создан/изменен</th>
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
@@ -47,7 +47,14 @@
                             </form>
                         </td>
                          <td class="px-4 py-3">
-                            {{ date('d.m.Y', strtotime($cat->created_at))}}
+                             <div class="flex items-center text-sm">
+                                 <div>
+                                     <p class="font-semibold">{{ date('d.m.Y', strtotime($cat->created_at)) }}</p>
+                                     <p class="text-xs text-gray-600 dark:text-gray-400">
+                                         {{ date('d.m.Y', strtotime($cat->updated_at)) }}
+                                     </p>
+                                 </div>
+                             </div>
                         </td>
                     </tr>
                 @endforeach
diff --git a/resources/views/admin/employer/index.blade.php b/resources/views/admin/employer/index.blade.php
index 8859374..4202ed8 100644
--- a/resources/views/admin/employer/index.blade.php
+++ b/resources/views/admin/employer/index.blade.php
@@ -80,6 +80,40 @@
                 </p>
             </div>
         </div>
+
+        <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
+            <div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
+                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                    <path
+                        d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z"></path>
+                </svg>
+            </div>
+            <div>
+                <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
+                    Опубликованых
+                </p>
+                <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
+                    {{ $all_public }}
+                </p>
+            </div>
+        </div>
+
+        <div class="flex items-center p-4 bg-white rounded-lg shadow-xs dark:bg-gray-800">
+            <div class="p-3 mr-4 text-orange-500 bg-orange-100 rounded-full dark:text-orange-100 dark:bg-orange-500">
+                <svg class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20">
+                    <path
+                        d="M13 6a3 3 0 11-6 0 3 3 0 016 0zM18 8a2 2 0 11-4 0 2 2 0 014 0zM14 15a4 4 0 00-8 0v3h8v-3zM6 8a2 2 0 11-4 0 2 2 0 014 0zM16 18v-3a5.972 5.972 0 00-.75-2.906A3.005 3.005 0 0119 15v3h-3zM4.75 12.094A5.973 5.973 0 004 15v3H1v-3a3 3 0 013.75-2.906z"></path>
+                </svg>
+            </div>
+            <div>
+                <p class="mb-2 text-sm font-medium text-gray-600 dark:text-gray-400">
+                    На рассмотрении
+                </p>
+                <p class="text-lg font-semibold text-gray-700 dark:text-gray-200">
+                    {{ $all_status }}
+                </p>
+            </div>
+        </div>
     </div>
 
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
@@ -90,11 +124,12 @@
                     class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
                 >
                     <th class="px-4 py-3">№</th>
+                    <th class="px-4 py-3">ID</th>
                     <th class="px-4 py-3">Лого</th>
-                    <th class="px-4 py-3">Название компании/Email/Тел/Пароль</th>
+                    <th class="px-4 py-3">Компания/Email/Тел/Пароль</th>
                     <th class="px-4 py-3">Категория</th>
-                    <th class="px-4 py-3">Комментарий</th>
-                    <th class="px-4 py-3">Дата регистрации</th>
+                    <th class="px-4 py-3">Коммент.</th>
+                    <th class="px-4 py-3">Дата регист.</th>
                     <th class="px-4 py-3">Редакт.</th>
                 </tr>
                 </thead>
@@ -105,6 +140,11 @@
                             {{$user->id}}
                         </td>
                         <td class="px-4 py-3">
+                          @if (isset($user->code_id))
+                            {{$user->code_id}}
+                          @endif
+                        </td>
+                        <td class="px-4 py-3">
                             @if (isset($user->emp_logo) && ($user->emp_logo))
                                 <div class="flex items-center text-sm">
                                     <div
-- 
1.7.10.4