refs #5890 feat: itemShelvingReserva

app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt

@@ -75,12 +75,9 @@ class SaleAdapterNew(
                 val childLayoutManagerV =
                     LinearLayoutManager(context!!, RecyclerView.VERTICAL, false)
 
-
                 itemArticlePlacements.apply {
                     layoutManager = childLayoutManager
 
-                    // se quita porque ya no es necesario
-                    // adapter = PlacementAdapter(sale.placements, onPasillerosItemClickListener)
                 }
 
                 //CLICK EVENTS
@@ -90,29 +87,6 @@ class SaleAdapterNew(
                     }
                 }
 
-              /*  itemArticleItemFk.setOnClickListener {
-                    onPasillerosItemClickListener.onPasillerosItemClickListener(
-                        PasillerosItemVO(
-                            title = binding.root.context.getString(R.string.titleItemConsult)
-                        ), sale.itemFk.toString()
-                    )
-                }
-
-                itemPackingItemFk.setOnClickListener {
-                    onPackingClick.onPackingClick(sale)
-                }
-
-                itemArticleQuantity.setOnClickListener {
-                    onQuantityClick.onQuantityClick(sale)
-                }
-
-                itemArticleQuantityPicked.setOnClickListener {
-                    onQuantityClick.onQuantityClick(sale)
-                }*/
-
-               /* txtde.setOnClickListener {
-                    onQuantityClick.onQuantityClick(sale)
-                }*/
 
                 packingTopicker.setOnClickListener {
                     //onQuantityClick.onQuantityClick(sale)
@@ -129,7 +103,6 @@ class SaleAdapterNew(
                         ), sale.itemFk.toString()
                     )
                 }
-
                 itemArticleFirstAccumulate.setOnClickListener {
                     //onQuantityClick.onQuantityClick(sale)
                 }
@@ -150,11 +123,6 @@ class SaleAdapterNew(
 
                 }
 
