From 560679316d57d680c88282db930b7a2a560d0548 Mon Sep 17 00:00:00 2001 From: ROMANGOLIENKO Date: Wed, 20 Mar 2024 16:44:31 +0300 Subject: [PATCH] design changes --- .../Controllers/Api/CalculatorController.php | 11 +- app/Services/DirectonHtmlBuilder.php | 115 +++++++++--------- .../new-design/bakalavr-special.blade.php | 9 +- 3 files changed, 68 insertions(+), 67 deletions(-) diff --git a/app/Http/Controllers/Api/CalculatorController.php b/app/Http/Controllers/Api/CalculatorController.php index 20bb715..23c8963 100644 --- a/app/Http/Controllers/Api/CalculatorController.php +++ b/app/Http/Controllers/Api/CalculatorController.php @@ -61,10 +61,10 @@ class CalculatorController extends Controller $faculty = Faculty::find($department->faculty_id); // phpcs:disable $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); - return "{$acc} - {$faculty->name} - - id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name} + return "{$acc} + + + id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name}
id }{$direction->id}\" aria-labelledby=\"offcanvasScrollingLabel-{$direction->id}{$direction->id}\" style=\"height: 100%; font-family: Geologica-Medium; overflow-y: auto ; background-image: url({$fon_3}); color: #004329\"> @@ -134,8 +134,9 @@ class CalculatorController extends Controller
- + {$direction->cost_paid_place} {$direction->period} + "; }; // phpcs:enable diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php index 52bd960..af5ce2a 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -58,40 +58,40 @@ class DirectonHtmlBuilder $profiles = ''; //if (array_key_exists('educationalInstitution',$direction)) echo '+++++'; else echo '----'; //exit(); - if (array_key_exists('educationalInstitution', $direction)) { - foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) { - - $profiles .= "

{$educationalInstitution_name}

"; - foreach ($educationalInstitution as $profile_name => $profile) { - $profile_out = '
'; - foreach ($profile as $key => $value) { - $profile_out .= "{$key} - {$value['budget_places']}
"; - } - $tmp = str_replace(' ', '', $profile_name); - $tmp = str_replace(',', '', $tmp); -// $print_r = '
' . print_r($direction,1) . '
';
-                    $profiles .= "
-                                  

-                                        

-                                            

-                                                 
-                                            

-                                            

-                                                

-                                                     $profile_out
-
-
-
-                                                

-                                            

-                                        

-                                  

-                            ";
-                }
-            };
-        }
+//        if (array_key_exists('educationalInstitution', $direction)) {
+//            foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
+//
+//                $profiles .= "
 {$educationalInstitution_name}
";
+//                foreach ($educationalInstitution as $profile_name => $profile) {
+//                    $profile_out = '
';
+//                    foreach ($profile as $key => $value) {
+//                        $profile_out .= "{$key} -  {$value['budget_places']} 
";
+//                    }
+//                    $tmp = str_replace(' ', '', $profile_name);
+//                    $tmp = str_replace(',', '', $tmp);
+////                    $print_r = '
' . print_r($direction,1) . '
';
+//                    $profiles .= "
+//                                  

+//                                        

+//                                            

+//                                                 
+//                                            

+//                                            

+//                                                

+//                                                     $profile_out
+//
+//
+//
+//                                                

+//                                            

+//                                        

+//                                  

+//                            ";
+//                }
+//            };
+//        }
 
         return "

 
@@ -104,15 +104,15 @@ class DirectonHtmlBuilder
 
                                                             

 
-                                                                            

+                                                                            

 
                                                                                     

                                                                                         
 {$direction['code']} 

-                                                                                        
 {$direction['name']}

+                                                                                        
 {$direction['name']}

                                                                                     

                                                                                     

                                                                                         
{$direction['description']}

-                                                                                        
 
 Бюджетные места: 
 {$profiles} 

+
 
                                                                                     

 
@@ -120,42 +120,41 @@ class DirectonHtmlBuilder
 
 
                                                                             

+                                                            

 
+                                                            

+                                                            
  Бюджет  |  Коммерция 

+                                                                            

 
-                                                                            

-
-                                                                                

+                                                                                

                                                                                     
 Уровень образования:
                                                                                         {$direction['educationLevel']} 
                                                                                     

-                                                                                    


+
                                                                                     
 Форма обучения:
                                                                                          $educationForms
                                                                                           
                                                                                     

-                                                                                    


-                                                                                    
 Бюджетные места:
-                                                                                         {$budget_places}
-                                                                                    

-                                                                                    


-                                                                                    
 Квота:
-                                                                                        {$direction['quota']} 
-                                                                                    

-                                                                                    


-                                                                                    
 Места на контракт:
-                                                                                        {$direction['paid_places']} 
-                                                                                    

-                                                                                    


-                                                                                    
 Стоимость платного обучения:
 
-                                                                                    

-                                                                                    


+
+
+
+
+
                                                                                     
 Период обучения (в годах):
                                                                                         {$period}
                                                                                     

                                                                                 

                                                                             

-

+                                                                            

+
+                                                                                

+
+                                                                                        Места для обучения:
+
+                                                                                

+                                                                            

+                                                                       

 
                                                                             

 
diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php
index dfa3895..a026380 100644
--- a/resources/views/new-design/bakalavr-special.blade.php
+++ b/resources/views/new-design/bakalavr-special.blade.php
@@ -74,6 +74,7 @@
         .hover1:hover {
             transform: scale(1.1);
             transition: all .3s ease-in-out;
+            z-index: 1052;
 
 
         }
@@ -387,15 +388,15 @@
                                     

                                     
 {{ $faculty->name }} 

 
-                                    

+                                    

                                         

                                             
Основная информация

                                             
 {{ $faculty->description }}

                                             
Специальности

-                                            

+                                            

                                                 
+                                                       style=" font-family: Geologica-ExtraLight;">
                                                     
@@ -561,7 +562,7 @@
                                         data: 'ajx=get_napr&format=html&predmets=' + JSON.stringify(selected),
 
                                         success: function (data) {
-                                            $(".calcul_rez").html('');
+                                            $(".calcul_rez").html('');
                                             $(".calcul_rez").append(data.html);
 
                                         }


                                                          Название
                                                          Код специальности
 Факультет   Направление  Период обучения (в годах)
 Направление  Цена за обучение Период обучения (в годах)