Merge remote-tracking branch 'origin/new-design' into new-design

fixing directions
adding to gitignore
2024-03-18 13:04:02 +03:00 · 2024-03-18 13:03:50 +03:00 · 2024-03-18 12:26:14 +03:00 · 2024-03-18 11:56:03 +03:00 · 2024-03-18 11:55:25 +03:00 · 2024-03-18 11:36:14 +03:00
5 changed files with 304 additions and 199 deletions
--- a/.gitea/workflows/php.yml
+++ b/.gitea/workflows/php.yml
@ -4,9 +4,9 @@ on:
  push:
    branches:
      - main
-  pull_request:
-    branches:
-      - main
+#  pull_request:
+#    branches:
+#      - main

 jobs:
  build:
--- a/app/Http/Controllers/Api/CalculatorController.php
+++ b/app/Http/Controllers/Api/CalculatorController.php
@ -2,6 +2,7 @@

 namespace App\Http\Controllers\Api;

+use App\Enums\ExaminationTypeEnum;
 use App\Http\Controllers\Controller;
 use App\Models\Department;
 use App\Models\Direction;
@ -15,18 +16,44 @@ class CalculatorController extends Controller
    public function findDirectionFromSubjects(Request $request)
    {
        $getJSON = $request->input()['predmets'];
-        $getsSubjects = json_decode($getJSON);
-        $countUserSubjects = count($getsSubjects);
+        $calcultatorSubjects = json_decode($getJSON);

        $filteredDirectionIds = EntranceExamination::all()
-            ->select("direction_id", "subject_id")
-            ->groupBy('direction_id')
-            ->map(function ($direction) {
-                return $direction->map(fn($item) => $item['subject_id']);
-            })
-            ->filter(fn($direction) => count($direction) <= $countUserSubjects)->keys();
+            ->select("direction_id", "subject_id", "subject_type_id", "examination_type_id")
+            ->where('examination_type_id', '=', ExaminationTypeEnum::Ege->value)
+            ->reduce(function (array $carry, $examine) {

-        $directions = Direction::whereIn('id', $filteredDirectionIds)->get();
+                [
+                    'direction_id' => $direction_id,
+                    'subject_id' => $subject_id,
+                    'subject_type_id' => $subject_type_id
+                ] = $examine;
+
+                $carry[$direction_id][$subject_type_id][] = $subject_id;
+                $carry[$direction_id][$subject_type_id] = array_unique($carry[$direction_id][$subject_type_id]);
+
+                return $carry;
+            }, []);
+        $result = collect($filteredDirectionIds)
+            ->filter(function ($subjectTypes) use ($calcultatorSubjects) {
+                $requiredSubjects = $subjectTypes[1];
+                return array_reduce($requiredSubjects, function ($acc, $requiredSubjects) use ($calcultatorSubjects) {
+                    if (!in_array($requiredSubjects, $calcultatorSubjects)) {
+                        return false;
+                    }
+                    return $acc;
+                }, true);
+            })
+            ->filter(function ($subjectTypes) use ($calcultatorSubjects) {
+                if (array_key_exists(2, $subjectTypes)) {
+                    $optionalSubjectsInCalculator = collect($subjectTypes[2])
+                        ->filter(fn($optionalSubject) => in_array($optionalSubject, $calcultatorSubjects));
+                    return $optionalSubjectsInCalculator->count() !== 0;
+                }
+                return true;
+            })->map(fn($subjectTypes, $directionId) => $directionId);
+
+        $directions = Direction::whereIn('id', $result)->get();


        $generateHtml = function ($acc, $direction) {
--- a/app/Http/Controllers/admin/PageController.php
+++ b/app/Http/Controllers/admin/PageController.php
@ -22,12 +22,6 @@ class PageController extends Controller

    public function directions()
    {
-//        $directions = DB::table('faculties')
-//            ->join('departments', 'faculties.id', '=', 'departments.faculty_id')
-//            ->join('directions', 'departments.id', '=', 'directions.department_id')
-//            ->select('faculties.name as faculties.name', 'directions.name', 'directions.id')
-//            ->groupBy('faculties.name')
-//            ->get();
        $faculties = Faculty::all();
        $subjects = EntranceExamination::all()
            ->select('subject_id', 'subject_type_id', 'examination_type_id')
@ -38,21 +32,6 @@ class PageController extends Controller
                    $carry[$id] = $value;
                    return $carry;
            });
-//        $subjects = EntranceExamination::pluck('name', 'id');
-//        $infBez = $faculties->find(FacultyEnum::InfBez->value);
-//        $query = `select faculties.name, directions.name, directions.id
-//FROM faculties
-//join departments on faculties.id = departments.faculty_id
-//join directions on departments.id = directions.department_id`;
-//        $directions = DB::($query);
-//        foreach ($faculties as $faculty) {
-//            foreach ($faculty->departments as $department) {
-//                foreach ($department->directions as $direction) {
-//
-//                }
-//            }
-//
-//        }
        return view('new-design.bakalavr-special', compact('faculties', 'subjects'));
    }

