diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt index 23bc4e10..ee6dbc4a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt @@ -48,7 +48,7 @@ class ShowTicketFragment(var menuOrigin: String) : } setEvents() //Tarea 6531 - // viewModel.lastTicketGetByWorker(mobileApplication.userId!!) + viewModel.myLastTickets(mobileApplication.userId!!) super.init() } @@ -71,7 +71,7 @@ class ShowTicketFragment(var menuOrigin: String) : binding.sacadorSwipe.setOnRefreshListener { binding.sacadorSwipe.isRefreshing = true //Tarea 6531 - // viewModel.lastTicketGetByWorker(mobileApplication.userId!!) + viewModel.myLastTickets(mobileApplication.userId!!) binding.sacadorSwipe.isRefreshing = false } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketViewModel.kt index 594940c2..f1856a84 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketViewModel.kt @@ -1,6 +1,8 @@ package es.verdnatura.presentation.view.feature.precontrol import android.content.Context +import android.os.Build +import androidx.annotation.RequiresApi import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import es.verdnatura.domain.SalixCallback @@ -53,11 +55,12 @@ class ShowTicketViewModel(val context: Context) : BaseViewModel(context) { }) } - fun lastTicketGetByWorker(userId: Int) { - salix.lastTicketGetByWorker("""{"where": {"userFk": $userId},"order":"updated DESC","limit": 5}""") + fun myLastTickets(userId: Int) { + salix.myLastModified("""{"where": {"userFk": $userId}""") .enqueue(object : SalixCallback>(context) { + @RequiresApi(Build.VERSION_CODES.O) override fun onSuccess(response: Response>) { - _lastTicketList.value = response.body()?.let { TicketStateList(it) } + _lastTicketList.value = response.body()?.let { TicketStateList(it.sortedByDescending { it.created }) } } })