Merge pull request 'design changes' (#34) from RomanGolienko/Roman_applicant-site:prodV1 into main
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/34
This commit is contained in:
commit
9bd1c03580
|
|
@ -2,9 +2,7 @@
|
||||||
|
|
||||||
namespace App\Services;
|
namespace App\Services;
|
||||||
|
|
||||||
use App\Models\Direction;
|
|
||||||
use Illuminate\Support\Facades\URL;
|
use Illuminate\Support\Facades\URL;
|
||||||
use PhpParser\Node\Expr\Array_;
|
|
||||||
|
|
||||||
class DirectonHtmlBuilder
|
class DirectonHtmlBuilder
|
||||||
{
|
{
|
||||||
|
|
@ -15,6 +13,7 @@ class DirectonHtmlBuilder
|
||||||
{
|
{
|
||||||
$this->direction = $direction;
|
$this->direction = $direction;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHTML()
|
public function getHTML()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -22,12 +21,9 @@ class DirectonHtmlBuilder
|
||||||
$direction = $this->direction;
|
$direction = $this->direction;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png');
|
$fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$educationForms = '';
|
$educationForms = '';
|
||||||
foreach ($direction['educationForms'] as $key => $educationForm) {
|
foreach ($direction['educationForms'] as $key => $educationForm) {
|
||||||
$educationForms .= $key . ', ';
|
$educationForms .= $key . ', ';
|
||||||
|
|
@ -35,7 +31,6 @@ class DirectonHtmlBuilder
|
||||||
$educationForms = substr($educationForms, 0, -2);
|
$educationForms = substr($educationForms, 0, -2);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// phpcs:disable
|
// phpcs:disable
|
||||||
|
|
||||||
$budget_places_array = array();
|
$budget_places_array = array();
|
||||||
|
|
@ -96,76 +91,68 @@ class DirectonHtmlBuilder
|
||||||
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\">
|
||||||
|
|
||||||
|
|
||||||
<div class=\"mx-5 \">
|
<div class=\"mx-5 \">
|
||||||
<div class=\"col-12 d-flex justify-content-end mt-4\">
|
<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 type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\"></button>
|
||||||
</button>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class='row'>
|
<div class='row'>
|
||||||
|
|
||||||
<div class='col-12 d-block'>
|
<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=\"\">
|
<hr class='col-11 '>
|
||||||
<div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
|
<div class=\"mt-4\">
|
||||||
<div class=\"display-6 \" > {$direction['name']}</div>
|
<p style=\"text-align: justify;\">{$direction['description']}</p>
|
||||||
</div>
|
</div>
|
||||||
<div class=\"mt-4\">
|
|
||||||
<p style=\"text-align: justify;\">{$direction['description']}</p>
|
|
||||||
|
|
||||||
|
</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 > Уровень образования:
|
||||||
|
<strong>{$direction['educationLevel']} </strong>
|
||||||
|
</div>
|
||||||
|
<div > Форма обучения:
|
||||||
|
<strong> $educationForms</strong>
|
||||||
|
</div>
|
||||||
|
<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>
|
||||||
|
</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>
|
||||||
|
</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 > Уровень образования:
|
|
||||||
<strong>{$direction['educationLevel']} </strong>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div > Форма обучения:
|
|
||||||
<strong> $educationForms
|
|
||||||
</strong>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<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=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div> ";
|
|
||||||
}
|
}
|
||||||
// phpcs:enable
|
// phpcs:enable
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -581,7 +581,7 @@
|
||||||
style="font-family: Geologica-ExtraLight">Выберите предметы
|
style="font-family: Geologica-ExtraLight">Выберите предметы
|
||||||
</div>
|
</div>
|
||||||
<div class="table-responsive p-5 w-100 " style=" max-height: 700px; ">
|
<div class="table-responsive p-5 w-100 " style=" max-height: 700px; ">
|
||||||
<table class=" text-white px-5 calcul_rez"
|
<table class=" text-white calcul_rez"
|
||||||
style="width: 90%; font-family: Geologica-ExtraLight;">
|
style="width: 90%; font-family: Geologica-ExtraLight;">
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue