From abf1dfd37bfc6462ffe59d93f9fa05ebab512b79 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Thu, 21 Mar 2024 07:57:45 +0100 Subject: [PATCH] refs #6810 feat:crashlytics --- .../collection/fragment/CollectionFragment.kt | 180 +++++++++++------- .../fragment/ReubicationCollectionFragment.kt | 7 +- 2 files changed, 120 insertions(+), 67 deletions(-) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt index 459b5808..c22bcd9e 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt @@ -41,7 +41,23 @@ import es.verdnatura.domain.ConstAndValues.WAREHOUSEFK import es.verdnatura.domain.notNull import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment -import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.common.DataMessageSalix +import es.verdnatura.presentation.common.ItemScanned +import es.verdnatura.presentation.common.OnBarcodeRowClickListener +import es.verdnatura.presentation.common.OnMistakeClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.OnQuantityClickListener +import es.verdnatura.presentation.common.OnSaleClickListener +import es.verdnatura.presentation.common.OnTicketClickListener +import es.verdnatura.presentation.common.ToolBarAdapterTooltip +import es.verdnatura.presentation.common.addViewObserver +import es.verdnatura.presentation.common.hideKeyboard +import es.verdnatura.presentation.common.itemScanIsQr +import es.verdnatura.presentation.common.itemScanValue +import es.verdnatura.presentation.common.onPackingClickListener +import es.verdnatura.presentation.common.showKeyboard +import es.verdnatura.presentation.common.showKeyboardIn import es.verdnatura.presentation.view.component.CustomDialog import es.verdnatura.presentation.view.component.CustomDialogInput import es.verdnatura.presentation.view.component.CustomDialogList @@ -52,7 +68,12 @@ import es.verdnatura.presentation.view.feature.collection.ItemVO import es.verdnatura.presentation.view.feature.collection.adapter.SaleAdapter import es.verdnatura.presentation.view.feature.main.activity.MainActivity import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO -import es.verdnatura.presentation.view.feature.sacador.model.* +import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO +import es.verdnatura.presentation.view.feature.sacador.model.MistakeTypeVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyListVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementSupplyVO +import es.verdnatura.presentation.view.feature.sacador.model.PlacementVO +import es.verdnatura.presentation.view.feature.sacador.model.SaleVO import org.json.JSONObject @Suppress("UNUSED_ANONYMOUS_PARAMETER") @@ -997,6 +1018,12 @@ class CollectionFragment( } + /* if (type == CONTROLADOR) { + myGroupList.sortedByDescending{ it.isAdded }.sortedWith( + compareBy { it.picked }) + } else { + myGroupList + },*/ saleAdapter = SaleAdapter( myGroupList, @@ -1201,43 +1228,48 @@ class CollectionFragment( } } else if (type == CONTROLADOR || type == PRECHECKER) { - for (saleVO in sales) { - //0-Salegroup + try { - if (saleVO.isControlled == "0") { - //1- Por itemFk - if (txtscan == saleVO.itemFk.toString()) { - if (mpok != null) mpok!!.start() - isOk = true - //Tarea 6067 - // if (saleVO.packingChecked == 1) { - markLine(index, type) - // } else { - // saleVO.packingChecked = saleVO.packingChecked - 1 - //} - //saleAdapter!!.notifyDataSetChanged() - break - } - //2- Por barcode - saleVO.Barcodes.forEach { barcode -> + for (saleVO in sales) { + //0-Salegroup - if (txtscan == barcode) { + if (saleVO.isControlled == "0") { + //1- Por itemFk + if (txtscan == saleVO.itemFk.toString()) { if (mpok != null) mpok!!.start() isOk = true //Tarea 6067 - //if (saleVO.packingChecked == 1) { + // if (saleVO.packingChecked == 1) { markLine(index, type) - //} else { + // } else { // saleVO.packingChecked = saleVO.packingChecked - 1 //} - saleAdapter!!.notifyDataSetChanged() - isBreak = true + //saleAdapter!!.notifyDataSetChanged() + break } - } + //2- Por barcode + saleVO.Barcodes.forEach { barcode -> - if (isBreak) break + if (txtscan == barcode) { + if (mpok != null) mpok!!.start() + isOk = true + //Tarea 6067 + //if (saleVO.packingChecked == 1) { + markLine(index, type) + //} else { + // saleVO.packingChecked = saleVO.packingChecked - 1 + //} + saleAdapter!!.notifyDataSetChanged() + isBreak = true + } + } + + if (isBreak) break + } + index += 1 } - index += 1 + } catch (ex: Exception) { + getString(R.string.errorInput).toast(requireContext()) } //Lo escaneado no encontrado miramos si es parking o ticket if (!isOk) { @@ -1254,42 +1286,51 @@ class CollectionFragment( } } else { - binding.splashProgress.visibility = - VISIBLE + storedPosition = 0 storedBackPosition = 0 // if (type != PRECHECKER) { isMarking = false + try { - viewModel.collectionTicketGet( - txtscan.toInt(), - mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK), - print = "0", - type - ) + var myScan = txtscan.toInt() + + var hasItemSales = sales.any { + it.itemFk == txtscan.toInt() + } + if (!hasItemSales) { + binding.splashProgress.visibility = + VISIBLE + viewModel.collectionTicketGet( + myScan, + mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK), + print = "0", + type + ) + + + if (type.equals(CONTROLADOR)) { + binding.splashProgress.visibility = + VISIBLE + viewModel.ticketIsOutClosureZone( + myScan + ) + //Tarea 6458 + viewModel.ticketState(myScan) + + } + }else{ + mperror!!.start() + } } catch (ex: Exception) { binding.splashProgress.visibility = GONE - ma.messageWithSound( - getString(R.string.error), - isError = false, - isPlayed = false - ) - } - - if (type.equals(CONTROLADOR)) { - viewModel.ticketIsOutClosureZone( - txtscan.toInt() - ) - //Tarea 6458 - viewModel.ticketState(txtscan.toInt()) - + getString(R.string.errorInput).toast(requireContext()) } } } } - } private fun findSale(txtscan: String, position: Int) { @@ -1539,7 +1580,11 @@ class CollectionFragment( state = 0 if (sales[position].isPrepared == "1") { customDialog.setTitle(getString(R.string.unmarkLine)) - .setDescription(getString(R.string.goUnmark) + sales[position].itemFk + getString(R.string.sure)) + .setDescription( + getString(R.string.goUnmark) + sales[position].itemFk + getString( + R.string.sure + ) + ) .setOkButton(getString(R.string.unmark)) { sales[position].isPrepared = "0" sales[position].pickedQuantity = 0 @@ -1966,7 +2011,9 @@ class CollectionFragment( itemFk = customDialogList.getValue().toInt(), ticketFk = ticketSelected, quantityFk = customDialogList.getValueTwo().toInt(), - warehouseFk = mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) + warehouseFk = mobileApplication.dataStoreApp.readDataStoreKey( + WAREHOUSEFK + ) ) @@ -2194,18 +2241,23 @@ class CollectionFragment( //FALTAS / BASURA / SPLIT private fun showQuantityDialog(position: Int) { - customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) - .setValue("") - .setOkButtonAdd(getString(R.string.Agregar)) { - increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) - scanRequest() - customDialogThreeButtons.dismiss() + try { - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialogThreeButtons.dismiss() - }.show() - customDialogThreeButtons.setFocusDialogValue() + customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) + .setValue("") + .setOkButtonAdd(getString(R.string.Agregar)) { + increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) + scanRequest() + customDialogThreeButtons.dismiss() + + }.setKoButton(getString(R.string.cancel)) { + scanRequest() + customDialogThreeButtons.dismiss() + }.show() + customDialogThreeButtons.setFocusDialogValue() + } catch (ex: Exception) { + getString(R.string.errorInput).toast(requireContext()) + } } private fun missingTrashSuccesful() { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt index acedd244..0ac19500 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt @@ -63,10 +63,11 @@ class ReubicationCollectionFragment( for (item in list) { item.code = shelving.uppercase() - for (i in item.carros) { - i.visible = "(" + i.visible + ")" + if (!item.carros.isNullOrEmpty()) { + for (i in item.carros) { + i.visible = "(" + i.visible + ")" + } } - } adapter = ReubicatorAdapter(list.sortedWith(compareBy { item ->