Merge pull request 'new-design' (#21) from RomanGolienko/Roman_applicant-site:new-design into main

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/21

resources/views/new-design/bakalavr-special.blade.php

@@ -438,123 +438,7 @@
 
                 @endforeach
 
-
-
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/10.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Лечебный факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/8.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Инженерный факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-
             </div>
-{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/9.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Технологический факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/1.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет аграрных технологий</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/12.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Педиатрический факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-
-{{--            </div>--}}
-{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/13.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Фармацевтический факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/4.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет международного образования</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/11.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Стоматологический факультет </p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-
-{{--            </div>--}}
-{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/6.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Экологический факультет</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/7.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Медицинский факультет </p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/2.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет экономики и управления </p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-
-{{--            </div>--}}
-{{--            <div class="row d-flex mt-md-4 justify-content-xxl-start justify-content-center">--}}
-{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
-{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
-
-{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/3.png') }}" alt="">--}}
-{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет информационных систем в экономике и юрисприденции</p>--}}
-
-{{--                    </a>--}}
-{{--                </div>--}}
-
-
-{{--            </div>--}}
-
-
-
-
 </div>
     </div>
 
@@ -574,18 +458,39 @@
                         <form class="text-white mt-4 fs-4 calcul" style=" font-family: Geologica-ExtraLight">
                             @foreach($subjects as $id => $name)
 
+                                @if($name == "Русский язык" || $name == "математика" )
                                     <label class="checkbox1"> {{$name }}
-                                    <input type="checkbox" @if($id == '2' || $id == '3') checked="checked" @endif value="{{ $id }}">
+                                        <input class="checkbox_input_clear" type="checkbox" checked="checked"  value="{{ $id }}"  >
                                         <span class="checkmark"></span>
                                     </label>
+                                @endif
+                            @endforeach
+                                <hr class="col-5">
+                            @foreach($subjects as $id => $name)
+                                    @if($name !== "Русский язык" && $name !== "математика" )
+                                        <label class="checkbox1"> {{$name }}
+                                            <input class="checkbox_input_clear" type="checkbox" value="{{ $id }}">
+                                            <span class="checkmark"></span>
+                                        </label>
+                                    @endif
                             @endforeach
-
-
-
 
                         </form>
                         <div class="row d-md-block d-flex ms-md-3 justify-content-center">
-                            <div style="border-radius: 11px; font-family: Geologica-ExtraLight" class="mt-4 col-5 text-white p-2 border border-white  d-inline-flex justify-content-center shadow"> Сбросить фильтр </div>
+                            <button style="border-radius: 11px; font-family: Geologica-ExtraLight" class="mt-4 col-5 text-white p-2 border border-white  d-inline-flex justify-content-center shadow checkbox_clear"> Сбросить фильтр </button>
+                            <script>
+                                function checkAll(checkEm) {
+                                    var cbs = document.getElementsByTagName('input');
+
+                                    for (var i = 0; i < cbs.length; i++) {
+                                        if (cbs[i].type == 'checkbox') {
+                                            if (cbs[i].name == 'my_form_tasks[]') {
+                                                cbs[i].checked = checkEm;
+                                            }
+                                        }
+                                    }
+                                }
+                            </script>
                         </div>
                         <script>window.onload = function() {
                                 $(".calcul input").click(function(){
@@ -617,7 +522,7 @@
 
                     </div>
                     <div class="d-md-none d-flex border border-white py-5 justify-content-center  " style="border-radius: 50px;">
-                        <table class="table1 text-white  mx-0 p-2  " style="width: 90%; font-family: Geologica-ExtraLight; font-size: 13px;">
+                        <table class="table1 text-white  mx-0 p-2 calcul_rez  " style="width: 90%; font-family: Geologica-ExtraLight; font-size: 13px;">
                             <tr class="">
                                 <td id="faculty"> Технологический факультет  </td>
                                 <td> Строительство </td>