diff --git a/app/Http/Controllers/admin/PageController.php b/app/Http/Controllers/admin/PageController.php index 61afb69..899c6f9 100644 --- a/app/Http/Controllers/admin/PageController.php +++ b/app/Http/Controllers/admin/PageController.php @@ -146,8 +146,14 @@ class PageController extends Controller $carry[$facultyName]['directions'][$directionName]['budget_places'] [$educationalInstitutionName][$directionProfileName][$educationFormName] = $directionBudgetPlaces; - $carry[$facultyName]['directions'][$directionName] - ['paid_places'][$educationFormName] = $directionPaidPlaces; + + $carry[$facultyName]['directions'][$directionName]['paid_places'] + [$educationalInstitutionName][$directionProfileName][$educationFormName] = $directionPaidPlaces; + + /*$carry[$facultyName]['directions'][$directionName] + ['paid_places'][$educationFormName] = $directionPaidPlaces;*/ + + $carry[$facultyName]['directions'][$directionName] ['cost_paid_place'][$educationFormName] = $directionCostPaidPlace; $carry[$facultyName]['directions'][$directionName]['period'][$educationFormName] = $directionPeriod; diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php index 5021b7f..1e6c01f 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -19,6 +19,8 @@ class DirectonHtmlBuilder $direction = $this->direction; $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); + $green_circle = URL::to('img/front-page/green-circle.png'); + $education_form = ''; foreach ($direction['education_form'] as $el) { $education_form .= $el . ', '; @@ -28,47 +30,85 @@ class DirectonHtmlBuilder $period = '
'; foreach ($direction['period'] as $key => $el) { - $period .= '' . $key . ' - ' . '' . $el . - '
' ; + $period .= '' . $key . ' - ' . '' . $el . '
' ; } - $EGE = '
'; - foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { - $EGE .= '' . $key . ' - ' . '' . $el . - '
' ; - } + //dd($direction); - $po_viboru = '
'; - if (array_key_exists('Предметы по выбору', $direction['entrance_examinations']['ЕГЭ'])) { + + $paid_cost = '
+ Стоимость обучения +
+
+
'; + foreach ($direction['cost_paid_place'] as $key => $el) { + $paid_cost .= '' . $key . ' - ' . '' . $el . '
' ; + } + $paid_cost .= '
'; + + + + + $EGE = '
+ ЕГЭ +
+
+
'; + foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { + $EGE .= '' . $key . ' - ' . '' . $el . '
' ; + } + $EGE .= '
'; + + $po_viboru = '
+ Предметы по выбору +
+
+
'; + if(array_key_exists('Предметы по выбору', $direction['entrance_examinations']['ЕГЭ'])){ foreach ($direction['entrance_examinations']['ЕГЭ']['Предметы по выбору'] as $key => $el) { - $po_viboru .= '' . $key . ' - ' . '' . - $el . '
' ; + $po_viboru .= '' . $key . ' - ' . '' . $el . '
' ; } + $po_viboru .= '
'; + }else { + $po_viboru = ''; } - $SPO = '
'; - if (array_key_exists('СПО', $direction['entrance_examinations'])) { + + + $SPO = '
+ СПО +
+
+
'; + if(array_key_exists('СПО', $direction['entrance_examinations'])){ + foreach ($direction['entrance_examinations']['СПО']['Обязательные'] as $key => $el) { - $SPO .= '' . $key . ' - ' . '' . $el . - '
' ; + $SPO .= '' . $key . ' - ' . '' . $el . '
' ; } + $SPO .= '
'; + }else { + $SPO = ''; } - // phpcs:disable + + $mgtu = ''; - if (array_key_exists('МГТУ', $direction['budget_places'])) { + if(array_key_exists('МГТУ', $direction['budget_places'])){ + foreach ($direction['budget_places']['МГТУ'] as $profile_name => $profile) { - $profile_content = ''; - foreach ($profile as $forms => $budget_places) { - $profile_content .= " {$forms} - " . " {$budget_places}
"; + $profile_content =''; + foreach($profile as $forms => $budget_places){ + $profile_content .= " {$forms} - " . " {$budget_places}
"; } + $tmp = str_replace(' ', '', $profile_name); + $tmp = str_replace(',', '', $tmp); $mgtu .= "

-

-
+
$profile_content
@@ -77,49 +117,109 @@ class DirectonHtmlBuilder
" ; } } +// if($direction['name'] == 'Нефтегазовое дело') { +// dd($direction); +// }; +// dd($direction); + $filial = ''; + if(array_key_exists('Филиал МГТУ (пос. Яблоновский)', $direction['budget_places'])){ - $filial = '222'; + foreach ($direction['budget_places']['Филиал МГТУ (пос. Яблоновский)'] as $profile_name => $profile) { + $profile_content =''; + foreach($profile as $forms => $budget_places){ + $profile_content .= " {$forms} - " . " {$budget_places}
"; + } + $tmp = str_replace(' ', '', $profile_name); + $tmp = str_replace(',', '', $tmp); + $filial .= "
+
+

+ +

+
+
+ $profile_content +
+
+
+
" ; + } + } + else { + $filial = '
Этой специальности нет в филиалле
'; + } + $paid_places_content = ''; + foreach ($direction['paid_places'] as $institution) { + foreach ($institution as $profile_name => $profile) { + $profile_content = ''; + foreach ($profile as $forms => $paid_places) { + $profile_content .= " {$forms} - " . " {$paid_places}
"; + } + $tmp = str_replace(' ', '', $profile_name); + $tmp = str_replace(',', '', $tmp); + $paid_places_content .= "
+
+

+ +

+
+
+ $profile_content +
+
+
+
" ; + + } + } return "
-
+
-
-
-
-
{$direction['code']}
-
{$direction['name']}
+
+
{$direction['code']}
+
{$direction['name']}
-
- МГТУ | - Филиал МГТУ (пос. Яблоновский) +
+ + | + +
-
-

{$direction['description']}

-
- +

{$direction['description']}

+
-
Бюджет | Коммерция
-
-
+ +
+
Уровень образования: {$direction['education_level']}
@@ -131,53 +231,45 @@ class DirectonHtmlBuilder
-
+
- - - Места для обучения:
+ Места для обучения:
+
+
+
+

Бюджет

+ +
{$mgtu}
+
+ + +
+

Коммерция

+
$paid_places_content
+ +
+
+
-
-
+
- Проходные баллы: + Проходные баллы:
-
- ЕГЭ - $EGE -
-
- Предметы по выбору - $po_viboru -
-
- СПО - $SPO -
+ $EGE $po_viboru $SPO
-
-
- +
+
+ $paid_cost
diff --git a/public/img/front-page/green-circle.png b/public/img/front-page/green-circle.png new file mode 100644 index 0000000..c12fa7a Binary files /dev/null and b/public/img/front-page/green-circle.png differ diff --git a/public/img/logo/logo-white.png b/public/img/logo/logo-white.png new file mode 100644 index 0000000..96dd349 Binary files /dev/null and b/public/img/logo/logo-white.png differ diff --git a/resources/views/layouts/new-design-layout.blade.php b/resources/views/layouts/new-design-layout.blade.php index 31e2a8f..a132491 100644 --- a/resources/views/layouts/new-design-layout.blade.php +++ b/resources/views/layouts/new-design-layout.blade.php @@ -9,7 +9,7 @@ - + diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php index 9b3fac1..9dbc553 100644 --- a/resources/views/new-design/bakalavr-special.blade.php +++ b/resources/views/new-design/bakalavr-special.blade.php @@ -56,8 +56,14 @@ color: unset; } + .default-focus{ + border-color: #198754; + box-shadow: 0 0 0 0.25rem rgba(25,135,84,.5); + + } + .gradient-text { background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); -webkit-background-clip: text; @@ -71,6 +77,7 @@ } + .hover1:hover { transform: scale(1.1); transition: all .3s ease-in-out; @@ -452,7 +459,26 @@
@endforeach + +