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

Compare commits

base: aslan:bffff7f2097275fc83911acfcdd99081cecb5ce8
Branches Tags
aslan:main
aslan:new-calculator
...
compare: aslan:7f6b65175b5ea1abcf95b765e368d63c6974eeea
Branches Tags
aslan:main
aslan:new-calculator

2 Commits
bffff7f209 ... 7f6b65175b

Author SHA1 Message Date
aslan 7f6b65175b Merge pull request 'EGE bug fix' (#56) from RomanGolienko/Roman_applicant-site:feature/visually-impaired-mode into main
Tests & Lint & Deploy to Railway / build (2.7.6, 20.x, 8.3) (push) Failing after 1s Details
Tests & Lint & Deploy to Railway / deploy (push) Has been skipped Details 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/56
 2024-06-06 09:38:27 +03:00
RomanGolienko aa0e773592 EGE bug fix 2024-06-06 09:37:54 +03:00
2 changed files with 16 additions and 7 deletions
Show Stats 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>

7
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>