From c9a440a1d1de17965a5cee22ec89c89c6df12d61 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: Tue, 14 Nov 2023 13:44:04 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D0?=
 =?UTF-8?q?=BD=D0=B8=D0=B5,=20=D1=82=D0=B0=D0=B1=D1=8B,=202-=D1=87=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/EducationController.php |    1 -
 resources/views/admin/education/form.blade.php     |   71 +++++++++++---------
 .../views/admin/education/program-edit.blade.php   |    7 +-
 resources/views/admin/education/program.blade.php  |    5 ++
 4 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/Admin/EducationController.php b/app/Http/Controllers/Admin/EducationController.php
index 56db14f..b0d73d3 100644
--- a/app/Http/Controllers/Admin/EducationController.php
+++ b/app/Http/Controllers/Admin/EducationController.php
@@ -137,5 +137,4 @@ class EducationController extends Controller
 
         return redirect()->route('admin.education.edit', ['education' => $education]);
     }
-
 }
diff --git a/resources/views/admin/education/form.blade.php b/resources/views/admin/education/form.blade.php
index 3f2a6ac..030e1a4 100644
--- a/resources/views/admin/education/form.blade.php
+++ b/resources/views/admin/education/form.blade.php
@@ -147,6 +147,7 @@
                     @endphp
 
                     @foreach ($program as $pro)
+                        @php $name_tab = $pro->level; @endphp
                         @if ((!empty($level)) && ($level <> $pro->level))
                                 </tbody>
                                 </table>
@@ -156,7 +157,14 @@
 
                         @if ($bool == true)
                             <div class="tabs__item js_tabs_item @php echo($i>1) ? 'hidden' : ''; @endphp" data-id="{{$i}}">
-                                        <table class="mb-4 w-full whitespace-no-wrap">
+                                <form action="{{ route('admin.add-program-education') }}" method="GET" class="flex flex-col flex-wrap mb-4 md:flex-row md:space-x-4">
+                                    <div>
+                                        <input type="hidden" name="id" value="{{ $education->id }}"/>
+                                        <input type="hidden" name="level" value="{{$name_tab}}"/>
+                                        <button type="submit" class="mt-4 px-4 py-2 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-lg active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">Добавить</button>
+                                    </div>
+                                </form>
+                                <table class="mb-4 w-full whitespace-no-wrap">
                                             <thead>
                                             <tr
                                                 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"
@@ -180,18 +188,17 @@
                                         <div>
                                             <p class="font-semibold">Специальность: </p>
                                             <p class="text-xs text-gray-600 dark:text-gray-400">
-                                                {{$pro->name}}
+                                                {{ mb_strimwidth($pro->name, 0, 50, "...") }}
                                             </p>
                                         </div>
                                     </div>
                                 </td>
                                 <td class="px-4 py-3 text-sm">
-                                    <span class="text-gray-700 dark:text-gray-400">Описание: {{$pro->text}}</span>
+                                    <span class="text-gray-700 dark:text-gray-400">Описание: {{ mb_strimwidth($pro->text, 0, 100, "...")}}</span>
                                 </td>
                                 <td class="px-4 py-3 text-xs">
                                     <a href="{{ route('admin.edit-program-education', ['program' => $pro->id, 'education' => $education->id]) }}">Изменить</a> |
                                     <a href="{{ route('admin.delete-program-education', ['program' => $pro->id, 'education' => $education->id]) }}">Удалить</a>
-
                                 </td>
                             </tr>
                     @endforeach
@@ -201,9 +208,9 @@
     @endisset
 </div>
 
-<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>
+<!--<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>-->
 
