diff --git a/.gitignore b/.gitignore index 2749dec..71ff04d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ yarn-error.log /_ide_helper.php /_ide_helper_models.php /public/img/icons/play-button.png +/tabit.sql 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 4774833..3575c6f 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -2,9 +2,7 @@ namespace App\Services; -use App\Models\Direction; use Illuminate\Support\Facades\URL; -use PhpParser\Node\Expr\Array_; class DirectonHtmlBuilder { @@ -15,6 +13,7 @@ class DirectonHtmlBuilder { $this->direction = $direction; } + public function getHTML() { @@ -22,12 +21,9 @@ class DirectonHtmlBuilder $direction = $this->direction; - $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); - - $educationForms = ''; foreach ($direction['educationForms'] as $key => $educationForm) { $educationForms .= $key . ', '; @@ -35,7 +31,6 @@ class DirectonHtmlBuilder $educationForms = substr($educationForms, 0, -2); - // phpcs:disable $budget_places_array = array(); @@ -58,109 +53,106 @@ 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) { - $profile_out = '
'; - $profiles .= "

{$educationalInstitution_name}

"; - foreach ($educationalInstitution as $profile_name => $profile) { - foreach ($profile as $key => $value) { - $profile_out .= "{$key} - {$value['budget_places']}
"; - } - $tmp = str_replace(' ', '', $profile_name); - $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 "

 
 
-                                                            

-                                                                

-                                                                    
-                                                                

+            

+                

+                    
+                

 
-                                                            

+                

 
-                                                                            

+                    

+                        

+                            
 {$direction['code']} 

+                            
 {$direction['name']}

+                        

+                        

+                            

+                                 МГТУ  |
+                                 Филиал МГТУ (пос. Яблоновский)
+                             

+                        

+                    

 
-                                                                                    

-                                                                                        
 {$direction['code']} 

-                                                                                        
 {$direction['name']}

-                                                                                    

-                                                                                    

-                                                                                        
{$direction['description']}

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

+                    

+                    

+                                
{$direction['description']}

+                           

 
-                                                                                    

+                

+                

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

+                    

+                           

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

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

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

+                           

+                    

+                    

+                        

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

+                    

+                

+                

+                    

+                        

 
+                        

+                    

+                    

+                        

 
-
-
-                                                                            

-
-
-                                                                            

-
-                                                                                

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

-                                                                                    


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

-                                                                                    


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

-                                                                                    


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

-                                                                                    


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

-                                                                                    


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

-                                                                                    


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

-                                                                                

-                                                                            

-

-
-                                                                            

-
-
-
-                                                                            

-                                                                        

-                                                                        

-
-                                                                        

-                                                                    
 ";
+                        

+                    

+                
+            
+        
+        ";
     }
     // phpcs:enable
 }
diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php
index a46c7aa..e198121 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);
 
                                         }
@@ -572,15 +573,15 @@
                     
 
-                

+                

 
                     

                         
Выберите предметы
                         

-                        

-                            

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

                 

+