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

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:
aslan 2024-03-21 14:50:13 +03:00
parent 8667765396 3bf100ed74
commit 9bd1c03580
2 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Services/DirectonHtmlBuilder.php
View File

@ -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();
@ -98,74 +93,66 @@ class DirectonHtmlBuilder
<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=\"\">
<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-6 \" > {$direction['name']}</div>
</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>
<hr class='col-11 '>
<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> </div>
</div> </div>
</div>
<div class='row'> <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-11 d-flex justify-content-end'> <a href='#' role='button'> Бюджет </a> | <a href='#' role='button' > Коммерция</a> </div>
<div class=' col-4 '> <div class=' col-4 '>
<div class=\"p-3 px-5 border-success fs-5\" style='border-radius: 20px; border: 2px solid;'> <div class=\"p-3 px-5 border-success fs-5\" style='border-radius: 20px; border: 2px solid;'>
<div > Уровень образования: <div > Уровень образования:
<strong>{$direction['educationLevel']} </strong> <strong>{$direction['educationLevel']} </strong>
</div> </div>
<div > Форма обучения: <div > Форма обучения:
<strong> $educationForms <strong> $educationForms</strong>
</strong>
</div> </div>
<div > Период обучения (в годах): <div > Период обучения (в годах):
{$period} {$period}
</div> </div>
</div> </div>
</div> </div>
<div class=' col-7 '> <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 class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
Места для обучения: </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 class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
</div> </div>
</div> </div>
</div> </div>";
</div>
</div> ";
} }
// phpcs:enable // phpcs:enable
} }

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

@ -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;">