--- a/app/Services/DirectonHtmlBuilder.php
+++ b/app/Services/DirectonHtmlBuilder.php
@ -14,7 +14,6 @@ class DirectonHtmlBuilder
    public function __construct($direction)
    {
        $this->direction = $direction;
-
    }
    public function getHTML()
    {
@ -37,15 +36,14 @@ class DirectonHtmlBuilder



-
+        // phpcs:disable

        $budget_places_array = array();
-        foreach ($direction['educationForms'] as $key => $educationForm){
+        foreach ($direction['educationForms'] as $key => $educationForm) {
            $budget_places_array[$key] = $educationForm['budget_places'];
        }
        $budget_places = '<br>';
-        foreach ($budget_places_array as $key => $item){
-
+        foreach ($budget_places_array as $key => $item) {
            $budget_places .= "<span style='font-family: Geologica-ExtraLight'>$key</span> - <strong> $item </strong><br>";
        }

@ -60,16 +58,18 @@ class DirectonHtmlBuilder
        $profiles = '';
        //if (array_key_exists('educationalInstitution',$direction)) echo '+++++'; else echo '----';
        //exit();
-        if (array_key_exists('educationalInstitution',$direction)) {
+        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\">
@ -81,6 +81,9 @@ class DirectonHtmlBuilder
                                            <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
                                                <div class=\"accordion-body\">
                                                     $profile_out
+
+
+
                                                </div>
                                            </div>
                                        </div>
--- a/resources/views/new-design/bakalavr-special.blade.php
+++ b/resources/views/new-design/bakalavr-special.blade.php
@ -1,4 +1,3 @@
-
@extends('layouts.new-design-layout')
@section('content')
    <style>
@ -9,6 +8,7 @@
            src: url({{ URL::to('fonts/Geologica/Geologica-Medium.ttf') }}) format("truetype");

        }
+
        @font-face {

            font-family: "Geologica-ExtraLight";
@ -17,6 +17,7 @@
            font-style: normal;
            font-weight: normal;
        }
+
        @font-face {

            font-family: "Geologica-Light";
@ -25,6 +26,7 @@
            font-style: normal;
            font-weight: normal;
        }
+
        html {
            width: 100%;
            height: 100%;
@ -32,6 +34,7 @@
            padding: 0;

        }
+
        body {
            {{--background-image: url({{ URL::to('img/front-page/fon1_blok.png') }});--}}
             overflow-x: hidden;
@ -40,37 +43,41 @@
            height: 100%;
            object-fit: cover;

-            font-family: "Geologica-Medium"; !important;
+            font-family: "Geologica-Medium";
+        !important;
        }

        a {
            text-decoration: none;
            color: unset;
        }
-        a:hover{
+
+        a:hover {
            color: unset;

        }


-        .gradient-text{
+        .gradient-text {
            background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }});
            -webkit-background-clip: text;
            -webkit-text-fill-color: transparent;
        }

-        .button1{
-            background: linear-gradient(white, white) padding-box, linear-gradient(to right,#0d6efd , #4f96ff) border-box;
+        .button1 {
+            background: linear-gradient(white, white) padding-box, linear-gradient(to right, #0d6efd, #4f96ff) border-box;
            border-radius: 11px;
            border: 1px solid transparent;

        }
+
        .hover1:hover {
            transform: scale(1.1);
            transition: all .3s ease-in-out;


        }
+
        .hover2:hover {
            color: #d3d3d3;
            transition: all .4s ease-in-out;
@ -79,17 +86,19 @@
            /*padding: 5px 8px;*/
            /*border-color: #ffffff;*/
        }
+
        .hover3:hover {

            border: unset;
-            background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }});!important;
-
+            background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }});
+        !important;


            transition: all .3s ease-in-out;

        }
