refs varios

app/build.gradle

@@ -14,7 +14,7 @@ android {
         minSdkVersion 24 //21
         targetSdkVersion 33
         versionCode 177
-        versionName = "23.14Beta"
+        versionName = "23.14"
         //versionName = "23.10" versionCode 174
         //versionName = "23.10.2Beta" versionCode 174
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

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

@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import es.verdnatura.R
 import es.verdnatura.databinding.ItemArticleRowFragmentBinding
+import es.verdnatura.domain.ConstAndValues.SACADOR
 import es.verdnatura.presentation.common.*
 import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
 import es.verdnatura.presentation.view.feature.sacador.model.SaleVO
@@ -352,7 +353,11 @@ class SaleAdapter(
                     txtdeNew.visibility = View.VISIBLE
                     itemArticleQuantityPicked.visibility = View.VISIBLE
                     itemArticleQuantityLine3.visibility = View.VISIBLE
+                   if (type!=SACADOR){
                     imageErrorMessage.visibility = View.VISIBLE
+                   }else{
+                       imageErrorMessage.visibility = View.INVISIBLE
+                    }
                     ivArrow.visibility = View.INVISIBLE
                 }
 

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt

@@ -395,11 +395,22 @@ class CollectionFragmentPreChecker(
                             }
                             "buy" -> binding.scanInput.setText(myQr.more)
                             "parking" -> {
-                                tickets.forEach {
+
+                                if (type == PRECHECKER) {
+                                    collection.tickets.forEach {
+                                        var saleGroup = ""
+                                        it.sales.forEach { at ->
+                                            if (at.saleGroupFk != saleGroup) {
                                                 viewModel.parking(
-                                        ticketFk = it,
+                                                    ticketFk = at.saleGroupFk,
-                                        parking = binding.scanInput.text.toString()
+                                                    parking = myQr.more
                                                 )
+                                                saleGroup = at.saleGroupFk
+                                            }
+
+
+                                        }
+                                    }
                                 }
                             }
 
@@ -1165,8 +1176,15 @@ class CollectionFragmentPreChecker(
 
                                 if (type == CONTROLADOR || type == PRECHECKER) {// sergio:cuidado , esta es de lo último para marcar colores
                                     isScanned = false
-                                    markLine(index, type)
+                                   // markLine(index, type)
                                     /// Log.i("VERDNATURA:","marcamos linea")
+                                    d("VERDNA:TURA:","storedPosition $storedPosition : backPosition:$storedBackPosition")
+                                    lm!!.scrollToPositionWithOffset(30, 0)
+                                    d("VERDNA:TURA:","Primer elemento visible ${lm!!.findFirstVisibleItemPosition()}")
+                                    d("VERDNA:TURA:","Last elemento visible ${lm!!.findLastVisibleItemPosition()}")
+
+
+
                                 } else if (type == SACADOR) {
 
                                     if (sale.isPrepared == "0" || sale.isPrepared.isNullOrEmpty()) {
@@ -1255,6 +1273,7 @@ class CollectionFragmentPreChecker(
         binding.fragmentSacadorCollections.addOnScrollListener(object :
             RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                d("VERDNA:TURA:","onScrollListener ${lm!!.findFirstVisibleItemPosition()}")
                 storedBackPosition = lm.findFirstVisibleItemPosition()
                 super.onScrolled(recyclerView, dx, dy)
             }

app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt

@@ -167,6 +167,8 @@ class EndSacadorFragment(
         //LISTA =========
         binding.collectionSwipe.setOnRefreshListener {
 
+            sales.clear()
+            saleAdapter!!.notifyDataSetChanged()
             searchSaleCollection()
             binding.collectionSwipe.isRefreshing = false
         }

app/src/main/java/es/verdnatura/presentation/view/feature/sacador/model/TicketItemVO.kt

@@ -72,7 +72,8 @@ class SaleVO(
     var isParent: Boolean = false,
     var totalSales: Int = 0,
     var sonSales: MutableList<SaleVO> = mutableListOf(),
-    var code: String = ""
+    var code: String = "",
+    var hasMistake :Boolean = false
 
 
 )

app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt

@@ -645,16 +645,19 @@ class UbicadorFragment(
 
         customDialogInput.setInputText()
         customDialogInput.setTitle(getString(R.string.selfConsumption))
-        customDialogInput.setDescription(getString(R.string.Indicanuevacantidad))
+        customDialogInput.setDescription(getString(R.string.quantityTake))
             .setValue("")
-            .setOkButton(getString(R.string.modify)) {
+            .setOkButton(getString(R.string.take)) {
                 try {
-                    if (customDialogInput.getValue().toInt() >= 0) {
+                    if (customDialogInput.getValue().toInt() > 0) {
                         binding.splashProgress.visibility = VISIBLE
+                        var quantity = if (item.visible.toInt()-customDialogInput.getValue().toInt()>0){
+                            item.visible.toInt()-customDialogInput.getValue().toInt()
+                        }else{ 0 }
                         viewModel.itemShelving_selfConsumption(
                             shelvingFk,
                             item.item,
-                            customDialogInput.getValue().toInt()
+                            quantity
                         )
                     } else {
                         throw Exception("")

app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt

@@ -7,6 +7,7 @@ class ItemUbicadorVO(
     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 = "",

app/src/main/res/values-es/strings.xml

@@ -555,5 +555,6 @@
     <string name="serialNumber">Número serie</string>
     <string name="managerWagon">El número de carros ahora solo se puede modificar por los encargados</string>
     <string name="serialNumberDescrip">Va a modificar el número de serie asociado a su dispositivo.</string>
+    <string name="quantityTake">Indica la cantidad que coges</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -80,7 +80,8 @@
     <string name="ArtículoparaTicket">Ticket Item</string>
     <string name="txtnuevacantidad">Indicate the new quantity and the action you want to take with the rest.</string>
     <string name="BasuraRechazar">Garbage</string>
-    <string name="Indicanuevacantidad">Indicates new quantity</string>
+    <string name="Indicanuevacantidad">Indicate new quantity</string>
+    <string name="quantityTake">Indicate the quantity you take</string>
     <string name="printPreviousGroup">Indicates previous number for printing</string>
     <string name="Coleccióncompleta">Complete collection</string>
     <string name="Parking">Parking</string>