-<!--<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>-->
+<script src="{{ asset('./ckeditor/ckeditor.js') }}"></script>
 <script>
     CKEDITOR.replace( 'text', {
         filebrowserUploadUrl: "{{route('ckeditor.image-upload', ['_token' => csrf_token() ])}}",
@@ -233,7 +240,13 @@
  const tabsBtns = tabsButtons.querySelectorAll('.js_tabs_btn');
  const id = Date.now();
 
- if (tabsInput.dataset.edit) {
+
+ if (tabsBtns.length >= qty) {
+     console.log('Ветка выполнена');
+     e.preventDefault();
+ }
+
+ /*if (tabsInput.dataset.edit) {
 
      tabsBtns.forEach(btn => {
          if (tabsInput.dataset.edit === btn.dataset.id) {
@@ -267,7 +280,7 @@
          tabsContent.innerHTML += getTabsItemTemplate(id, 'hidden');
     }
  }
- }
+ }*/
 
  tabsInput.value = '';
  addDisabledBtnStatus(tabsSubmitBtn);
@@ -275,13 +288,11 @@
  });
 
  tabsInput.addEventListener('input', () => {
-
- if (tabsInput.value !== '') {
- removeDisabledBtnStatus(tabsSubmitBtn);
- } else {
- addDisabledBtnStatus(tabsSubmitBtn);
- }
-
+     if (tabsInput.value !== '') {
+        removeDisabledBtnStatus(tabsSubmitBtn);
+     } else {
+        addDisabledBtnStatus(tabsSubmitBtn);
+     }
  });
 
  tabsButtons.addEventListener('click', (e) => {
@@ -305,17 +316,13 @@
  });
 
  tabsButtons.addEventListener('dblclick', (e) => {
+     const target = e.target.closest('.js_tabs_btn');
 
- const target = e.target.closest('.js_tabs_btn');
-
- if (target) {
-
- tabsInput.value = target.dataset.btn;
- tabsInput.dataset.edit = target.dataset.id;
- removeDisabledBtnStatus(tabsSubmitBtn);
-
- }
-
+     if (target) {
+         tabsInput.value = target.dataset.btn;
+         tabsInput.dataset.edit = target.dataset.id;
+         removeDisabledBtnStatus(tabsSubmitBtn);
+     }
  });
 
  function getTabsBtnTemplate(btnName, id) {
@@ -441,21 +448,21 @@
  }
 
  function addDisabledBtnStatus(btn) {
- btn.disabled = true;
- btn.classList.add('opacity-50', 'cursor-not-allowed');
- btn.classList.remove('active:bg-purple-600', 'hover:bg-purple-700', 'focus:shadow-outline-purple');
+     btn.disabled = true;
+     btn.classList.add('opacity-50', 'cursor-not-allowed');
+     btn.classList.remove('active:bg-purple-600', 'hover:bg-purple-700', 'focus:shadow-outline-purple');
  }
 
  function removeDisabledBtnStatus(btn) {
- btn.disabled = false;
- btn.classList.remove('opacity-50', 'cursor-not-allowed');
- btn.classList.add('active:bg-purple-600', 'hover:bg-purple-700', 'focus:shadow-outline-purple');
+     btn.disabled = false;
+     btn.classList.remove('opacity-50', 'cursor-not-allowed');
+     btn.classList.add('active:bg-purple-600', 'hover:bg-purple-700', 'focus:shadow-outline-purple');
  }
 
  }
-
  console.log('main.js init');
 
  });
+
 </script>
 
diff --git a/resources/views/admin/education/program-edit.blade.php b/resources/views/admin/education/program-edit.blade.php
index 0376d3c..558f6c2 100644
--- a/resources/views/admin/education/program-edit.blade.php
+++ b/resources/views/admin/education/program-edit.blade.php
@@ -6,7 +6,7 @@
 
         <div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">
             <input type="hidden" id="education_id" name="education_id" value="{{ $id_education }}"/>
-            <input type="hidden" id="level" name="level" value="{{ $program->name }}"/>
+            <input type="hidden" id="level" name="level" value="{{ $program->level }}"/>
 
             <label class="block text-sm">
                 <span class="text-gray-700 dark:text-gray-400">Название специализации</span>
@@ -37,6 +37,11 @@
                     <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">
                         Сохранить
                     </button>
+
+                    <a href="{{ route('admin.education.edit', ['education' => $id_education]) }}"
+                       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"
+                       style="display: -webkit-inline-box; height: 30px!important;"
+                    >Назад</a>
                 </div>
             </div>
         </div>
diff --git a/resources/views/admin/education/program.blade.php b/resources/views/admin/education/program.blade.php
index 85547e3..3d7ca1e 100644
--- a/resources/views/admin/education/program.blade.php
+++ b/resources/views/admin/education/program.blade.php
@@ -37,6 +37,11 @@
                     <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">
                         Сохранить
                     </button>
+
+                    <a href="{{ route('admin.education.edit', ['education' => $id_education]) }}"
+                       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"
+                       style="display: -webkit-inline-box; height: 30px!important;"
+                    >Назад</a>
                 </div>
             </div>
         </div>
-- 
1.7.10.4