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

Merge pull request 'EGE bug fix' (#56) from RomanGolienko/Roman_applicant-site:feature/visually-impaired-mode into main 

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/56
This commit is contained in:
aslan 2024-06-06 09:38:27 +03:00
parent bffff7f209 aa0e773592
commit 7f6b65175b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Services/DirectonHtmlBuilder.php
View File

@ -55,10 +55,16 @@ class DirectonHtmlBuilder
<br> <br>
<div class=" d-inline-block p-2 text-start">'; <div class=" d-inline-block p-2 text-start">';
if (array_key_exists('ЕГЭ', $direction['entrance_examinations'])){
foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) {
$EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ; $EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ;
} }
$EGE .= '</div></div>'; $EGE .= '</div></div>';
} else {
$EGE = '';
}
$po_viboru = '<div class="col-auto "> $po_viboru = '<div class="col-auto ">
<strong> Предметы по выбору </strong> <strong> Предметы по выбору </strong>

5
app/Services/DirectonHtmlBuilderForCalculator.php
View File

@ -55,11 +55,14 @@ class DirectonHtmlBuilderForCalculator
<br> <br>
<br> <br>
<div class=" d-inline-block p-2 text-start">'; <div class=" d-inline-block p-2 text-start">';
if (array_key_exists('ЕГЭ', $direction['entrance_examinations'])) {
foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) {
$EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>'; $EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>';
} }
$EGE .= '</div></div>'; $EGE .= '</div></div>';
} else {
$EGE = '';
}
$po_viboru = '<div class="col-auto "> $po_viboru = '<div class="col-auto ">
<strong> Предметы по выбору </strong> <strong> Предметы по выбору </strong>
<br> <br>