Changes

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,
+            'contactPhone' => $this->pivot->service_phone,
-            'contactEmail' => $this->userDetail->contactEmail,
+            'contactEmail' => $this->pivot->service_email,
+            'cabinet' => $this->pivot->cabinet,
             'photo' => $this->userDetail->photo,
             'position' => $this->pivot->position,
         ];

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,
+            'contactPhone' => $this->pivot->service_phone,
-            'contactEmail' => $this->userDetail->contactEmail,
+            'contactEmail' => $this->pivot->service_email,
+            'cabinet' => $this->pivot->cabinet,
             'photo' => $this->userDetail->photo,
             'position' => $this->pivot->teaching_position,
         ];

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,
+            'contactPhone' => $this->pivot->service_phone,
-            'contactEmail' => $this->userDetail->contactEmail,
+            'contactEmail' => $this->pivot->service_email,
+            'cabinet' => $this->pivot->cabinet,
             'photo' => $this->userDetail->photo,
             'administrativePosition' => $this->pivot->administrativePosition,
             'sort' => $this->pivot->sort,

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,
+            'contactPhone' => $this->pivot->service_phone,
-            'contactEmail' => $this->userDetail->contactEmail,
+            'contactEmail' => $this->pivot->service_email,
+            'cabinet' => $this->pivot->cabinet,
             'photo' => $this->userDetail->photo,
             'position' => $this->pivot->position,
         ];

resources/js/Components/PersonCards/ClientDepartmentTeacherCard.vue

@@ -10,14 +10,14 @@
 				<p v-if="teacher.academicTitle !== null" class="text-xs text-gray-500 mt-2">
 					Ученая степень: {{ teacher.academicTitle }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="teacher.contactPhone" class="text-xs text-gray-500 mt-2">
 					Контактный телефон: {{ teacher.contactPhone }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="teacher.contactEmail" class="text-xs text-gray-500 mt-2">
 					Электронная почта: {{ teacher.contactEmail }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="teacher.cabinet" class="text-xs text-gray-500 mt-2">
-					Кабинет: 207В
+					Кабинет: {{ teacher.cabinet }}
 				</p>
 			</div>
 		</div>

resources/js/Components/PersonCards/ClientDepartmentWorkerCard.vue

@@ -10,14 +10,14 @@
 				<p v-if="worker.academicTitle !== null" class="text-xs text-gray-500 mt-2">
 					Ученая степень: {{ worker.academicTitle }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactPhone" class="text-xs text-gray-500 mt-2">
 					Контактный телефон: {{ worker.contactPhone }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactEmail" class="text-xs text-gray-500 mt-2">
 					Электронная почта: {{ worker.contactEmail }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.cabinet" class="text-xs text-gray-500 mt-2">
-					Кабинет: 207В
+					Кабинет: {{ worker.cabinet }}
 				</p>
 			</div>
 		</div>

resources/js/Components/PersonCards/ClientDivisionWorkerCard.vue

@@ -10,14 +10,14 @@
 				<p v-if="worker.academicTitle !== null" class="text-xs text-gray-500 mt-2">
 					Ученая степень: {{ worker.academicTitle }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactPhone" class="text-xs text-gray-500 mt-2">
 					Контактный телефон: {{ worker.contactPhone }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactEmail" class="text-xs text-gray-500 mt-2">
 					Электронная почта: {{ worker.contactEmail }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.cabinet" class="text-xs text-gray-500 mt-2">
-					Кабинет: 207В
+					Кабинет: {{ worker.cabinet }}
 				</p>
 			</div>
 		</div>

resources/js/Components/PersonCards/ClientFacultyWorkerCard.vue

@@ -10,14 +10,14 @@
 				<p v-if="worker.academicTitle !== null" class="text-xs text-gray-500 mt-2">
 					Ученая степень: {{ worker.academicTitle }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactPhone" class="text-xs text-gray-500 mt-2">
 					Контактный телефон: {{ worker.contactPhone }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.contactEmail" class="text-xs text-gray-500 mt-2">
 					Электронная почта: {{ worker.contactEmail }}
 				</p>
-				<p class="text-xs text-gray-500 mt-2">
+				<p v-if="worker.cabinet" class="text-xs text-gray-500 mt-2">
-					Кабинет: 207В
+					Кабинет: {{ worker.cabinet }}
 				</p>
 			</div>
 		</div>