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

Compare commits

base: RomanGolienko:3bf100ed741aff0ddc16fb28b31f6c906d8e92ac
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:d5ace86b61493d4bc0595e44b31c2ad3f9c730f1
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. "3bf100ed741aff0ddc16fb28b31f6c906d8e92ac" and "d5ace86b61493d4bc0595e44b31c2ad3f9c730f1" have entirely different histories.
3bf100ed74 ... d5ace86b61

4 changed files with 111 additions and 106 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,4 +23,3 @@ yarn-error.log
/_ide_helper.php
/_ide_helper_models.php
/public/img/icons/play-button.png
/tabit.sql

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

@ -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} <tr class=\"border-bottom border-white my-3\">
<td class='w-25 '>
<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>
return "{$acc} <tr class=\"\">
<td id=\"faculty\"> {$faculty->name} </td>
<td>
<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\">
@ -134,9 +134,8 @@ class CalculatorController extends Controller
</div>
</div>
</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>";
};
// phpcs:enable

148
app/Services/DirectonHtmlBuilder.php
View File

@ -2,7 +2,9 @@
namespace App\Services;
use App\Models\Direction;
use Illuminate\Support\Facades\URL;
use PhpParser\Node\Expr\Array_;
class DirectonHtmlBuilder
{
@ -13,7 +15,6 @@ class DirectonHtmlBuilder
{
$this->direction = $direction;
}
public function getHTML()
{
@ -21,9 +22,12 @@ class DirectonHtmlBuilder
$direction = $this->direction;
$fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png');
$educationForms = '';
foreach ($direction['educationForms'] as $key => $educationForm) {
$educationForms .= $key . ', ';
@ -31,6 +35,7 @@ class DirectonHtmlBuilder
$educationForms = substr($educationForms, 0, -2);
// phpcs:disable
$budget_places_array = array();
@ -53,106 +58,109 @@ class DirectonHtmlBuilder
$profiles = '';
//if (array_key_exists('educationalInstitution',$direction)) echo '+++++'; else echo '----';
//exit();
// if (array_key_exists('educationalInstitution', $direction)) {
// foreach ($direction['educationalInstitution'] as $educationalInstitution_name => $educationalInstitution) {
//
// $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\">
// <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}\">
// {$profile_name}
// </button>
// </h2>
// <div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
// <div class=\"accordion-body\">
// $profile_out
//
//
//
// </div>
// </div>
// </div>
// </div>
// ";
// }
// };
// }
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) {
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);
$profiles .= "
<div class=\"accordion \" id=\"accordionPanelsStayOpenExample\">
<div class=\"accordion-item\">
<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}\">
{$profile_name}
</button>
</h2>
<div id=\"panelsStayOpen-{$tmp}\" class=\"accordion-collapse collapse show\">
<div class=\"accordion-body\">
$profile_out
</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\">
<div class=\"mx-5 \">
<div class=\"col-12 d-flex justify-content-end mt-4\">
<button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\"></button>
<button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\">
</button>
</div>
<div class='row'>
<div class='col-11 d-block'>
<div class='col'>
<div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
<div class=\"display-6 \" > {$direction['name']}</div>
</div>
<div class='col d-flex justify-content-end'>
<div class=\"fs-5 \" style=\"font-family: Geologica-Light\">
<a href='#' role='button'> МГТУ </a> |
<a href='#' role='button' > Филиал МГТУ (пос. Яблоновский)</a>
</div>
</div>
</div>
<div class='col-md-6 col-12 d-block'>
<hr class='col-11 '>
<div class=\"\">
<div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
<div class=\"display-5 \" > {$direction['name']}</div>
</div>
<div class=\"mt-4\">
<p style=\"text-align: justify;\">{$direction['description']}</p>
</div>
<div class='row'> <p class='fs-5'> Бюджетные места: </p> {$profiles} </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>
<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 > Уровень образования:
<strong>{$direction['educationLevel']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Форма обучения:
<strong> $educationForms</strong>
<strong> $educationForms
</strong>
</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 > Период обучения (в годах):
{$period}
</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 class='row mt-3'>
<div class=' col-9 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
</div>
<div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
</div>
</div>
<div class=' col-2 '>
<div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
</div>
</div>
</div>
</div>
</div>
</div>";
</div> ";
}
// phpcs:enable
}

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

@ -74,7 +74,6 @@
.hover1:hover {
transform: scale(1.1);
transition: all .3s ease-in-out;
z-index: 1052;
}
@ -388,15 +387,15 @@
</div>
<p class="text-center fs-3"> {{ $faculty->name }} </p>
<div class="modal-body d-flex justify-content-center" >
<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-5">Специальности</p>
<div class="table-responsive ps-4">
<div class="table-responsive">
<table class="table w-100 fs-6"
style=" font-family: Geologica-ExtraLight;">
style=" font-family: Geologica-ExtraLight">
<tr>
<th> Название</th>
<th> Код специальности</th>
@ -562,7 +561,7 @@
data: 'ajx=get_napr&format=html&predmets=' + JSON.stringify(selected),
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);
}
@ -573,15 +572,15 @@
</div>
</div>
<div class="col-md-7 mt-md-0 mt-5 col-12">
<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="table-responsive p-5 w-100 " style=" max-height: 700px; ">
<table class=" text-white calcul_rez"
<div class="table-responsive ps-5 " style="width: 90%">
<table class=" text-white px-5 calcul_rez"
style="width: 90%; font-family: Geologica-ExtraLight;">