From e67b6fbf12352d54ea27a7cd50e219b1ffd8a401 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Wed, 6 Mar 2024 12:46:50 +0100 Subject: [PATCH] refs #6964 refactor:settings --- .../ubicador/fragment/UbicadorFragmentNew.kt | 31 ++++++++++++++++--- .../ubicador/fragment/UbicadorViewModel.kt | 22 +++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt index 99a659f3..c8cad366 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt @@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable import android.os.Build import android.text.InputType import android.text.TextWatcher -import android.view.MenuItem import android.view.View import android.view.View.GONE import android.view.View.VISIBLE @@ -45,6 +44,7 @@ class UbicadorFragmentNew( private var listItems: MutableList = mutableListOf() private var listLocalItems: ArrayList = ArrayList() private lateinit var customDialog: CustomDialog + private lateinit var customDialogOlder: CustomDialog private var parking: String = "" private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null private var isShelvinLogfromMainScreen = false @@ -108,6 +108,7 @@ class UbicadorFragmentNew( private fun setDialogs() { customDialogInput = CustomDialogInput(requireContext()) customDialog = CustomDialog(requireContext()) + customDialogOlder = CustomDialog(requireContext()) customDialogTwoButtons = CustomDialogTwoButtons(requireContext()) } @@ -390,10 +391,13 @@ class UbicadorFragmentNew( } private fun customDialogActionParking() { - viewModel.setParking( - shelvingFk, customDialogInput.getValue() - ) parking = customDialogInput.getValue() + //Tarea 6964 + /* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue())*/ + viewModel.setParking( + shelvingFk, customDialogInput.getValue() + ) + customDialogInput.dismiss() } @@ -515,6 +519,25 @@ class UbicadorFragmentNew( } }) + + responseHasOlder.observe(viewLifecycleOwner, Observer { + + ma.messageWithSound("",true,true,"",false) + customDialogOlder.setTitle(getString(R.string.info)) + .setDescription(getString(R.string.itemOlderInfo, shelvingFk)) + .setOkButton( + getString(R.string.ok) + ) { + customDialogOlder.dismiss() + //customDialogActionParking() + viewModel.setParking( + shelvingFk, parking) + + }.setKoButton(getString(R.string.cancel)) { + customDialogOlder.dismiss() + }.show() + }) + } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index 9a497bb6..1f5098ee 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -32,6 +32,10 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { val response: LiveData get() = _response + private val _responseHasOlder by lazy { MutableLiveData() } + val responseHasOlder: LiveData + get() = _responseHasOlder + private val _responsepriority by lazy { MutableLiveData() } val responsepriority: LiveData get() = _responsepriority @@ -206,6 +210,24 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { }) } + fun hasItemOlder( + shelving: String, + parking: String + ) { + salix.hasItemOlder(shelving,parking) + .enqueue(object : SalixCallback(context) { + + override fun onSuccess(response: Response) { + if (response.body() == false) { + setParking(shelving, parking) + } else { + _responseHasOlder.value = true + + } + } + }) + } + fun itemShelving_merge( vShelf: Int, vShelvingFk: String