From 1c55e51e33edfc41bda628303bf1cb5d43351a1e Mon Sep 17 00:00:00 2001
From: Sergey Panarin <sp@nologostudio.ru>
Date: Fri, 12 Jul 2024 12:12:50 +0200
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BF=D0=BE=203?=
 =?UTF-8?q?9=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/EducationController.php |    2 ++
 resources/views/ajax/education.blade.php     |    5 ----
 resources/views/education/index.blade.php    |    9 ------
 resources/views/education/show.blade.php     |   39 ++++++++++++++++++++------
 4 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/EducationController.php b/app/Http/Controllers/EducationController.php
index 9ed250f..10d4c2d 100644
--- a/app/Http/Controllers/EducationController.php
+++ b/app/Http/Controllers/EducationController.php
@@ -26,6 +26,8 @@ class EducationController extends Controller
                 case 'default': $educations = $educations->orderBy('id')->orderby('updated_at'); break;
                 default: $educations = $educations->orderBy('id')->orderby('updated_at'); break;
             }
+        } else {
+            $educations->orderBy('name');
         }
 
         $count_edu = $educations->count();
diff --git a/resources/views/ajax/education.blade.php b/resources/views/ajax/education.blade.php
index aa0f3a5..5cbaeb7 100644
--- a/resources/views/ajax/education.blade.php
+++ b/resources/views/ajax/education.blade.php
@@ -4,11 +4,6 @@
             <div class="main__ads-item">
                 <div class="main__ads-item-pic">
                     <img src="@if (!empty($edu->image)) {{ asset(Storage::url($edu->image)) }} @else {{ asset('images/education.jpg') }} @endif" alt="{{ $edu->name }}">
-                    <span>
-                                        <svg>
-                                            <use xlink:href="{{ asset('images/sprite.svg#v') }}"></use>
-                                        </svg>
-                                </span>
                 </div>
                 <div class="main__ads-item-body">
                     <b>{{ $edu->name }}</b>
diff --git a/resources/views/education/index.blade.php b/resources/views/education/index.blade.php
index c0c5067..66ee7dd 100644
--- a/resources/views/education/index.blade.php
+++ b/resources/views/education/index.blade.php
@@ -2,7 +2,6 @@
 
 @section('scripts')
     <script>
-        console.log('Test system');
         $(document).on('change', '#sort_ajax', function() {
             var this_ = $(this);
             var val_ = this_.val();
@@ -31,11 +30,8 @@
         $(document).ready(function(){
             var sel = $('#select2-sort_ajax-container');
             var key = getUrlParameter('sort');
-            console.log(sel);
-            console.log(key);
 
             if (key !=='') {
-                console.log(key);
                 switch (key) {
                     case "default": sel.html('Сортировка (по умолчанию)'); break;
                     case "name_up": sel.html('По имени (возрастание)'); break;
@@ -94,11 +90,6 @@
                         <div class="main__ads-item">
                             <div class="main__ads-item-pic">
                                 <img src="@if (!empty($edu->image)) {{ asset(Storage::url($edu->image)) }} @else {{ asset('images/education.jpg') }} @endif" alt="{{ $edu->name }}">
-                                <span>
-                                        <svg>
-                                            <use xlink:href="{{ asset('images/sprite.svg#v') }}"></use>
-                                        </svg>
-                                </span>
                             </div>
                             <div class="main__ads-item-body">
                                 <b>{{ $edu->name }}</b>
diff --git a/resources/views/education/show.blade.php b/resources/views/education/show.blade.php
index 94d8fca..512cb13 100644
--- a/resources/views/education/show.blade.php
+++ b/resources/views/education/show.blade.php
@@ -3,7 +3,22 @@
 @section('scripts')
 <script>
     $(function(){
-        $( ".accordion").accordion();
+        $('ul.accordion > li.accordion-item').click(function(e){
+            if (e.target.closest('.accordion-sub')) {
+                return;
+            }
+
+            var this_li = $(this);
+            var thumb = this_li.find('> .accordion-thumb');
+
+            if (thumb.hasClass('ui-state-active')){
+                thumb.removeClass('ui-state-active');
+                this_li.find('> .accordion-panel').hide(500);
+            } else {
+                thumb.addClass('ui-state-active');
+                this_li.find('> .accordion-panel').show(500);
+            }
+        });
 
         $('ul.accordion-sub li.accordion-item').click(function(){
             var this_li = $(this);
@@ -16,12 +31,12 @@
                 added_height = 0;
             }
 
-            parent_ul.find('.accordion-panel').hide(500);
-
             if (thumb.hasClass('ui-state-active')){
+                this_li.find('.accordion-panel').hide(500);
                 thumb.removeClass('ui-state-active');
 
-                var panel_height = panel.height() - parseInt(added_height);
+                var reduce_height = this_li.find('.accordion-panel').height() + 20;
+                var panel_height = panel.height() - parseInt(reduce_height);
                 panel.animate({height: panel_height + "px"}, {
                     easing: 'swing',
                     duration: 500,
@@ -29,13 +44,17 @@
                         panel.css('height', 'auto');
                     }
                 });
-                panel.data('added-height', 0);
+
+                added_height = parseInt(added_height) - parseInt(reduce_height);
+                if (added_height < 0){
+                    added_height = 0;
+                }
+                panel.data('added-height', added_height);
             } else {
-                parent_ul.find('.accordion-thumb').removeClass('ui-state-active');
                 thumb.addClass('ui-state-active');
 
                 var add_height = this_li.find('.accordion-panel').height() + 20;
-                var panel_height = panel.height() + parseInt(add_height) - parseInt(added_height);
+                var panel_height = panel.height() + parseInt(add_height);
                 panel.animate({height: panel_height + "px"}, {
                     easing: 'swing',
                     duration: 500,
@@ -44,7 +63,9 @@
                     }
                 });
                 this_li.find('.accordion-panel').show(500);
-                panel.data('added-height', add_height);
+
+                added_height = parseInt(added_height) + parseInt(add_height);
+                panel.data('added-height', added_height);
             }
         });
     });
@@ -92,7 +113,7 @@
             @foreach($levels_education_programs as $level_name => $education_programs)
                 <li class="accordion-item">
                     <h3 class="accordion-thumb">{{$level_name}}</h3>
-                    <div class="accordion-panel pb-20">
+                    <div class="accordion-panel hide pb-20">
                         <div>
                             <ul class="accordion-sub">
                                 @foreach($education_programs as $education_program)
-- 
1.7.10.4