RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

Compare commits

base: RomanGolienko:8520384aa38b6dda23f1732f4982074561249ee6
Branches Tags
RomanGolienko:main
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator
..
compare: RomanGolienko:419ec63dde8ac25d0cb7f04a6f930e58beab5fef
Branches Tags
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:main
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator

No commits in common. "8520384aa38b6dda23f1732f4982074561249ee6" and "419ec63dde8ac25d0cb7f04a6f930e58beab5fef" have entirely different histories.
8520384aa3 ... 419ec63dde

3 changed files with 67 additions and 68 deletions
Show Stats Expand all files Collapse all files

11
app/Http/Controllers/Api/CalculatorController.php
View File

@ -61,10 +61,10 @@ class CalculatorController extends Controller
$faculty = Faculty::find($department->faculty_id); $faculty = Faculty::find($department->faculty_id);
// phpcs:disable // phpcs:disable
$fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png');
return "{$acc} <tr class=\"border-bottom border-white my-3\"> return "{$acc} <tr class=\"\">
<td id=\"faculty\"> {$faculty->name} </td>
<td class='w-25 '> <td>
<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> <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>
<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\"> <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,9 +134,8 @@ class CalculatorController extends Controller
</div> </div>
</div> </div>
</td> </td>
<td class=\"text-end\"> {$direction->cost_paid_place}</td>
<td class=\"text-end\"> {$direction->period} </td>
<td class=\"text-end\"> {$direction->period} </td>
</tr>"; </tr>";
}; };
// phpcs:enable // phpcs:enable

113
app/Services/DirectonHtmlBuilder.php
View File

@ -58,40 +58,40 @@ class DirectonHtmlBuilder
$profiles = ''; $profiles = '';
//if (array_key_exists('educationalInstitution',$direction)) echo '+++++'; else echo '----'; //if (array_key_exists('educationalInstitution',$direction)) echo '+++++'; else echo '----';
//exit(); //exit();
// if (array_key_exists('educationalInstitution', $direction)) { if (array_key_exists('educationalInstitution', $direction)) {
// foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) { foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
//
// $profiles .= "<p> {$educationalInstitution_name}</p>"; $profiles .= "<p> {$educationalInstitution_name}</p>";
// foreach ($educationalInstitution as $profile_name => $profile) { foreach ($educationalInstitution as $profile_name => $profile) {
// $profile_out = '<br>'; $profile_out = '<br>';
// foreach ($profile as $key => $value) { foreach ($profile as $key => $value) {
// $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>"; $profile_out .= "<span style='font-family: Geologica-ExtraLight'>{$key}</span> - <strong> {$value['budget_places']} </strong><br>";
// } }
// $tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
// $tmp = str_replace(',', '', $tmp); $tmp = str_replace(',', '', $tmp);
//// $print_r = '<pre>' . print_r($direction,1) . '<pre>'; // $print_r = '<pre>' . print_r($direction,1) . '<pre>';
// $profiles .= " $profiles .= "
// <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\"> <div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
// <div class=\"accordion-item\"> <div class=\"accordion-item\">
// <h2 class=\"accordion-header\"> <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}\"> <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#panelsStayOpen-{$tmp}\" aria-expanded=\"true\" aria-controls=\"panelsStayOpen-{$tmp}\">
// {$profile_name} {$profile_name}
// </button> </button>
// </h2> </h2>
// <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\"> <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
// <div class=\"accordion-body\"> <div class=\"accordion-body\">
// $profile_out $profile_out
//
//
//
// </div> </div>
// </div> </div>
// </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\"> 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,56 +104,57 @@ class DirectonHtmlBuilder
<div class='row'> <div class='row'>
<div class='col-12 d-block'> <div class='col-md-6 col-12 d-block'>
<div class=\"\"> <div class=\"\">
<div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div> <div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
<div class=\"display-6 \" > {$direction['name']}</div> <div class=\"display-5 \" > {$direction['name']}</div>
</div> </div>
<div class=\"mt-4\"> <div class=\"mt-4\">
<p style=\"text-align: justify;\">{$direction['description']}</p> <p style=\"text-align: justify;\">{$direction['description']}</p>
<div class='row'> <p class='fs-5'> Бюджетные места: </p> {$profiles} </div>
</div> </div>
</div>
</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=\"p-3 px-5 border-success fs-5\" style='border-radius: 20px; border: 2px solid;'> <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 > Уровень образования: <div > Уровень образования:
<strong>{$direction['educationLevel']} </strong> <strong>{$direction['educationLevel']} </strong>
</div> </div>
<hr class='d-block d-md-none'><br>
<div > Форма обучения: <div > Форма обучения:
<strong> $educationForms <strong> $educationForms
</strong> </strong>
</div> </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 > Период обучения (в годах): <div > Период обучения (в годах):
{$period} {$period}
</div> </div>
</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>
<div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\"> <div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">

7
resources/views/new-design/bakalavr-special.blade.php
View File

@ -74,7 +74,6 @@
.hover1:hover { .hover1:hover {
transform: scale(1.1); transform: scale(1.1);
transition: all .3s ease-in-out; transition: all .3s ease-in-out;
z-index: 1052;
} }
@ -394,9 +393,9 @@
<p class="fs-6" <p class="fs-6"
style=" font-family: Geologica-ExtraLight; text-align: justify;"> {{ $faculty->description }}</p> style=" font-family: Geologica-ExtraLight; text-align: justify;"> {{ $faculty->description }}</p>
<p class="fs-5">Специальности</p> <p class="fs-5">Специальности</p>
<div class="table-responsive ps-4"> <div class="table-responsive">
<table class="table w-100 fs-6" <table class="table w-100 fs-6"
style=" font-family: Geologica-ExtraLight;"> style=" font-family: Geologica-ExtraLight">
<tr> <tr>
<th> Название</th> <th> Название</th>
<th> Код специальности</th> <th> Код специальности</th>
@ -562,7 +561,7 @@
data: 'ajx=get_napr&format=html&predmets=' + JSON.stringify(selected), 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 style="text-align: right;"> Цена за обучение</th><th class="fs-5" style="text-align: right;"> Период обучения (в годах)</th></tr>'); $(".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); $(".calcul_rez").append(data.html);
} }