aslan
/
applicant-site
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: aslan:1155f2c34aed7abd088eb8ee763b5483458cd1c8
Branches Tags
aslan:main
aslan:new-calculator
...
compare: aslan:18c703f93113923cea93e5dbb69f99cb641fcf04
Branches Tags
aslan:main
aslan:new-calculator

2 Commits
1155f2c34a ... 18c703f931

Author SHA1 Message Date
aslan 18c703f931 Merge pull request 'direction show logic change' (#31) from RomanGolienko/Roman_applicant-site:new-design into main
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (push) Failing after 2m11s Details
Tests & Lint & Deploy to Railway / deploy (push) Has been skipped Details 
Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/31
 2024-03-15 10:39:03 +03:00
ROMANGOLIENKO c91ae889a3 direction show logic change
Tests & Lint & Deploy to Railway / build (2.6.6, 20.x, 8.3) (pull_request) Failing after 2m37s Details
Tests & Lint & Deploy to Railway / deploy (pull_request) Has been skipped Details
2024-03-15 10:38:26 +03:00
2 changed files with 42 additions and 19 deletions
Show Stats Expand all files Collapse all files

29
app/Services/DirectonHtmlBuilder.php
View File

@ -4,21 +4,23 @@ namespace App\Services;
use App\Models\Direction;
use Illuminate\Support\Facades\URL;
use PhpParser\Node\Expr\Array_;
class DirectonHtmlBuilder
{
private Direction $direction;
private array $direction;
public function __construct($direction)
{
$this->direction = $direction;
}
public function getHTML()
{
// phpcs:disable
$direction = $this->direction;
$fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png');
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\">
$educationForm = implode(", ", $direction['educationForm']);
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 \">
@ -32,11 +34,11 @@ class DirectonHtmlBuilder
<div class='col-md-6 col-12 d-block'>
<div class=\"\">
<div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction->code} </div>
<div class=\"display-5 \" > {$direction->name}</div>
<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>
<p style=\"text-align: justify;\">{$direction['description']}</p>
</div>
</div>
@ -46,31 +48,32 @@ class DirectonHtmlBuilder
<div class=\"p-3 px-5 border-success fs-4\" style='border-radius: 50px; border: 2px solid;'>
<div > Уровень образования:
<strong>{$direction->educationLevel->name} </strong>
<strong>{$direction['educationLevel']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Форма обучения:
<strong>{$direction->educationForm->name} </strong>
<strong> {$educationForm}
</strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Бюджетные места:
<strong >{$direction->budget_places} </strong>
<strong >{$direction['budget_places']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Квота:
<strong >{$direction->quota} </strong>
<strong >{$direction['quota']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Места на контракт:
<strong >{$direction->paid_places} </strong>
<strong >{$direction['paid_places']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Стоимость платного обучения:
<strong >{$direction->cost_paid_place} </strong>
<strong >{$direction['cost_paid_place']} </strong>
</div>
<hr class='d-block d-md-none'><br>
<div > Период обучения (в годах):
<strong>{$direction->period} </span>
<strong>{$direction['period']} </span>
</div>
</div>
</div>

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

@ -359,20 +359,40 @@
</tr>
@foreach($faculty->departments as $department)
@foreach($department->directions as $direction)
@php
$napr = array();
foreach ($department->directions as $direction){
$napr[$direction->name]['educationForm'][$direction->name . ' ' . $direction->id] = $direction->educationForm->name;
$napr[$direction->name]['id'] = $direction->id;
$napr[$direction->name]['code'] = $direction->code;
$napr[$direction->name]['educationLevel'] = $direction->educationLevel->name;
$napr[$direction->name]['name'] = $direction->name;
$napr[$direction->name]['budget_places'] = $direction->budget_places;
$napr[$direction->name]['quota'] = $direction->quota;
$napr[$direction->name]['paid_places'] = $direction->paid_places;
$napr[$direction->name]['cost_paid_place'] = $direction->cost_paid_place;
$napr[$direction->name]['period'] = $direction->period;
$napr[$direction->name]['description'] = $direction->description;
}
@endphp
@foreach($napr as $el)
<tr>
<td>
<a class=" border border-dark rounded-3 p-2 hover1" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasScrolling-{{ $direction->id }}" aria-controls="offcanvasScrolling" role="button">{{ $direction->name }}</a>
<a class=" border border-dark rounded-3 p-2 hover1" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasScrolling-{{ $el['id'] }}" aria-controls="offcanvasScrolling" role="button">{{ $el['name'] }}</a>
@php
$DirectonHtmlBuilder = new DirectonHtmlBuilder($direction);
$DirectonHtmlBuilder = new DirectonHtmlBuilder($el);
echo $DirectonHtmlBuilder->getHTML();
@endphp
</td>
<td> {{ $direction->code }} </td>
<td> {{ $direction->educationLevel->name }} </td>
<td> {{ $direction->educationForm->name }} </td>
<td> {{ $el['code'] }} </td>
<td> {{ $el['educationLevel'] }} </td>
<td> <?php foreach($el['educationForm'] as $form) { echo $form . '<br>'; } ?> </td>
</tr>
@endforeach
@endforeach