From 60e052406f5ee3797d81007689ccd46949255776 Mon Sep 17 00:00:00 2001 From: Izlydov Date: Thu, 20 Feb 2025 16:06:14 +0300 Subject: [PATCH] visitType string refactor, visual bugfix --- .../acss/components/acs/models/visit/VisitAdapter.kt | 4 ++-- .../java/com/displaynone/acss/ui/profile/ProfileFragment.kt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitAdapter.kt b/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitAdapter.kt index 4f12113..1e77e55 100644 --- a/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitAdapter.kt +++ b/app/src/main/java/com/displaynone/acss/components/acs/models/visit/VisitAdapter.kt @@ -40,8 +40,8 @@ class VisitAdapter : PagingDataAdapter(VisitD ) : RecyclerView.ViewHolder(binding.root) { fun bind(item: VisitDto) { binding.scanTime.text = "${formatDate(item.createdAt)}" - binding.scannerId.text = "Id турникета - " + item.gateId.toString() - binding.passType.text = "Тип прохода - " + item.visitType.toString() + binding.scannerId.text = "Идентификатор турникета - " + item.gateId.toString() + binding.passType.text = "Тип прохода - " + if(item.visitType == VisitType.APP) "Приложение" else "Карта" } private fun formatDate(inputDate: String): String { diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt index 413964c..6909c5f 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt @@ -87,6 +87,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { } private fun updateRights(isACSBlocked: Boolean){ binding.changeRights.text = if(isACSBlocked) "Разблокировать пользователя" else "Заблокировать пользователя" + binding.rightsUsingSmartphone.text = if(isACSBlocked) "Пропуск недействителен" else "Пропуск действителен" } private fun showData(userDTO: UserDTO) {