diff --git a/app/Http/Controllers/admin/PageController.php b/app/Http/Controllers/admin/PageController.php index 30b9068..74fd7b1 100644 --- a/app/Http/Controllers/admin/PageController.php +++ b/app/Http/Controllers/admin/PageController.php @@ -83,6 +83,7 @@ class PageController extends Controller 'education_forms.name as education_form_name', 'faculties.id as faculty_id', 'faculties.name as faculty_name', + 'faculties.description as faculty_description', 'educational_institutions.id as educational_institution_id', 'educational_institutions.name as educational_institution_name', 'direction_profiles.id as direction_profile_id', @@ -112,7 +113,9 @@ class PageController extends Controller 'direction_code' => $directionCode, 'educational_institution_id' => $educational_institution_id, 'educational_institution_name' => $educationalInstitutionName, + 'faculty_id' => $facultyId, 'faculty_name' => $facultyName, + 'faculty_description' => $facultyDescription, 'education_level_name' => $educationLevelName, 'education_form_name' => $educationFormName, 'entrance_examination_score' => $entranceExaminationScore, @@ -127,22 +130,25 @@ class PageController extends Controller 'direction_description' => $directionDescription, ] = $item; - $carry[$facultyName][$directionName]['id'] = $directionId; - $carry[$facultyName][$directionName]['code'] = $directionCode; - $carry[$facultyName][$directionName]['education_level'] = $educationLevelName; - $carry[$facultyName][$directionName]['education_form'][] = $educationFormName; - $carry[$facultyName][$directionName]['education_form'] = array_unique( - $carry[$facultyName][$directionName]['education_form'] + $carry[$facultyName]['id'] = $facultyId; + $carry[$facultyName]['name'] = $facultyName; + $carry[$facultyName]['description'] = $facultyDescription; + $carry[$facultyName]['directions'][$directionName]['id'] = $directionId; + $carry[$facultyName]['directions'][$directionName]['code'] = $directionCode; + $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; - $carry[$facultyName][$directionName]['budget_places'] + $carry[$facultyName]['directions'][$directionName]['budget_places'] [$educationalInstitutionName][$directionProfileName][$educationFormName] = $directionBudgetPlaces; - $carry[$facultyName][$directionName]['paid_places'][$educationFormName] = $directionPaidPlaces; - $carry[$facultyName][$directionName]['cost_paid_place'][$educationFormName] = $directionCostPaidPlace; - $carry[$facultyName][$directionName]['period'][$educationFormName] = $directionPeriod; - $carry[$facultyName][$directionName]['description'] = $directionDescription; + $carry[$facultyName]['directions'][$directionName]['paid_places'][$educationFormName] = $directionPaidPlaces; + $carry[$facultyName]['directions'][$directionName]['cost_paid_place'][$educationFormName] = $directionCostPaidPlace; + $carry[$facultyName]['directions'][$directionName]['period'][$educationFormName] = $directionPeriod; + $carry[$facultyName]['directions'][$directionName]['description'] = $directionDescription; foreach ($branches as $branch) { [ @@ -153,7 +159,7 @@ class PageController extends Controller 'direction_budget_places' => $directionBudgetPlacesBranch ] = $branch; if ($directionNameBranch === $directionName) { - $carry[$facultyName][$directionName]['budget_places'] + $carry[$facultyName]['directions'][$directionName]['budget_places'] [$educationalInstitutionNameBranch][$directionProfileNameBranch] [$educationFormNameBranch] = $directionBudgetPlacesBranch; }