From c2616e87136918ed076eb14008c6f6eabc42409d Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Mon, 18 Mar 2024 12:24:44 +0300
Subject: [PATCH 1/7] adding to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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

From f93404d996c931de113f4b0138f6f10c1c25c0fd Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Mon, 18 Mar 2024 12:24:44 +0300
Subject: [PATCH 2/7] adding to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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

From 116c949f458023f3e994b58fc6310f722a68a891 Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Mon, 18 Mar 2024 13:03:50 +0300
Subject: [PATCH 3/7] fixing directions

---
 app/Services/DirectonHtmlBuilder.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php
index 4774833..52bd960 100644
--- a/app/Services/DirectonHtmlBuilder.php
+++ b/app/Services/DirectonHtmlBuilder.php
@@ -60,13 +60,16 @@ class DirectonHtmlBuilder
         //exit();
         if (array_key_exists('educationalInstitution', $direction)) {
             foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
-                $profile_out = '<br>';
+
                 $profiles .= "<p> {$educationalInstitution_name}</p>";
                 foreach ($educationalInstitution as $profile_name => $profile) {
+                    $profile_out = '<br>';
                     foreach ($profile as $key => $value) {
                         $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>";
                     }
                     $tmp = str_replace(' ', '', $profile_name);
+                    $tmp = str_replace(',', '', $tmp);
+//                    $print_r = '<pre>' . print_r($direction,1) . '<pre>';
                     $profiles .= "
                                   <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
                                         <div class=\"accordion-item\">
@@ -78,6 +81,9 @@ class DirectonHtmlBuilder
                                             <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
                                                 <div class=\"accordion-body\">
                                                      $profile_out
+
+
+
                                                 </div>
                                             </div>
                                         </div>

From 303f4e59a045f7d3fb7b61783509261071f04e82 Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Mon, 18 Mar 2024 12:24:44 +0300
Subject: [PATCH 4/7] adding to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

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

From 4fc8a80a0424dff24e49a609c0b989972825ca61 Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Mon, 18 Mar 2024 13:03:50 +0300
Subject: [PATCH 5/7] fixing directions

---
 app/Services/DirectonHtmlBuilder.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php
index 4774833..52bd960 100644
--- a/app/Services/DirectonHtmlBuilder.php
+++ b/app/Services/DirectonHtmlBuilder.php
@@ -60,13 +60,16 @@ class DirectonHtmlBuilder
         //exit();
         if (array_key_exists('educationalInstitution', $direction)) {
             foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
-                $profile_out = '<br>';
+
                 $profiles .= "<p> {$educationalInstitution_name}</p>";
                 foreach ($educationalInstitution as $profile_name => $profile) {
+                    $profile_out = '<br>';
                     foreach ($profile as $key => $value) {
                         $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>";
                     }
                     $tmp = str_replace(' ', '', $profile_name);
+                    $tmp = str_replace(',', '', $tmp);
+//                    $print_r = '<pre>' . print_r($direction,1) . '<pre>';
                     $profiles .= "
                                   <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
                                         <div class=\"accordion-item\">
@@ -78,6 +81,9 @@ class DirectonHtmlBuilder
                                             <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
                                                 <div class=\"accordion-body\">
                                                      $profile_out
+
+
+
                                                 </div>
                                             </div>
                                         </div>

From 56662905a92373020bf4aaf183b17d1cd4fcf88a Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Wed, 20 Mar 2024 11:43:15 +0300
Subject: [PATCH 6/7] calculator design fix

---
 resources/views/new-design/bakalavr-special.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php
index a46c7aa..dfa3895 100644
--- a/resources/views/new-design/bakalavr-special.blade.php
+++ b/resources/views/new-design/bakalavr-special.blade.php
@@ -572,14 +572,14 @@
                     </div>
                 </div>
 
-                <div class="col-md-6 mt-md-0 mt-5 col-12">
+                <div class="col-md-7 mt-md-0 mt-5 col-12">
 
                     <div class="d-flex  border border-white py-5 justify-content-center align-items-center"
                          style="border-radius: 50px; min-height: 200px;">
                         <div class="col-12 text-remove text-white w-100 text-center fs-4"
                              style="font-family: Geologica-ExtraLight">Выберите предметы
                         </div>
-                        <div class="table-responsive ps-5  " style="width: 90%">
+                        <div class="table-responsive p-5 w-100   " style=" max-height: 700px; ">
                             <table class=" text-white  px-5 calcul_rez"
                                    style="width: 90%; font-family: Geologica-ExtraLight;">
 

From 560679316d57d680c88282db930b7a2a560d0548 Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Wed, 20 Mar 2024 16:44:31 +0300
Subject: [PATCH 7/7] 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} <tr class=\"\">
-                    <td id=\"faculty\"> {$faculty->name} </td>
-                    <td>
-                        <a class=\" border border-white rounded-3 p-2 hover1\" type=\"button\" data-bs-toggle=\"offcanvas\" data-bs-target=\"#offcanvasScrolling-{$direction->id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name}</a>
+            return "{$acc} <tr class=\"border-bottom border-white my-3\">
+
+                    <td class='w-25 '>
+                        <a class=\"hover2 \" type=\"button\" data-bs-toggle=\"offcanvas\" data-bs-target=\"#offcanvasScrolling-{$direction->id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name}</a>
                         <div class=\"offcanvas offcanvas-bottom\" data-bs-scroll=\"true\" data-bs-backdrop=\"false\" tabindex=\"-1\" id=\"offcanvasScrolling-{$direction->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
                                                                         </div>
                                                                     </div>
                     </td>
-
+                    <td class=\"text-end\"> {$direction->cost_paid_place}</td>
                     <td class=\"text-end\"> {$direction->period} </td>
+
                     </tr>";
         };
         // 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 .= "<p> {$educationalInstitution_name}</p>";
-                foreach ($educationalInstitution as $profile_name => $profile) {
-                    $profile_out = '<br>';
-                    foreach ($profile as $key => $value) {
-                        $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>";
-                    }
-                    $tmp = str_replace(' ', '', $profile_name);
-                    $tmp = str_replace(',', '', $tmp);
-//                    $print_r = '<pre>' . print_r($direction,1) . '<pre>';
-                    $profiles .= "
-                                  <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
-                                        <div class=\"accordion-item\">
-                                            <h2 class=\"accordion-header\">
-                                                 <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#panelsStayOpen-{$tmp}\" aria-expanded=\"true\" aria-controls=\"panelsStayOpen-{$tmp}\">
-                                                        {$profile_name}
-                                                 </button>
-                                            </h2>
-                                            <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
-                                                <div class=\"accordion-body\">
-                                                     $profile_out
-
-
-
-                                                </div>
-                                            </div>
-                                        </div>
-                                  </div>
-                            ";
-                }
-            };
-        }
+//        if (array_key_exists('educationalInstitution', $direction)) {
+//            foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
+//
+//                $profiles .= "<p> {$educationalInstitution_name}</p>";
+//                foreach ($educationalInstitution as $profile_name => $profile) {
+//                    $profile_out = '<br>';
+//                    foreach ($profile as $key => $value) {
+//                        $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>";
+//                    }
+//                    $tmp = str_replace(' ', '', $profile_name);
+//                    $tmp = str_replace(',', '', $tmp);
+////                    $print_r = '<pre>' . print_r($direction,1) . '<pre>';
+//                    $profiles .= "
+//                                  <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
+//                                        <div class=\"accordion-item\">
+//                                            <h2 class=\"accordion-header\">
+//                                                 <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#panelsStayOpen-{$tmp}\" aria-expanded=\"true\" aria-controls=\"panelsStayOpen-{$tmp}\">
+//                                                        {$profile_name}
+//                                                 </button>
+//                                            </h2>
+//                                            <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
+//                                                <div class=\"accordion-body\">
+//                                                     $profile_out
+//
+//
+//
+//                                                </div>
+//                                            </div>
+//                                        </div>
+//                                  </div>
+//                            ";
+//                }
+//            };
+//        }
 
         return "<div class=\"offcanvas offcanvas-bottom\" data-bs-scroll=\"true\" data-bs-backdrop=\"false\" tabindex=\"-1\" id=\"offcanvasScrolling-{$direction['id'] }\" aria-labelledby=\"offcanvasScrollingLabel-{$direction['id']}\" style=\"height: 100%; font-family: Geologica-Medium; overflow-y: auto ;              background-image:  url({$fon_3}); color: #004329\">
 
