v228a/droidocat-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix 02.51

Browse Source
This commit is contained in:
v228a 2025-02-20 16:17:54 +03:00
parent 2e4b11f3be
commit 43bd254b8d
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ru/myitschool/work/data/mapper/UserInfoMapper.kt
View File

@ -14,9 +14,7 @@ class UserInfoMapper @Inject constructor() {
fullname = model.fullname ?: error("fullname is null"), fullname = model.fullname ?: error("fullname is null"),
imageUrl = model.imageUrl ?: error("imageUrl is null"), imageUrl = model.imageUrl ?: error("imageUrl is null"),
position = model.position ?: error("position is null"), position = model.position ?: error("position is null"),
lastEntryMillis = model.lastEntry.let { date -> lastEntry = model.lastEntry ?: error("lastEntry is null"),
simpleDateFormat.parse(date)?.time ?: error("parse lastEntry error")
} ?: error("lastEntry is null"),
role = model.role, role = model.role,
blocked = model.blocked blocked = model.blocked
) )

2
app/src/main/java/ru/myitschool/work/domain/profile/entities/UserInfoEntity.kt
View File

@ -8,5 +8,5 @@ class UserInfoEntity(
val position: String, val position: String,
val role: Role, val role: Role,
val blocked: Boolean, val blocked: Boolean,
val lastEntryMillis: Long, val lastEntry: String,
) )

2
app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
View File

@ -3,6 +3,7 @@ package ru.myitschool.work.ui.profile
import android.content.DialogInterface import android.content.DialogInterface
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.View import android.view.View
import android.widget.TextView import android.widget.TextView
import androidx.annotation.Nullable import androidx.annotation.Nullable
@ -66,6 +67,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
swipeRefreshLayout.isRefreshing = false swipeRefreshLayout.isRefreshing = false
binding.position.text = state.position binding.position.text = state.position
binding.lastEntry.text = state.lastEntry binding.lastEntry.text = state.lastEntry
Log.d("ff",state.lastEntry)
binding.fullname.text = state.fullname binding.fullname.text = state.fullname
if (state.admin){ if (state.admin){
binding.admin.visibility = View.VISIBLE binding.admin.visibility = View.VISIBLE

5
app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
View File

@ -17,6 +17,8 @@ import ru.myitschool.work.domain.auth.LogoutUseCase
import ru.myitschool.work.domain.profile.GetUserInfoUseCase import ru.myitschool.work.domain.profile.GetUserInfoUseCase
import ru.myitschool.work.utils.MutablePublishFlow import ru.myitschool.work.utils.MutablePublishFlow
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
@ -78,7 +80,8 @@ class ProfileViewModel @Inject constructor(
fullname = value.fullname, fullname = value.fullname,
imageUrl = value.imageUrl, imageUrl = value.imageUrl,
position = value.position, position = value.position,
lastEntry = simpleDateFormat.format(Date(value.lastEntryMillis)), lastEntry = LocalDateTime.parse(value.lastEntry).format(
DateTimeFormatter.ofPattern("d MMMM yyyy, HH:mm:ss", Locale.getDefault())),
admin = value.role == Role.ADMIN, admin = value.role == Role.ADMIN,
blocked = value.blocked blocked = value.blocked
) )