-                /*itemRowLayout.setOnLongClickListener{
-                    onMistakeClickListener.onMistakeClickListener(sale)
-                    false
-                }*/
-
                 imageErrorMessage.setOnClickListener {
                     //  onMistakeClickListener.onMistakeClickListener(sale)
                     false
@@ -181,22 +149,7 @@ class SaleAdapterNew(
                     layoutError.visibility = View.GONE
                 }
 
-                if (sale.isPicked == 1) {
-                    contentLayout.setBackgroundColor(
-                        getColor(
-                            context!!,
-                            R.color.verdnatura_pumpkin_orange
-                        )
-                    )
-                } else {
-                    contentLayout.setBackgroundColor(
-                        getColor(
-                            context!!,
-                            R.color.verdnatura_black
-                        )
-                    )
 
-                }
 
 
                 if (isExpanded) {
@@ -269,6 +222,7 @@ class SaleAdapterNew(
 
                 ivArrow.setOnClickListener {
 
+
                     if (isExpanded!!) {
                         ivArrow.setImageResource(R.drawable.ic_arrow_up)
                         itemArticlePlacements.visibility = View.GONE
@@ -300,7 +254,6 @@ class SaleAdapterNew(
                     textToConcat =
                         "${sale.reservedQuantity / (sale.packing ?: 1)} pack de ${sale.packing ?: "1"}"
                 }
-               // binding.itemArticleCel2.text = textToConcat
                 binding.packingTopicker.text = textToConcat
 
                 var result2: Int
@@ -322,17 +275,15 @@ class SaleAdapterNew(
                     binding.itemReservedNumber.text =
                         "${sale.currentItemShelving}/${sale.totalItemShelving}"
 
-                  //  binding.itemSecond.text =
-                   //     "${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
                     binding.itemArticleSecondAccumulate.text =
                         "${sale.saleQuantity - sale.accumulatedQuantity} de ${sale.saleQuantity}"
                     binding.selectToPicker.visibility = View.VISIBLE
                     binding.quantityReserved.text = "${sale.reservedQuantity}/${sale.saleQuantity}"
                 } else {
                     binding.quantityReserved.text = "${sale.reservedQuantity}"
-                   // binding.packingTopicker.text = ""
+
                     binding.itemReservedNumber.text = ""
-                   // binding.itemSecond.text = ""
+
                     binding.itemArticleSecondAccumulate.text = ""
                     binding.itemSecondToPicker.text = ""
                     binding.selectToPicker.visibility = View.INVISIBLE
@@ -345,7 +296,22 @@ class SaleAdapterNew(
                 binding.itemArticleFirstAccumulate.text =
                     "${sale.reservedQuantity} de ${sale.saleQuantity}"
 
+                if (sale.isPicked == 1) {
+                    contentLayout.setBackgroundColor(
+                        getColor(
+                            context!!,
+                            R.color.verdnatura_pumpkin_orange
+                        )
+                    )
+                } else {
+                    contentLayout.setBackgroundColor(
+                        getColor(
+                            context!!,
+                            R.color.verdnatura_black
+                        )
+                    )
 
+                }
 
                 this.sale = sale
 

app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt

@@ -12,22 +12,20 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import es.verdnatura.R
 import es.verdnatura.databinding.FragmentSacadorBinding
 import es.verdnatura.domain.toast
-import es.verdnatura.presentation.base.BaseFragmentSalix
+import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnCollectionTicketSelectedListener
 import es.verdnatura.presentation.common.OnOptionsSelectedListener
 import es.verdnatura.presentation.common.TAG
 import es.verdnatura.presentation.common.ToolBarAdapterTooltip
 import es.verdnatura.presentation.view.component.CustomDialog
 import es.verdnatura.presentation.view.component.CustomDialogInput
-import es.verdnatura.presentation.view.feature.modelViewModel.FragmentsViewModel
 import es.verdnatura.presentation.view.feature.sacador.adapter.CollectionAdapterNew
 import es.verdnatura.presentation.view.feature.sacador.model.CollectionTicket
 
-
 class SacadorFragmentNew(
     var type: String
 ) :
-    BaseFragmentSalix<FragmentSacadorBinding, SacadorViewModel, FragmentsViewModel>(SacadorViewModel::class,FragmentsViewModel::class) {
+    BaseFragment<FragmentSacadorBinding, SacadorViewModel>(SacadorViewModel::class) {
 
     private var onCollectionSelectedListener: OnCollectionTicketSelectedListener? = null
     private var goBack: Boolean = false
@@ -37,7 +35,6 @@ class SacadorFragmentNew(
     private var collectionsList: ArrayList<CollectionTicket> = ArrayList()
     private var adapter: CollectionAdapterNew? = null
 
-
     companion object {
         fun newInstance(type: String) = SacadorFragmentNew(type)
     }
@@ -149,7 +146,7 @@ class SacadorFragmentNew(
             .setValue("")
             .setOkButton(getString(R.string.print)) {
 
-                    print()
+                print()
 
             }.setKoButton(getString(R.string.cancel)) {
                 customDialogInput.dismiss()
@@ -167,7 +164,6 @@ class SacadorFragmentNew(
             false
         }
 
-
     }
 
     private fun print() {
@@ -190,8 +186,6 @@ class SacadorFragmentNew(
         }
         customDialogInput.setValue("")
 
-
-
     }
 
     private fun setEvents() {
@@ -202,23 +196,7 @@ class SacadorFragmentNew(
     }
 
     override fun observeViewModel() {
-        with(viewModelSalix) {
-            responseCallBack.observe(viewLifecycleOwner, Observer {
-                binding.splashProgress.visibility = View.GONE
-                if (it.isError) {
-                    ma.messageWithSound(it.errorMessage, true, false)
 
-                } else {
-                    if (goBack) {
-                        if (it.response != null){
-                            createCollectionList( it.response as List<CollectionTicket>)
-                        }
-
-                    }
-                }
-                goBack = false
-            })
-        }
         with(viewModel) {
             binding.splashProgress.visibility = View.GONE
             collectionListLocal.observe(viewLifecycleOwner, Observer {