@@ -104,15 +104,15 @@ class DirectonHtmlBuilder
 
                                                             <div class='row'>
 
-                                                                            <div class='col-md-6 col-12 d-block'>
+                                                                            <div class='col-12 d-block'>
 
                                                                                     <div class=\"\">
                                                                                         <div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
-                                                                                        <div class=\"display-5 \" > {$direction['name']}</div>
+                                                                                        <div class=\"display-6 \" > {$direction['name']}</div>
                                                                                     </div>
                                                                                     <div class=\"mt-4\">
                                                                                         <p style=\"text-align: justify;\">{$direction['description']}</p>
-                                                                                        <div class='row'> <p class='fs-5'> Бюджетные места: </p> {$profiles} </div>
+
 
                                                                                     </div>
 
@@ -120,42 +120,41 @@ class DirectonHtmlBuilder
 
 
                                                                             </div>
+                                                            </div>
 
+                                                            <div class='row'>
+                                                            <div class='col-11 d-flex justify-content-end'> <a href='#' role='button'> Бюджет </a> | <a href='#' role='button' > Коммерция</a> </div>
+                                                                            <div class=' col-4 '>
 
-                                                                            <div class='col-md-6 col-12 d-flex justify-content-center align-items-center'>
-
-                                                                                <div class=\"p-3 px-5 border-success fs-4\" style='border-radius: 50px; border: 2px solid;'>
+                                                                                <div class=\"p-3 px-5 border-success fs-5\" style='border-radius: 20px; border: 2px solid;'>
                                                                                     <div > Уровень образования:
                                                                                         <strong>{$direction['educationLevel']} </strong>
                                                                                     </div>
