From a00bbce4aa1c1b2701e53a37ca0194745fb79bfe Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 19 Apr 2024 10:02:04 +0200
Subject: [PATCH] refs #6964 feat:hasItemOlder

---
 .../ubicador/fragment/UbicadorFragmentNew.kt  | 73 +++++++++----------
 .../ubicador/fragment/UbicadorViewModel.kt    |  1 +
 2 files changed, 35 insertions(+), 39 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 108a126d..69706f95 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
@@ -395,14 +395,10 @@ class UbicadorFragmentNew(
 
     private fun customDialogActionParking() {
         parking = customDialogInput.getValue()
-        //Tarea 6964
-        /* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue(),
-             action = Action.PARKINEAR
-         )*/
-        viewModel.setParking(
-            shelvingFk, customDialogInput.getValue()
+        viewModel.hasItemOlder(
+            shelvingFk, customDialogInput.getValue(),
+            action = Action.PARKINEAR
         )
-
         customDialogInput.dismiss()
     }
 
@@ -523,37 +519,37 @@ class UbicadorFragmentNew(
 
                 }
             })
+            loadResponseHasOlder.observe(viewLifecycleOwner) { event ->
+                event.getContentIfNotHandled().notNull {
 
-            responseHasOlder.observe(viewLifecycleOwner, Observer {
-
-                // ma.messageWithSound("", true, true, "", false)
-                customDialogOlder.setTitle(getString(R.string.info))
-                    .setDescription(
-                        getString(
-                            R.string.itemOlderInfo,
-                            responseHasOlder.value!!.action
+                    customDialogOlder.setTitle(getString(R.string.info))
+                        .setDescription(
+                            getString(
+                                R.string.itemOlderInfo,
+                                responseHasOlder.value!!.action
+                            )
                         )
-                    )
-                    .setOkButton(
-                        getString(R.string.ok)
-                    ) {
-                        when (responseHasOlder.value!!.action) {
-                            Action.PARKINEAR -> viewModel.setParking(
-                                responseHasOlder.value!!.shelvingFkIn,
-                                parking
-                            )
+                        .setOkButton(
+                            getString(R.string.ok)
+                        ) {
+                            when (responseHasOlder.value!!.action) {
+                                Action.PARKINEAR -> viewModel.setParking(
+                                    responseHasOlder.value!!.shelvingFkIn,
+                                    parking
+                                )
 
-                            Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
-                                responseHasOlder.value!!.itemFk!!,
-                                responseHasOlder.value!!.shelvingFkOut!!
-                            )
-                        }
-                        customDialogOlder.dismiss()
+                                Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
+                                    responseHasOlder.value!!.itemFk!!,
+                                    responseHasOlder.value!!.shelvingFkOut!!
+                                )
+                            }
+                            customDialogOlder.dismiss()
 
-                    }.setKoButton(getString(R.string.cancel)) {
-                        customDialogOlder.dismiss()
-                    }.show()
-            })
+                        }.setKoButton(getString(R.string.cancel)) {
+                            customDialogOlder.dismiss()
+                        }.show()
+                }
+            }
 
         }
 
@@ -856,12 +852,11 @@ class UbicadorFragmentNew(
 
     private fun customDialogTransferAction(item: ItemUbicador) {
         if (customDialogInput.getValue().isNotEmpty()) {
-            /* Tarea 6964
-            viewModel.hasItemOlder(shelvingFkIn = shelvingFk , shelvingFkOut = customDialogInput.getValue(),itemFk = item.id,
+            viewModel.hasItemOlder(
+                shelvingFkIn = shelvingFk,
+                shelvingFkOut = customDialogInput.getValue(),
+                itemFk = item.id,
                 action = Action.TRANSFERIR
-            )*/
-            viewModel.itemShelvingTransfer(
-                item.id, customDialogInput.getValue()
             )
             listItems.remove(item)
             adapter!!.notifyDataSetChanged()
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 7b9021cc..df51fb15 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
@@ -36,6 +36,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
     private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() }
     val responseHasOlder: LiveData<ResponseHasOlder>
         get() = _responseHasOlder
+    val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> = _responseHasOlder.map { Event(it) }
 
     private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() }
     val responsepriority: LiveData<ResponseItemVO>