diff --git a/app/Http/Resources/ClientPersonDepartmentPreviewResource.php b/app/Http/Resources/ClientPersonDepartmentPreviewResource.php index 2118067..2faad3a 100644 --- a/app/Http/Resources/ClientPersonDepartmentPreviewResource.php +++ b/app/Http/Resources/ClientPersonDepartmentPreviewResource.php @@ -19,8 +19,9 @@ class ClientPersonDepartmentPreviewResource extends JsonResource 'name' => $this->name, 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, - 'contactPhone' => $this->userDetail->contactPhone, - 'contactEmail' => $this->userDetail->contactEmail, + 'contactPhone' => $this->pivot->service_phone, + 'contactEmail' => $this->pivot->service_email, + 'cabinet' => $this->pivot->cabinet, 'photo' => $this->userDetail->photo, 'position' => $this->pivot->position, ]; diff --git a/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php b/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php index 4c927c9..7a69437 100644 --- a/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php +++ b/app/Http/Resources/ClientPersonDepartmentTeachPreviewResource.php @@ -19,8 +19,9 @@ class ClientPersonDepartmentTeachPreviewResource extends JsonResource 'name' => $this->name, 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, - 'contactPhone' => $this->userDetail->contactPhone, - 'contactEmail' => $this->userDetail->contactEmail, + 'contactPhone' => $this->pivot->service_phone, + 'contactEmail' => $this->pivot->service_email, + 'cabinet' => $this->pivot->cabinet, 'photo' => $this->userDetail->photo, 'position' => $this->pivot->teaching_position, ]; diff --git a/app/Http/Resources/ClientPersonDivisionPreviewResource.php b/app/Http/Resources/ClientPersonDivisionPreviewResource.php index 3f245ec..7108aa7 100644 --- a/app/Http/Resources/ClientPersonDivisionPreviewResource.php +++ b/app/Http/Resources/ClientPersonDivisionPreviewResource.php @@ -19,8 +19,9 @@ class ClientPersonDivisionPreviewResource extends JsonResource 'name' => $this->name, 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, - 'contactPhone' => $this->userDetail->contactPhone, - 'contactEmail' => $this->userDetail->contactEmail, + 'contactPhone' => $this->pivot->service_phone, + 'contactEmail' => $this->pivot->service_email, + 'cabinet' => $this->pivot->cabinet, 'photo' => $this->userDetail->photo, 'administrativePosition' => $this->pivot->administrativePosition, 'sort' => $this->pivot->sort, diff --git a/app/Http/Resources/ClientPersonFacultyPreviewResource.php b/app/Http/Resources/ClientPersonFacultyPreviewResource.php index 31d1f01..0f85878 100644 --- a/app/Http/Resources/ClientPersonFacultyPreviewResource.php +++ b/app/Http/Resources/ClientPersonFacultyPreviewResource.php @@ -19,8 +19,9 @@ class ClientPersonFacultyPreviewResource extends JsonResource 'name' => $this->name, 'slug' => $this->slug, 'academicTitle' => $this->userDetail->academicTitle, - 'contactPhone' => $this->userDetail->contactPhone, - 'contactEmail' => $this->userDetail->contactEmail, + 'contactPhone' => $this->pivot->service_phone, + 'contactEmail' => $this->pivot->service_email, + 'cabinet' => $this->pivot->cabinet, 'photo' => $this->userDetail->photo, 'position' => $this->pivot->position, ]; diff --git a/resources/js/Components/PersonCards/ClientDepartmentTeacherCard.vue b/resources/js/Components/PersonCards/ClientDepartmentTeacherCard.vue index 586461d..717b4c4 100644 --- a/resources/js/Components/PersonCards/ClientDepartmentTeacherCard.vue +++ b/resources/js/Components/PersonCards/ClientDepartmentTeacherCard.vue @@ -10,14 +10,14 @@
Ученая степень: {{ teacher.academicTitle }}
-+
Контактный телефон: {{ teacher.contactPhone }}
-+
Электронная почта: {{ teacher.contactEmail }}
-- Кабинет: 207В +
+ Кабинет: {{ teacher.cabinet }}
diff --git a/resources/js/Components/PersonCards/ClientDepartmentWorkerCard.vue b/resources/js/Components/PersonCards/ClientDepartmentWorkerCard.vue index a5ec820..938ced2 100644 --- a/resources/js/Components/PersonCards/ClientDepartmentWorkerCard.vue +++ b/resources/js/Components/PersonCards/ClientDepartmentWorkerCard.vue @@ -10,14 +10,14 @@Ученая степень: {{ worker.academicTitle }}
-+
Контактный телефон: {{ worker.contactPhone }}
-+
Электронная почта: {{ worker.contactEmail }}
-- Кабинет: 207В +
+ Кабинет: {{ worker.cabinet }}
diff --git a/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue b/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue index ed0085b..a176a31 100644 --- a/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue +++ b/resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue @@ -10,14 +10,14 @@Ученая степень: {{ worker.academicTitle }}
-+
Контактный телефон: {{ worker.contactPhone }}
-+
Электронная почта: {{ worker.contactEmail }}
-- Кабинет: 207В +
+ Кабинет: {{ worker.cabinet }}
diff --git a/resources/js/Components/PersonCards/ClientFacultyWorkerCard.vue b/resources/js/Components/PersonCards/ClientFacultyWorkerCard.vue index d4f135f..8b14e70 100644 --- a/resources/js/Components/PersonCards/ClientFacultyWorkerCard.vue +++ b/resources/js/Components/PersonCards/ClientFacultyWorkerCard.vue @@ -10,14 +10,14 @@Ученая степень: {{ worker.academicTitle }}
-+
Контактный телефон: {{ worker.contactPhone }}
-+
Электронная почта: {{ worker.contactEmail }}
-- Кабинет: 207В +
+ Кабинет: {{ worker.cabinet }}