From 6e05933728bccf0901ab736f7f426fad98bbd68a Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 9 Feb 2024 08:11:33 +0100
Subject: [PATCH] refs #6651feat:itemShelving_get

---
 .../view/feature/ubicador/adapter/UbicadorAdapter.kt |  9 +++++++--
 .../feature/ubicador/fragment/UbicadorFragment.kt    | 12 ++++++------
 .../view/feature/ubicador/model/ItemUbicadorVO.kt    |  8 ++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
index 29366c21..1b968f2a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter.kt
@@ -21,7 +21,6 @@ class UbicadorAdapter(
     private val onMoreClickListener: OnMoreClickListener
 ) : RecyclerView.Adapter<UbicadorAdapter.ItemHolder>() {
 
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
         return ItemHolder(
             ItemUbicationRowBinding.inflate(LayoutInflater.from(parent.context), parent, false)
@@ -44,7 +43,13 @@ class UbicadorAdapter(
             binding.apply {
                 this.item = item
                 multiText.text = "${item.stickers}x${item.packing}"
-                imgItem.loadUrl("https://cdn.verdnatura.es/image/catalog/200x200/" + item.item)
+                //Tarea 6651
+
+                if (!item.urlImage.isNullOrBlank()) {
+                    imgItem.loadUrl(item.urlImage)
+                } else {
+                    imgItem.loadUrl("https://cdn.verdnatura.es/image/catalog/200x200/" + item.item)
+                }
                 imgItem.setOnClickListener {
                     onPasillerosItemClickListener.onPasillerosItemClickListener(
                         PasillerosItemVO(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 7114a146..3b5ed979 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -443,7 +443,7 @@ class UbicadorFragment(
             shelvingFk,
             "" + listInt + "",
             TRUE,
-             mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)
+            mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK)
         )
 
         adapter!!.notifyDataSetChanged()
@@ -478,8 +478,8 @@ class UbicadorFragment(
                     var contEtiquetas = 0
                     it.list.forEach { item ->
                         try {
-                            contEtiquetas += item.stickers.toInt()
-                            parking = item.code
+                            contEtiquetas += item.stickers?.toInt() ?: 0
+                            parking = item.code ?: ""
 
                         } catch (ex: Exception) {
                             ex.message!!.toast(requireContext())
@@ -582,7 +582,7 @@ class UbicadorFragment(
             })
             loadAddList.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
-                        viewModel.itemShelvingList(shelvingFk)
+                    viewModel.itemShelvingList(shelvingFk)
                 }
             }
             response.observe(viewLifecycleOwner, Observer {
@@ -821,7 +821,7 @@ class UbicadorFragment(
                         itemFk,
                         visible,
                         packing,
-                         mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK),
+                        mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK),
                         groupingPack
                     )
 
@@ -839,7 +839,7 @@ class UbicadorFragment(
                         item = itemFk,
                         quantity = visible_calc,
                         packing = packing,
-                        warehouse =  mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK),
+                        warehouse = mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK),
                         grouping = groupingPack
                     )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
index dd739343..28b33dd1 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt
@@ -1,23 +1,23 @@
 package es.verdnatura.presentation.view.feature.ubicador.model
 
 class ItemUbicadorVO(
-    var item: Int ,
+    var item: Int,
     var description: String = "",
     var visible: String = "",
     var stickers: String = "",
     var packing: String = "",
     var grouping: String = "",
-    //Tarea 4904 refactor itemShelving_get, quitar col y row
     var col: String = "",
     var row: String = "",
-    var code: String = "",
+    var code: String? = "",
     var id: Int = 0,
     var priority: String = "",
     var isError: Boolean = false,
     var errorMessage: String = "",
     var checked: Boolean = false,
     var isNew: Boolean = false,
-    var isChecked: Int? = null
+    var isChecked: Int? = null,
+    var urlImage: String = ""
 )
 
 class ItemEscanerVO(