-                                                                                    <hr class='d-block d-md-none'><br>
+
                                                                                     <div > Форма обучения:
                                                                                         <strong> $educationForms
                                                                                           </strong>
                                                                                     </div>
-                                                                                    <hr class='d-block d-md-none'><br>
-                                                                                    <div > Бюджетные места:
-                                                                                         {$budget_places}
-                                                                                    </div>
-                                                                                    <hr class='d-block d-md-none'><br>
-                                                                                    <div > Квота:
-                                                                                        <strong >{$direction['quota']} </strong>
-                                                                                    </div>
-                                                                                    <hr class='d-block d-md-none'><br>
-                                                                                    <div > Места на контракт:
-                                                                                        <strong >{$direction['paid_places']} </strong>
-                                                                                    </div>
-                                                                                    <hr class='d-block d-md-none'><br>
-                                                                                    <div > Стоимость платного обучения:
 
-                                                                                    </div>
-                                                                                    <hr class='d-block d-md-none'><br>
+
+
+
+
+
                                                                                     <div > Период обучения (в годах):
                                                                                         {$period}
                                                                                     </div>
                                                                                 </div>
                                                                             </div>
-</div>
+                                                                            <div class=' col-7 '>
+
+                                                                                <div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
+
+                                                                                        Места для обучения:
+
+                                                                                </div>
+                                                                            </div>
+                                                                       </div>
 
                                                                             <div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
 
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 @@
                                     </div>
                                     <p class="text-center fs-3"> {{ $faculty->name }} </p>
 
-                                    <div class="modal-body d-flex justify-content-center">
+                                    <div class="modal-body d-flex justify-content-center" >
                                         <div class="col-11">
                                             <p class="fs-5">Основная информация</p>
                                             <p class="fs-6"
                                                style=" font-family: Geologica-ExtraLight;   text-align: justify;"> {{ $faculty->description }}</p>
                                             <p class="fs-5">Специальности</p>
-                                            <div class="table-responsive">
+                                            <div class="table-responsive ps-4">
                                                 <table class="table w-100 fs-6"
-                                                       style=" font-family: Geologica-ExtraLight">
+                                                       style=" font-family: Geologica-ExtraLight;">
                                                     <tr>
                                                         <th> Название</th>
                                                         <th> Код специальности</th>
@@ -561,7 +562,7 @@
                                         data: 'ajx=get_napr&format=html&predmets=' + JSON.stringify(selected),
 
                                         success: function (data) {
-                                            $(".calcul_rez").html('<tr><th class="fs-5"> Факультет  </th><th class="fs-5"> Направление </th><th class="fs-5" style="text-align: right;"> Период обучения (в годах)</th></tr>');
+                                            $(".calcul_rez").html('<tr><th class="fs-5"> Направление </th><th style="text-align: right;"> Цена за обучение</th><th class="fs-5" style="text-align: right;"> Период обучения (в годах)</th></tr>');
                                             $(".calcul_rez").append(data.html);
 
                                         }