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

redesign and readme

Browse Source
This commit is contained in:
Serafim_Pankin 2025-02-20 15:01:39 +03:00
commit 1ae503ff41
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/displaynone/acss/components/auth/models/user/UserServiceST.kt
View File

@ -77,7 +77,11 @@ class UserServiceST(
if (!tokenManager.hasTokens()) { if (!tokenManager.hasTokens()) {
throw RuntimeException("access token is null") throw RuntimeException("access token is null")
} }
return userRepository.getInfo(tokenManager.authTokenPair!!.accessToken) val result = userRepository.getInfo(tokenManager.authTokenPair!!.accessToken)
result.map { dto ->
saveUserDTO(dto)
}
return result
} }
suspend fun getInfoByLogin(login: String): Result<UserDTO>{ suspend fun getInfoByLogin(login: String): Result<UserDTO>{
if (!tokenManager.hasTokens()) { if (!tokenManager.hasTokens()) {

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

@ -31,8 +31,8 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
_binding = FragmentProfileBinding.bind(view) _binding = FragmentProfileBinding.bind(view)
checkForAdmin()
checkForAdmin()
binding.swipeRefresh.setOnRefreshListener { binding.swipeRefresh.setOnRefreshListener {
if (getIsMe()) refreshData() else showData(getUserDto()!!); if (getIsMe()) refreshData() else showData(getUserDto()!!);
} }
@ -57,7 +57,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
waitForQRScanResult() waitForQRScanResult()
} else { } else {
showData(getUserDto()!!) showData(getUserDto()!!)
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)
@ -74,11 +73,9 @@ 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
binding.rightsUsingSmartphone.text = "Пропуск действителен"
}
if (userDTO.roles.any { it.name == "ROLE_USER" }) {
binding.rightsUsingSmartphone.text = "Пропуск действителен"
} }
Log.d("1234", userDTO.isACSBlocked.toString())
binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен"
} }
private fun hideButtons() { private fun hideButtons() {
@ -113,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() {
@ -172,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()
} }
} }
} }