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}
{$educationalInstitution_name}
"; - foreach ($educationalInstitution as $profile_name => $profile) { - foreach ($profile as $key => $value) { - $profile_out .= "{$key} - {$value['budget_places']}{$educationalInstitution_name}
"; +// foreach ($educationalInstitution as $profile_name => $profile) { +// $profile_out = '' . print_r($direction,1) . ''; +// $profiles .= " +//+//+// "; +// } +// }; +// } return "+//+//+// +//
+//+//+//+// $profile_out +// +// +// +//+//@@ -98,15 +104,15 @@ class DirectonHtmlBuilder-+++{$direction['code']}-{$direction['name']}+{$direction['name']}@@ -114,42 +120,41 @@ class DirectonHtmlBuilder{$direction['description']}
-+Бюджетные места:
{$profiles}+ +-- -++-Уровень образования: {$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 a46c7aa..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); } @@ -572,14 +573,14 @@ - Направление Цена за обучение Период обучения (в годах) +Выберите предметы-+