DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

bugfix

Browse Source
This commit is contained in:
Izlydov 2025-02-20 14:58:37 +03:00
parent ba124a4aa5
commit 44a9b5b7b1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt
View File

@ -32,6 +32,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
_binding = FragmentProfileBinding.bind(view) _binding = FragmentProfileBinding.bind(view)
checkForAdmin()
binding.swipeRefresh.setOnRefreshListener { binding.swipeRefresh.setOnRefreshListener {
if (getIsMe()) refreshData() else showData(getUserDto()!!); if (getIsMe()) refreshData() else showData(getUserDto()!!);
} }
@ -51,13 +52,11 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
binding.recyclerViewLogs.adapter = adapter binding.recyclerViewLogs.adapter = adapter
if (getIsMe()) { if (getIsMe()) {
checkForAdmin()
refreshData() refreshData()
viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) } viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) }
waitForQRScanResult() waitForQRScanResult()
} else { } else {
showData(getUserDto()!!) showData(getUserDto()!!)
checkForAdmin()
Log.d("ProfileFragment", "set login") Log.d("ProfileFragment", "set login")
viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data -> viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data ->
adapter.submitData(data) adapter.submitData(data)
@ -75,6 +74,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
if (userDTO.roles.any { it.name == "ROLE_ADMIN" }) { if (userDTO.roles.any { it.name == "ROLE_ADMIN" }) {
binding.buttonSearch.visibility = View.VISIBLE binding.buttonSearch.visibility = View.VISIBLE
} }
Log.d("1234", userDTO.isACSBlocked.toString())
binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен" binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен"
} }
@ -110,6 +110,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
} }
Log.d("ProfileFragment", userDTO.login) Log.d("ProfileFragment", userDTO.login)
setAvatar(userDTO.photo) setAvatar(userDTO.photo)
checkForAdmin()
} }
private fun refreshData() { private fun refreshData() {
@ -169,6 +170,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
if (state is ProfileViewModel.State.Show) { if (state is ProfileViewModel.State.Show) {
val userDto: UserDTO = state.item val userDto: UserDTO = state.item
showMyData(userDto) showMyData(userDto)
checkForAdmin()
} }
} }
} }