From 54bff164314497e8ba09378dae23f554d67b2685 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Fri, 2 Feb 2024 08:32:17 +0100 Subject: [PATCH] refs #6786 inventaryParking --- .../adapter/InventoryParkingAdapter.kt | 11 ++++++ .../fragment/InventaryParkingFragment.kt | 35 +++++++++++++------ 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt index 961da294..76fe13a1 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/adapter/InventoryParkingAdapter.kt @@ -40,10 +40,12 @@ class InventoryParkingAdapter( fun getListItems(): List { return items } + fun setItems(newItems: List) { items = newItems notifyDataSetChanged() // Notificar al adaptador que los datos han cambiado } + fun sortBy(fieldSort: String) { when (fieldSort) { "sector" -> { @@ -136,6 +138,7 @@ class InventoryParkingAdapter( } if (item.isChecked != null) { + println("item ${item.itemFk} checked ${item.isChecked} ") when (item.isChecked!!.toInt()) { @@ -146,6 +149,14 @@ class InventoryParkingAdapter( ) ) + else -> { + itemRowLayout.setBackgroundColor( + ContextCompat.getColor( + visibleText.context, + R.color.verdnatura_black_5 + ) + ) + } } } else { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt index 4333cb1d..71556c61 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt @@ -335,7 +335,12 @@ class InventaryParkingFragment( private fun setEvents() { binding.mainToolbar.backButton.setOnClickListener { isBack = true - requireActivity().onBackPressed() + if (shelvingSaved.isNullOrBlank()) { + requireActivity().onBackPressed() + } else { + resetChecking() + + } } binding.inventorySwipe.setOnRefreshListener { @@ -371,7 +376,7 @@ class InventaryParkingFragment( binding.editMatricula.setText( itemScanValue( binding.editMatricula.text.toString(), "buy", "more" - ).toString() + ).toString().uppercase() ) } catch (ex: Exception) { ex.message!!.toast(requireContext()) @@ -379,14 +384,14 @@ class InventaryParkingFragment( } positionShelvingChecking = myListInventory.indexOfFirst { item -> - item.shelvingFk == binding.editMatricula.text.toString() + item.shelvingFk.uppercase() == binding.editMatricula.text.toString() } if (positionShelvingChecking != -1) { - shelvingSaved = myListInventory[positionShelvingChecking].shelvingFk + shelvingSaved = myListInventory[positionShelvingChecking].shelvingFk.uppercase() } var allChecked = if (positionShelvingChecking != -1) { - myListInventory.filter { it.shelvingFk == myListInventory[positionShelvingChecking].shelvingFk } + myListInventory.filter { it.shelvingFk.uppercase() == myListInventory[positionShelvingChecking].shelvingFk.uppercase() } .all { item -> item.isChecked != null && item.isChecked!! > 0 } @@ -399,7 +404,7 @@ class InventaryParkingFragment( getString(R.string.plateChecked), false, true, "", isToasted = true ) chageListAdapter(listIcons) - adapter!!.setItems(myListInventory.filter { it.shelvingFk == myListInventory[positionShelvingChecking].shelvingFk }) + adapter!!.setItems(myListInventory.filter { it.shelvingFk.uppercase() == myListInventory[positionShelvingChecking].shelvingFk.uppercase() }) positionShelvingChecking = -1 positionItemChecking = -1 shelvingSaved = "" @@ -448,9 +453,19 @@ class InventaryParkingFragment( } + private fun resetChecking() { + chageListAdapter(listIcons) + positionShelvingChecking = -1 + positionItemChecking = -1 + shelvingSaved = "" + binding.editMatricula.hint = getString(R.string.scanShelving) + binding.textinputlayoutMatricula.hint = getString(R.string.scanShelving) + callGetInventory(parkingFrom, parkingTo) + } + private fun checkItem(itemCode: String) { positionItemChecking = myListInventory.indexOfFirst { item -> - item.itemFk == itemCode.toInt() && item.shelvingFk == myListInventory[positionShelvingChecking].shelvingFk && item.isChecked == null + item.itemFk == itemCode.toInt() && item.shelvingFk.uppercase() == myListInventory[positionShelvingChecking].shelvingFk.uppercase() && item.isChecked == null } @@ -473,7 +488,7 @@ class InventaryParkingFragment( binding.editMatricula.hint = getString(R.string.scanShelving) var allChecked = - myListInventory.filter { it.shelvingFk == myListInventory[positionShelvingChecking].shelvingFk } + myListInventory.filter { it.shelvingFk.uppercase() == myListInventory[positionShelvingChecking].shelvingFk.uppercase() } .all { item -> item.isChecked != null && item.isChecked!! > 0 } @@ -541,14 +556,14 @@ class InventaryParkingFragment( adapter = InventoryParkingAdapter((if (filterActivated) { if (!shelvingSaved.isNullOrEmpty()) { - myListInventory.filter { (it.isChecked == null || it.isChecked == 0) && it.shelvingFk == shelvingSaved } + myListInventory.filter { (it.isChecked == null || it.isChecked == 0) && it.shelvingFk.uppercase() == shelvingSaved.uppercase() } } else { myListInventory.filter { it.isChecked == null || it.isChecked == 0 } } } else { if (!shelvingSaved.isNullOrEmpty()) { - myListInventory.filter { it.shelvingFk == shelvingSaved } + myListInventory.filter { it.shelvingFk.uppercase() == shelvingSaved.uppercase() } } else { myListInventory }