From 64f2b9582e46f4b70852c6b7f30ac74e865dd145 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 12 Dec 2024 17:01:46 +0100
Subject: [PATCH] feat: refs #6861 reservas

---
 .../collection/adapter/SaleAdapterNew.kt      | 19 ++++++++++--
 .../pasillero/fragment/PasilleroViewModel.kt  | 30 +++++++++----------
 .../SectorCollectionReserveFragment.kt        |  7 -----
 .../sacador/fragment/SacadorFragmentNew.kt    |  1 -
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
index 61f19df0..bf0f30e6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt
@@ -311,9 +311,22 @@ class SaleAdapterNew(
                 if (sale.isPicked == 1) {
                     if (type == PREPARED) {
                         contentLayout.setBackgroundColor(
-                            getColor(
-                                context!!, R.color.verdnatura_orange_salix
-                            )
+
+                            if (sale.saleGroupFk == null) {
+                                getColor(
+                                    context!!, R.color.verdnatura_orange_salix
+                                )
+                            } else {
+                                if (sale.stateCode != null && sale.stateCode == "PREPARED") {
+                                    getColor(
+                                        context!!, R.color.verdnatura_orange_salix
+                                    )
+                                } else {
+                                    getColor(
+                                        context!!, R.color.verdnatura_dark_sky_blue
+                                    )
+                                }
+                            }
                         )
                     } else {
                         contentLayout.setBackgroundColor(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
index 6e5b9f7e..4ca8bf67 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt
@@ -73,15 +73,15 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
 
             )
         )
-        if (userId == 19591)
-            _pasillerositem.add(
-                PasillerosItemVO(
-                    R.drawable.ic_dashboard_black_24dp,
-                    R.string.ubicatorNew,
-                    R.string.titleUbicatorDescrip
+        /* if (userId == 19591)
+             _pasillerositem.add(
+                 PasillerosItemVO(
+                     R.drawable.ic_dashboard_black_24dp,
+                     R.string.ubicatorNew,
+                     R.string.titleUbicatorDescrip
 
-                )
-            )
+                 )
+             )*/
 
         //tarea 7855
         _pasillerositem.add(
@@ -542,13 +542,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
             )
         )
 
-        _pasillerositem.add(
-            PasillerosItemVO(
-                R.drawable.revision_icon,
-                R.string.titleShelvingHistorical,
-                R.string.titleShelvingHistDescrip
-            )
-        )
+        /*   _pasillerositem.add(
+               PasillerosItemVO(
+                   R.drawable.revision_icon,
+                   R.string.titleShelvingHistorical,
+                   R.string.titleShelvingHistDescrip
+               )
+           )*/
 
         _pasillerositem.add(
             PasillerosItemVO(
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
index 9c24830b..ec789975 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/SectorCollectionReserveFragment.kt
@@ -60,19 +60,12 @@ class SectorCollectionReserveFragment(
     }
 
     override fun init() {
-        println("hasToAdd $hasToAdd")
-
         customDialogList = CustomDialogList(requireContext())
         ma.hideBottomNavigation(View.GONE)
         binding.mainToolbar.toolbarTitle.text = title
         setEvents()
         setToolBar()
-
-        println("reserve collec $collectionFk")
-        println("reserve collec  onBack$onBack")
-
         if (!onBack) {
-            println("check parkings  $collectionFk")
             checkParkingsToPicker()
         } else {
             if (onBack) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
index 0017d060..325fca9c 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
@@ -264,7 +264,6 @@ class SacadorFragmentNew(
                             }
 
                             "PREITEMPICKERTEST" -> {
-                                println("SacadorFragmentNew sectorCollectionGET")
                                 // viewModel.sectorCollectionGet()
                                 viewModel.sectorCollectionPartial()
                             }