diff --git a/app/Http/Controllers/Api/CalculatorController.php b/app/Http/Controllers/Api/CalculatorController.php
index 9d850b9..ffac451 100644
--- a/app/Http/Controllers/Api/CalculatorController.php
+++ b/app/Http/Controllers/Api/CalculatorController.php
@@ -4,14 +4,11 @@ namespace App\Http\Controllers\Api;
use App\Enums\ExaminationTypeEnum;
use App\Http\Controllers\Controller;
-use App\Models\Department;
use App\Models\Direction;
use App\Models\EntranceExamination;
-use App\Models\Faculty;
-use App\Models\Subject;
use App\Services\DirectonHtmlBuilder;
+use App\Services\DirectonHtmlBuilderForCalculator;
use Illuminate\Http\Request;
-use Illuminate\Support\Facades\URL;
class CalculatorController extends Controller
{
@@ -61,9 +58,19 @@ class CalculatorController extends Controller
$dataToGenerateHTML = $this->getDirectionsToModals($directionIds);
// dd($dataToGenerateHTML);
$generateHtml = function ($acc, $direction) {
- $builder = new DirectonHtmlBuilder($direction);
+ $builder = new DirectonHtmlBuilderForCalculator($direction);
$offCanvasModal = $builder->getHTML();
- return "{$acc} $offCanvasModal";
+// dd($offCanvasModal);
+ return "{$acc}
+
+
+ {$direction['name']}
+ {$offCanvasModal}
+ |
+ 123 |
+ 456 |
+
+
";
};
$html = collect($dataToGenerateHTML)->reduce($generateHtml, '');
@@ -75,13 +82,13 @@ class CalculatorController extends Controller
//phpcs:disable
$directionsGroups = Direction::with(['department'])
->leftJoin('direction_direction_profile', 'directions.id', '=', 'direction_direction_profile.direction_id')
- ->leftJoin('direction_profiles','direction_direction_profile.direction_profile_id','=','direction_profiles.id')
+ ->leftJoin('direction_profiles', 'direction_direction_profile.direction_profile_id', '=', 'direction_profiles.id')
->leftJoin('departments', 'directions.department_id', '=', 'departments.id')
->leftJoin('faculties', 'departments.faculty_id', '=', 'faculties.id')
->leftJoin('education_levels', 'directions.education_level_id', '=', 'education_levels.id')
->leftJoin('education_forms', 'directions.education_form_id', '=', 'education_forms.id')
->leftJoin('entrance_examinations', 'entrance_examinations.direction_id', '=', 'directions.id')
- ->leftJoin('educational_institutions','faculties.educational_institution_id','=','educational_institutions.id')
+ ->leftJoin('educational_institutions', 'faculties.educational_institution_id', '=', 'educational_institutions.id')
->leftJoin('examination_types', 'entrance_examinations.examination_type_id', '=', 'examination_types.id')
->leftJoin('subject_types', 'entrance_examinations.subject_type_id', '=', 'subject_types.id')
->leftJoin('subjects', 'entrance_examinations.subject_id', '=', 'subjects.id')
@@ -149,10 +156,10 @@ class CalculatorController extends Controller
// $carry[$facultyName]['id'] = $facultyId;
// $carry[$facultyName]['name'] = $facultyName;
// $carry[$facultyName]['description'] = $facultyDescription;
- $carry[$directionName]['name'] = $directionName;
- $carry[$directionName]['id'] = $directionId;
- $carry[$directionName]['code'] = $directionCode;
- $carry[$directionName]['education_level'] = $educationLevelName;
+ $carry[$directionName]['name'] = $directionName;
+ $carry[$directionName]['id'] = $directionId;
+ $carry[$directionName]['code'] = $directionCode;
+ $carry[$directionName]['education_level'] = $educationLevelName;
$carry[$directionName]['education_form'][] = $educationFormName;
$carry[$directionName]['education_form'] = array_unique(
$carry[$directionName]['education_form']
diff --git a/app/Services/DirectonHtmlBuilderForCalculator.php b/app/Services/DirectonHtmlBuilderForCalculator.php
index 5d21f4b..376f067 100644
--- a/app/Services/DirectonHtmlBuilderForCalculator.php
+++ b/app/Services/DirectonHtmlBuilderForCalculator.php
@@ -179,7 +179,7 @@ class DirectonHtmlBuilderForCalculator
}
- return "