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

prodV1 #2

Open
RomanGolienko wants to merge 309 commits from prodV1 into main
pull from: prodV1
merge into: RomanGolienko:main
Conversation 0 Commits 309 Files Changed 373 +19 -13
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e42910067b - Show all commits

32
app/Http/Controllers/admin/PageController.php
View File

@ -83,6 +83,7 @@ class PageController extends Controller
'education_forms.name as education_form_name', 'education_forms.name as education_form_name',
'faculties.id as faculty_id', 'faculties.id as faculty_id',
'faculties.name as faculty_name', 'faculties.name as faculty_name',
'faculties.description as faculty_description',
'educational_institutions.id as educational_institution_id', 'educational_institutions.id as educational_institution_id',
'educational_institutions.name as educational_institution_name', 'educational_institutions.name as educational_institution_name',
'direction_profiles.id as direction_profile_id', 'direction_profiles.id as direction_profile_id',
@ -112,7 +113,9 @@ class PageController extends Controller
'direction_code' => $directionCode, 'direction_code' => $directionCode,
'educational_institution_id' => $educational_institution_id, 'educational_institution_id' => $educational_institution_id,
'educational_institution_name' => $educationalInstitutionName, 'educational_institution_name' => $educationalInstitutionName,
'faculty_id' => $facultyId,
'faculty_name' => $facultyName, 'faculty_name' => $facultyName,
'faculty_description' => $facultyDescription,
'education_level_name' => $educationLevelName, 'education_level_name' => $educationLevelName,
'education_form_name' => $educationFormName, 'education_form_name' => $educationFormName,
'entrance_examination_score' => $entranceExaminationScore, 'entrance_examination_score' => $entranceExaminationScore,
@ -127,22 +130,25 @@ class PageController extends Controller
'direction_description' => $directionDescription, 'direction_description' => $directionDescription,
] = $item; ] = $item;
$carry[$facultyName][$directionName]['id'] = $directionId; $carry[$facultyName]['id'] = $facultyId;
$carry[$facultyName][$directionName]['code'] = $directionCode; $carry[$facultyName]['name'] = $facultyName;
$carry[$facultyName][$directionName]['education_level'] = $educationLevelName; $carry[$facultyName]['description'] = $facultyDescription;
$carry[$facultyName][$directionName]['education_form'][] = $educationFormName; $carry[$facultyName]['directions'][$directionName]['id'] = $directionId;
$carry[$facultyName][$directionName]['education_form'] = array_unique( $carry[$facultyName]['directions'][$directionName]['code'] = $directionCode;
$carry[$facultyName][$directionName]['education_form'] $carry[$facultyName]['directions'][$directionName]['education_level'] = $educationLevelName;
$carry[$facultyName]['directions'][$directionName]['education_form'][] = $educationFormName;
$carry[$facultyName]['directions'][$directionName]['education_form'] = array_unique(
$carry[$facultyName]['directions'][$directionName]['education_form']
); );
$carry[$facultyName][$directionName]['entrance_examinations'] $carry[$facultyName]['directions'][$directionName]['entrance_examinations']
[$examinationTypeName][$subjectTypeName][$subjectName] = $entranceExaminationScore; [$examinationTypeName][$subjectTypeName][$subjectName] = $entranceExaminationScore;
$carry[$facultyName][$directionName]['budget_places'] $carry[$facultyName]['directions'][$directionName]['budget_places']
[$educationalInstitutionName][$directionProfileName][$educationFormName] = $directionBudgetPlaces; [$educationalInstitutionName][$directionProfileName][$educationFormName] = $directionBudgetPlaces;
$carry[$facultyName][$directionName]['paid_places'][$educationFormName] = $directionPaidPlaces; $carry[$facultyName]['directions'][$directionName]['paid_places'][$educationFormName] = $directionPaidPlaces;
$carry[$facultyName][$directionName]['cost_paid_place'][$educationFormName] = $directionCostPaidPlace; $carry[$facultyName]['directions'][$directionName]['cost_paid_place'][$educationFormName] = $directionCostPaidPlace;
$carry[$facultyName][$directionName]['period'][$educationFormName] = $directionPeriod; $carry[$facultyName]['directions'][$directionName]['period'][$educationFormName] = $directionPeriod;
$carry[$facultyName][$directionName]['description'] = $directionDescription; $carry[$facultyName]['directions'][$directionName]['description'] = $directionDescription;
foreach ($branches as $branch) { foreach ($branches as $branch) {
[ [
@ -153,7 +159,7 @@ class PageController extends Controller
'direction_budget_places' => $directionBudgetPlacesBranch 'direction_budget_places' => $directionBudgetPlacesBranch
] = $branch; ] = $branch;
if ($directionNameBranch === $directionName) { if ($directionNameBranch === $directionName) {
$carry[$facultyName][$directionName]['budget_places'] $carry[$facultyName]['directions'][$directionName]['budget_places']
[$educationalInstitutionNameBranch][$directionProfileNameBranch] [$educationalInstitutionNameBranch][$directionProfileNameBranch]
[$educationFormNameBranch] = $directionBudgetPlacesBranch; [$educationFormNameBranch] = $directionBudgetPlacesBranch;
} }