-        .hover3:hover div{
+
+        .hover3:hover div {
            -webkit-background-clip: unset;
            -webkit-text-fill-color: unset;
            color: white;
@ -158,17 +167,21 @@
        .checkbox1 .checkmark:after {

        }
+
        td {
            padding-top: 20px;
            padding-bottom: 10px;

        }
-        tr{
+
+        tr {
            vertical-align: top;
        }
+
        #faculty {
            width: 40%;
        }
+
        /* width */
        .scroll-1::-webkit-scrollbar {
            width: 15px;
@ -207,59 +220,73 @@

    </style>
    <script
-        src="{{ URL::to('https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js') }}" integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">
+        src="{{ URL::to('https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.min.js') }}"
+        integrity="sha384-cVKIPhGWiC2Al4u+LWgxfKTRIcfu0JTxR+EQDz/bgldoEyl4H0zUF0QKbrJ0EcQF" crossorigin="anonymous">

    </script>
    <body>


-
    <header>
-        <div class="container-fluid position-relative " style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
-             <div class=" d-none d-xl-flex justify-content-end align-items-end position-absolute float-end  z-1 " style="height: 100%; " >
+        <div class="container-fluid position-relative "
+             style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
+            <div class=" d-none d-xl-flex justify-content-end align-items-end position-absolute float-end  z-1 "
+                 style="height: 100%; ">
                <div style="width: 60%">
-                   <img class="img-fluid float-end  " src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt="">
+                    <img class="img-fluid float-end  "
+                         src="{{ URL::to('img/front-page/bakalavr-special/professor.png') }}" alt="">
                </div>
            </div>
            <div class="ms-0 ms-md-5   ">
                <div class="row">
                    <div class="col-lg-3 col-12 d-none d-xl-flex justify-content-start align-items-center mt-2">
                        <div class=" " style="width: 30%">
-                            <img class="img-fluid float-end " src="{{ URL::to('img/front-page/logo-white.png') }}" alt="">
+                            <img class="img-fluid float-end " src="{{ URL::to('img/front-page/logo-white.png') }}"
+                                 alt="">
                        </div>
                    </div>
                    <div class="col-xl-8 col-12 ">
                        <div class=" me-0 me-md-2 row d-lg-flex justify-content-end border-bottom border-white ">

-                            <div class="col-12 col-xl-8 d-inline mt-5 d-lg-flex justify-content-end z-2 position-relative  pb-3" style="font-family: Geologica-Light">
+                            <div
+                                class="col-12 col-xl-8 d-inline mt-5 d-lg-flex justify-content-end z-2 position-relative  pb-3"
+                                style="font-family: Geologica-Light">

-                                <a href="#" class="col-auto pe-lg-3  text-white text-sm-start" style="font-size: 20px;font-weight: 400;line-height: 29px;">
-                                    <div class="hover2"> Колл-центр: 8 800 550-23-01 </div>
+                                <a href="#" class="col-auto pe-lg-3  text-white text-sm-start"
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                    <div class="hover2"> Колл-центр: 8 800 550-23-01</div>
                                </a>
-                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
-                                    <div class="hover2"> Почта: info@mkgtu.ru </div>
+                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start "
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                    <div class="hover2"> Почта: info@mkgtu.ru</div>
                                </a>
-                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start "
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
                                    <div class="hover2"> Все контакты</div>
                                </a>
-{{--                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
-{{--                                    <div class="hover2"> RU </div>--}}
-{{--                                </a>--}}
+                                {{--                                <a href="#" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">--}}
+                                {{--                                    <div class="hover2"> RU </div>--}}
+                                {{--                                </a>--}}
                                {{--                            <img id="specialButton" style="cursor:pointer; width: 25px; height: 25px;" src="{{ URL::to('img/front-page/eye.png') }}" alt="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" title="ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ" />--}}
                            </div>

                        </div>
                        <div class=" me-0 me-md-2 row d-lg-flex justify-content-end ">

-                            <div class="col-12 col-xl-8 d-inline mt-3 d-lg-flex justify-content-end z-2 position-relative " style="font-family: Geologica-Light">
+                            <div
+                                class="col-12 col-xl-8 d-inline mt-3 d-lg-flex justify-content-end z-2 position-relative "
+                                style="font-family: Geologica-Light">

-                                <a href="{{ URL::to('/') }}" class="col-auto pe-lg-3  text-white text-sm-start" style="font-size: 20px;font-weight: 400;line-height: 29px;">
-                                    <div class="hover2"> Бакалавриат / Специалитет </div>
+                                <a href="{{ URL::to('/') }}" class="col-auto pe-lg-3  text-white text-sm-start"
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                    <div class="hover2"> Бакалавриат / Специалитет</div>
                                </a>
-                                <a href="{{ URL::to('magistr') }}" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
-                                    <div class="hover2"> Магистратура </div>
+                                <a href="{{ URL::to('magistr') }}" class="col-auto px-lg-3 text-white text-sm-start "
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                    <div class="hover2"> Магистратура</div>
                                </a>
-                                <a href="{{ URL::to('inostran') }}" class="col-auto px-lg-3 text-white text-sm-start " style="font-size: 20px;font-weight: 400;line-height: 29px;">
+                                <a href="{{ URL::to('inostran') }}" class="col-auto px-lg-3 text-white text-sm-start "
+                                   style="font-size: 20px;font-weight: 400;line-height: 29px;">
                                    <div class="hover2"> Иностранным абитуриентам</div>
                                </a>

@ -270,24 +297,27 @@
                </div>


-
                <div class="row">
-                    <div class="col-12 text-white display-1  my-5 text-center text-md-start" style=" font-weight: 900; letter-spacing: 0em; ">
+                    <div class="col-12 text-white display-1  my-5 text-center text-md-start"
+                         style=" font-weight: 900; letter-spacing: 0em; ">
                        ПОСТУПАЙ В МГТУ
                    </div>
                </div>
                <div class="row">
-                    <div class="fs-3 col-12 text-white mb-3 text-center text-md-start opacity-75 " style="  letter-spacing: 0em; ">
+                    <div class="fs-3 col-12 text-white mb-3 text-center text-md-start opacity-75 "
+                         style="  letter-spacing: 0em; ">
                        75 студенческих объединений
                    </div>
                </div>
                <div class="row">
-                    <div class="display-5 col-12 text-white mb-3 text-center text-md-start " style=" font-weight: 700; letter-spacing: 0em; ">
+                    <div class="display-5 col-12 text-white mb-3 text-center text-md-start "
+                         style=" font-weight: 700; letter-spacing: 0em; ">
                        3367 БЮДЖЕТНЫХ МЕСТ
                    </div>
                </div>
                <div class="row">
-                    <div class="fs-3 col-12 text-white mb-3 text-center text-md-start opacity-75" style="  letter-spacing: 0em; ">
+                    <div class="fs-3 col-12 text-white mb-3 text-center text-md-start opacity-75"
+                         style="  letter-spacing: 0em; ">
                        300 образовательных программ
                    </div>
                </div>
@ -295,14 +325,20 @@
                    <br><br><br><br><br><br><br>
                </div>

-                <div class=" mt-5 row d-lg-inline d-flex justify-content-center position-relative " >
-                    <a href="#" class="hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex" style="  background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
+                <div class=" mt-5 row d-lg-inline d-flex justify-content-center position-relative ">
+                    <a href="#"
+                       class="hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"
+                       style="  background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
                        Личный кабинет
                    </a>
-                    <a href="#" class="hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex" style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
+                    <a href="#"
+                       class="hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"
+                       style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
                        День открытых дверей
                    </a>
-                    <a href="#" class=" hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex" style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
+                    <a href="#"
+                       class=" hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"
+                       style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px;  letter-spacing: 0; ">
                        Твои возможности
                    </a>
                </div>
@ -313,11 +349,13 @@
        </div>
    </header>

-    <div style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon3_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
+    <div
+        style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon3_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">

-        <div class="container-fluid ms-sm-5  py-5" >
+        <div class="container-fluid ms-sm-5  py-5">
            <div class="row">
-                <div class="display-5 col-12  mb-3 text-center text-md-start " style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-weight: 700; letter-spacing: 0em;  ">
+                <div class="display-5 col-12  mb-3 text-center text-md-start "
+                     style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-weight: 700; letter-spacing: 0em;  ">
                    ПЕРЕЧЕНЬ ФАКУЛЬТЕТОВ
                </div>
            </div>
@ -328,17 +366,22 @@
                    <div class="mt-xl-5 col-xxl-4 col-md-6 col-10 ">

                        <!-- Button trigger modal -->
-                        <button type="button" data-bs-toggle="modal" data-bs-target="#exampleModal-{{ $faculty->id }}" class=" col-md-11 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex justify-content-start align-items-center hover1 " style="background-color: #ffffff; border-radius: 15px; border: unset;">
-                            <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/5.png') }}" alt="">
-                            <span class="ms-xl-5 ms-2 z-3 gradient-text text-start" > {{ $faculty->name }}</span>
+                        <button type="button" data-bs-toggle="modal" data-bs-target="#exampleModal-{{ $faculty->id }}"
+                                class=" col-md-11 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex justify-content-start align-items-center hover1 "
+                                style="background-color: #ffffff; border-radius: 15px; border: unset;">
+                            <img class=" " style="width: 108px; height: auto "
+                                 src="{{ URL::to('img/faculties/5.png') }}" alt="">
+                            <span class="ms-xl-5 ms-2 z-3 gradient-text text-start"> {{ $faculty->name }}</span>
                        </button>

                        <!-- Modal -->
-                        <div class="modal fade" id="exampleModal-{{ $faculty->id }}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
-                            <div class="modal-dialog modal-xl" >
-                                <div class="modal-content" > <!--style="border-radius: 30px;"-->
+                        <div class="modal fade" id="exampleModal-{{ $faculty->id }}" tabindex="-1"
+                             aria-labelledby="exampleModalLabel" aria-hidden="true">
+                            <div class="modal-dialog modal-xl">
+                                <div class="modal-content"> <!--style="border-radius: 30px;"-->
                                    <div class="modal-header d-flex justify-content-center">
-                                        <img class="" style="width: 108px; height: auto " src="{{ URL::to('img/faculties/5.png') }}" alt="">
+                                        <img class="" style="width: 108px; height: auto "
+                                             src="{{ URL::to('img/faculties/5.png') }}" alt="">


                                    </div>
@ -347,15 +390,17 @@
                                    <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-6"
+                                               style=" font-family: Geologica-ExtraLight;   text-align: justify;"> {{ $faculty->description }}</p>
                                            <p class="fs-5">Специальности</p>
                                            <div class="table-responsive">
-                                                <table class="table w-100 fs-6" style=" font-family: Geologica-ExtraLight">
+                                                <table class="table w-100 fs-6"
+                                                       style=" font-family: Geologica-ExtraLight">
                                                    <tr>
-                                                        <th> Название </th>
-                                                        <th> Код специальности </th>
-                                                        <th> Уровень образования </th>
-                                                        <th> Форма обучения </th>
+                                                        <th> Название</th>
+                                                        <th> Код специальности</th>
+                                                        <th> Уровень образования</th>
+                                                        <th> Форма обучения</th>
                                                    </tr>

                                                    @foreach($faculty->departments as $department)
@ -391,13 +436,17 @@


                                                        @endphp
-{{--                                                    @dd($napr)--}}
+                                                        {{--                                                    @dd($napr)--}}
                                                        @foreach($napr as $el)

                                                            <tr>
                                                                <td>
-                                                                    <a class=" border border-dark rounded-3 p-2 hover1" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasScrolling-{{ $el['id'] }}" aria-controls="offcanvasScrolling" role="button">{{ $el['name'] }}</a>
-{{--                                                                    @dd($el)--}}
+                                                                    <a class=" border border-dark rounded-3 p-2 hover1"
+                                                                       type="button" data-bs-toggle="offcanvas"
+                                                                       data-bs-target="#offcanvasScrolling-{{ $el['id'] }}"
+                                                                       aria-controls="offcanvasScrolling"
+                                                                       role="button">{{ $el['name'] }}</a>
+                                                                    {{--                                                                    @dd($el)--}}
                                                                    @php
                                                                        $DirectonHtmlBuilder = new DirectonHtmlBuilder($el);
                                                                        echo $DirectonHtmlBuilder->getHTML();
@ -424,12 +473,10 @@
                                        </div>


-
-
-
                                    </div>
                                    <div class="modal-footer">
-                                        <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Закрыть</button>
+                                        <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Закрыть
+                                        </button>

                                    </div>
                                </div>
@ -440,14 +487,16 @@
                @endforeach

            </div>
-</div>
+        </div>
    </div>

-    <div style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
+    <div
+        style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">

        <div class="container-fluid ms-sm-5  pt-5">
            <div class="row">
-                <div class="display-5 col-12 text-white mb-3 text-center text-md-start " style=" font-weight: 700; letter-spacing: 0em; ">
+                <div class="display-5 col-12 text-white mb-3 text-center text-md-start "
+                     style=" font-weight: 700; letter-spacing: 0em; ">
                    КАЛЬКУЛЯТОР ЕГЭ
                </div>
            </div>
@ -455,14 +504,15 @@
                <div class="col-md-4 col-12 ">
                    <div class="row">

-                        <div class="text-white display-6" > Выберите предметы ЕГЭ</div>
+                        <div class="text-white display-6"> Выберите предметы ЕГЭ</div>
                        <form class="text-white mt-4 fs-4 calcul" style=" font-family: Geologica-ExtraLight">
-                            <script src="{{ URL::to('https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js')}}"></script>
+                            <script
+                                src="{{ URL::to('https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js')}}"></script>
                            @foreach($subjects as $id => $name)
-
-                                @if($name == "Русский язык" || $name == "Математика" )
-                                    <label class="checkbox1"> {{$name }}
-                                        <input class="checkbox_input_clear" type="checkbox" checked="checked"  value="{{ $id }}"  >
+                                @if($name === "Русский язык" || $name === "Математика" )
+                                    <label class="checkbox1"> {{ $name }}
+                                        <input class="checkbox_input_clear" type="checkbox" checked="checked"
+                                               value="{{ $id }}">
                                        <span class="checkmark"></span>
                                    </label>
                                @endif
@ -470,7 +520,7 @@
                            <hr class="col-5">
                            @foreach($subjects as $id => $name)
                                @if($name !== "Русский язык" && $name !== "Математика" )
-                                        <label class="checkbox1"> {{$name }}
+                                    <label class="checkbox1"> {{ $name }}
                                        <input class="checkbox_input_clear" type="checkbox" value="{{ $id }}">
                                        <span class="checkmark"></span>
                                    </label>
@ -479,35 +529,43 @@

                        </form>
                        <div class="row d-md-block d-flex ms-md-3 justify-content-center">
-                           <a role="button" style="border-radius: 11px; font-family: Geologica-ExtraLight" class="hover3 unclearall mt-4 col-5 text-white p-2 border border-white  d-inline-flex justify-content-center shadow"> Сбросить фильтр </a>
+                            <a role="button" style="border-radius: 11px; font-family: Geologica-ExtraLight"
+                               class="hover3 unclearall mt-4 col-5 text-white p-2 border border-white  d-inline-flex justify-content-center shadow">
+                                Сбросить фильтр </a>


                        </div>
-                        <script>window.onload = function() {
-                                $(".unclearall").click(function(){
+                        <script>window.onload = function () {
+                                $(".unclearall").click(function () {

-                                    $('input[type="checkbox"]').prop('checked',false);
+                                    $('input[type="checkbox"]').prop('checked', false);

                                    return false;

                                })
-                                $(".calcul input").click(function(){
+                                $(".calcul input").click(function () {
                                    $('.text-remove').remove();
-                                    let selected = []; let predmets='';
-                                    $('.calcul input:checked').each(function() {
-                                        selected.push($(this).val());
-                                        predmets += $(this).val()+',';
+                                    let selected = [];
+                                    let predmets = '';
+                                    $('.calcul input:checked').each(function () {
+                                        selected.push(+$(this).val());
+                                        predmets += $(this).val() + ',';
                                    });


+                                    $.ajax({
+                                        url: "{{ route('calculator') }}",
+                                        dataType: 'json',
+                                        cache: false,
+                                        type: "POST",
+                                        data: 'ajx=get_napr&format=html&predmets=' + JSON.stringify(selected),

-                                    $.ajax({ url: "{{ route('calculator') }}", dataType: 'json', cache:false,type: "POST",data: 'ajx=get_napr&format=html&predmets='+JSON.stringify(selected),
-
-                                        success: function(data) {
+                                        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").append(data.html);

-                                        }});
+                                        }
+                                    });
                                });
                            };
                        </script>
@ -516,10 +574,14 @@

                <div class="col-md-6 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="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%">
-                            <table class=" text-white  px-5 calcul_rez" style="width: 90%; font-family: Geologica-ExtraLight;">
+                            <table class=" text-white  px-5 calcul_rez"
+                                   style="width: 90%; font-family: Geologica-ExtraLight;">


                            </table>
@ -527,8 +589,6 @@
                    </div>


-
-
                </div>

            </div>
@ -537,12 +597,14 @@
        </div>
        <br><br><br><br><br><br><br><br><br><br><br><br><br>
    </div>
-    <div style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon4_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
+    <div
+        style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon4_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">

        <div class="container-fluid ms-sm-5  pt-5">
            <div class="row">
                <div class="col-6">
-                    <div class="display-5 col-12  mb-3 text-center text-md-start gradient-text " style=" font-weight: 700; letter-spacing: 0em;  ">
+                    <div class="display-5 col-12  mb-3 text-center text-md-start gradient-text "
+                         style=" font-weight: 700; letter-spacing: 0em;  ">
                        ЭКРАН ПРИЕМА
                    </div>
                </div>
@ -571,22 +633,26 @@
                </div> -->
                <div class="mt-3 d-flex justify-content-center scroll-1">
                    <div class="row w-75 h-75 ps-2 scroll-1" style=" overflow:auto;">
-                        <div class="col-11 " >
+                        <div class="col-11 ">
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -594,19 +660,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -614,19 +684,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -634,19 +708,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -654,19 +732,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -674,19 +756,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -694,19 +780,23 @@
                            </div>
                            <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
                                <div class="col-9 m-3">
-                                    <div class="fs-4 gradient-text" >
+                                    <div class="fs-4 gradient-text">
                                        Начало приема документов
                                    </div>
-                                    <p class="mt-2 gradient-text" style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
-                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное, как квинтэссенцию победы
+                                    <p class="mt-2 gradient-text"
+                                       style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
+                                        А ещё базовые сценарии поведения пользователей представляют собой не что иное,
+                                        как квинтэссенцию победы
                                        маркетинга над разумом и должны быть описаны максимально подробно
                                    </p>
                                </div>
                                <div class="col-12 col-xxl-2 d-flex align-items-center ">
                                    <div>
                                        <div class="row mb-3 ms-3">
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
-                                            <div class="col-6"> 20.06.24 </div> <div class="col-6"> Бюджет </div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
+                                            <div class="col-6"> 20.06.24</div>
+                                            <div class="col-6"> Бюджет</div>
                                        </div>
                                    </div>
                                </div>
@ -714,12 +804,12 @@
                            </div>


-
                        </div>
                    </div>
                </div>

-                <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>  <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
+                <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
+                <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
            </div>
        </div>
    </div>
@ -729,7 +819,7 @@
                <div class="row">

                    <div class="col-12">
-                        <div class="text-white fs-5"> Приемная коммисия: </div>
+                        <div class="text-white fs-5"> Приемная коммисия:</div>
                        <p class="text-white"> (8772) 52-30-08 </p>
                    </div>
                </div>
@ -741,7 +831,7 @@
                </div>
                <div class="row">
                    <div class="col-12">
-                        <div class="text-white fs-5"> Почта: </div>
+                        <div class="text-white fs-5"> Почта:</div>
                        <p class="text-white"> info@mkgtu.ru </p>
                    </div>
                </div>
@ -750,12 +840,18 @@
                        <p class="text-white"> 385000, Республика Адыгея, г. Майкоп, ул. Первомайская, д. 191 </p>
                    </div>
                    <div class="col-md-6 col-12 d-flex justify-content-md-end justify-content-center">
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vid.png') }}" alt="vid"></a>
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vk.png') }}" alt="vid"></a>
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/tg.png') }}" alt="vid"></a>
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/rutub.png') }}" alt="vid"></a>
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/dzen.png') }}" alt="vid"></a>
-                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/odnok.png') }}" alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vid.png') }}"
+                                         alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/vk.png') }}"
+                                         alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/tg.png') }}"
+                                         alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/rutub.png') }}"
+                                         alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/dzen.png') }}"
+                                         alt="vid"></a>
+                        <a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/odnok.png') }}"
+                                         alt="vid"></a>
                    </div>
                </div>
            </div>
Author	SHA1	Message	Date
ROMANGOLIENKO	7fe4d05252	Merge remote-tracking branch 'origin/new-design' into new-design	2024-03-18 13:04:02 +03:00
ROMANGOLIENKO	116c949f45	fixing directions	2024-03-18 13:03:50 +03:00
ROMANGOLIENKO	f93404d996	adding to gitignore	2024-03-18 12:26:14 +03:00
aslan	9fcd049173	fix new logic to calculator with required and optional subjects	2024-03-18 11:56:03 +03:00
aslan	75870ab2fd	fix new logic to calculator with required and optional subjects	2024-03-18 11:55:25 +03:00
aslan	8a94e7a750	fix new logic to calculator with required and optional subjects	2024-03-18 11:36:14 +03:00
aslan	68ccbf2910	fix new logic to calculator with required and optional subjects	2024-03-18 11:21:48 +03:00
aslan	077eda117f	fix new logic to calculator with required and optional subjects	2024-03-18 09:49:38 +03:00
aslan	1bd362180e	fix lint	2024-03-18 09:44:42 +03:00
aslan	b37a1225c4	fix new logic to calculator with required and optional subjects	2024-03-18 09:43:58 +03:00
aslan	08bc93ad2d	add new logic to calculator with required and optional subjects	2024-03-15 16:55:58 +03:00
aslan	c13f5f38c2	fix lint	2024-03-15 16:15:42 +03:00
aslan	5202545724	Merge pull request 'adding logic to direction view' (#32 ) from RomanGolienko/Roman_applicant-site:new-design into main Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/32	2024-03-15 16:10:00 +03:00