diff --git a/app/Http/Controllers/ClientAdditionalEducationController.php b/app/Http/Controllers/ClientAdditionalEducationController.php index 2a6d5bf..f2fa928 100644 --- a/app/Http/Controllers/ClientAdditionalEducationController.php +++ b/app/Http/Controllers/ClientAdditionalEducationController.php @@ -53,9 +53,9 @@ class ClientAdditionalEducationController extends Controller ->WithActivePrograms() ->where('is_active', true) ->when($request->input('form'), function ($q, $form) { - $q->whereHas('additionalEducations', function ($q) use ($form) { - $q->where('form_education', FormEducation::fromName($form)->value); - }); + $formValue = FormEducation::fromName($form)->value; + $q->whereHas('additionalEducations', fn ($q) => $q->where('form_education', $formValue)) + ->with(['additionalEducations' => fn ($q) => $q->where('form_education', $formValue)]); }) ->when($request->input('category'), function($q, $slugs) { $q->whereIn('slug', $slugs); diff --git a/resources/js/Pages/Client/Additional-educations/Index.vue b/resources/js/Pages/Client/Additional-educations/Index.vue index e33c66c..2fc2a54 100644 --- a/resources/js/Pages/Client/Additional-educations/Index.vue +++ b/resources/js/Pages/Client/Additional-educations/Index.vue @@ -76,23 +76,16 @@ export default { return dividedArrays.reverse(); }, - textLimit(text, symbols) { - if (text.length > symbols) { - let LimitedText - LimitedText = text.substring(0, symbols) - return LimitedText + "..." - } - return text - }, - - - - }, computed: { hasActiveFilters() { return this.filters.category_filter.value || this.filters.form_education_filter.value - } + }, + totalPrograms() { + return this.additionalEducations.data.reduce((total, item) => { + return total + (item.additionalEducations?.length || 0); + }, 0); + }, }, }; @@ -106,9 +99,9 @@ export default { -
+
-
+
@@ -119,13 +112,13 @@ export default {
-
-

Найдено программ: {{ additionalEducations.data.length }}

-
+
+

Найдено программ: {{ totalPrograms }}

+
-
+