From e85939e211e7e49b9beb50fe6f2f990ab3182c0c Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Tue, 27 Feb 2024 12:00:33 +0100 Subject: [PATCH] refs #6411 feat:update libraries --- .../fragment/BuscarItemViewModel.kt | 4 +- .../fragment/CollectionViewModel.kt | 45 +- .../delivery/viewmodels/DeliveryViewModel.kt | 4 +- .../diadeventa/fragment/DayOfSaleViewModel.kt | 4 +- .../fragment/HistoricoArticuloViewModel.kt | 4 +- .../fragment/ItemShelvingLogFragment.kt | 40 +- .../fragment/shelvingLogViewModel.kt | 5 +- .../fragment/HistoricoVehiculoViewModel.kt | 5 +- .../imageview/activity/ImageViewActivity.kt | 24 - .../inventario/fragment/InventaryViewModel.kt | 11 +- .../feature/login/fragment/LoginViewModel.kt | 5 +- .../ExpeditionPalletDetailViewModel.kt | 4 +- .../fragment/ExpeditionPalletViewModel.kt | 16 +- .../fragment/ExpeditionScanViewModel.kt | 6 +- .../fragment/ExpeditionTruckListViewModel.kt | 7 +- .../presacador/fragment/EndSacadorFragment.kt | 1428 +++++++++-------- 16 files changed, 827 insertions(+), 785 deletions(-) delete mode 100644 app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt index 1cb8537f..25305092 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.buscaritem.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel @@ -16,7 +16,7 @@ class BuscarItemViewModel(val context: Context) : BaseViewModel(context) { private val _locationList by lazy { MutableLiveData() } val locationList: LiveData get() = _locationList - val loadLocationList = Transformations.map(_locationList) { Event(it) } + val loadLocationList: LiveData> = _locationList.map { Event(it) } fun itemshelvingGetInfo(itemFk: Any) { //salix falla fecha diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt index ff674a75..d0e848d3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -3,7 +3,8 @@ package es.verdnatura.presentation.view.feature.collection.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map +import com.google.gson.JsonObject import es.verdnatura.MobileApplication import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.SilexCallback @@ -12,6 +13,7 @@ import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction import es.verdnatura.presentation.common.Event +import es.verdnatura.presentation.common.ResponseItemExistsItemShelvingSale import es.verdnatura.presentation.common.ResponseItemVO import es.verdnatura.presentation.common.TicketState import es.verdnatura.presentation.view.feature.collection.ItemVO @@ -39,10 +41,17 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { val collectionTicketList: LiveData get() = _collectionTicketList + private val _responseExistsItemShelvingSale by lazy { MutableLiveData() } + val responseExistsItemShelvingSale: LiveData + get() = _responseExistsItemShelvingSale + private val _collectionTicketSalix by lazy { MutableLiveData() } val collectionTicketSalix: LiveData get() = _collectionTicketSalix + val loadCollectionTicketSalix: LiveData> = + _collectionTicketSalix.map { Event(it) } + private val _collectionTicketListLocal by lazy { MutableLiveData() } val collectionTicketListLocal: LiveData get() = _collectionTicketListLocal @@ -170,10 +179,16 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { val responseGetExtensionFromUserId: LiveData get() = _responseGetExtensionFromUserId - val loadResponseDel = Transformations.map(_responseDel) { Event(it) } - val loadResponseSaleTrackingMark = Transformations.map(_responseSaleTracking_mark) { Event(it) } - val loadResponseItemShelvingUpdate = - Transformations.map(_responseItemShelvingUpdate) { Event(it) } + + val loadResponseDel: LiveData> = _responseDel.map { Event(it) } + + + val loadResponseSaleTrackingMark: LiveData> = + _responseSaleTracking_mark.map { Event(it) } + + + val loadResponseItemShelvingUpdate: LiveData> = + _responseItemShelvingUpdate.map { Event(it) } fun collectionTicketGet( collectionFk: Int, @@ -295,6 +310,26 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { }) } + fun itemShelvingSaleExists( + itemShelvingSaleFk: Number, + position: Int, + quantity: Int + + ) { + salix.itemShelvingSaleExists( + itemShelvingSaleFk + ) + .enqueue(object : + SalixCallback(context) { + + override fun onSuccess(response: Response) { + _responseExistsItemShelvingSale.value = ResponseItemExistsItemShelvingSale( + response.body()!!.entrySet().first().value.asBoolean, position, quantity + ) + } + }) + } + fun saleTrackingReplace( saleFk: Int, originalQuantity: Int, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt index 486dc37e..23253e5f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.delivery.viewmodels import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel @@ -76,7 +76,7 @@ class DeliveryViewModel(val context: Context) : BaseViewModel(context) { private val _expeditionList by lazy { MutableLiveData() } val expeditionList: LiveData = _expeditionList - val loadRouteList = Transformations.map(_routeList) { Event(it) } + val loadRouteList: LiveData> = _routeList.map { Event(it) } private val _responseLoadList by lazy { MutableLiveData() } val responseLoadList: LiveData = _responseLoadList diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt index 83e220a1..8b066368 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.diadeventa.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel @@ -25,7 +25,7 @@ class DayOfSaleViewModel(val context: Context) : BaseViewModel(context) { val itemShelvingSaleDateList: LiveData get() = _itemShelvingSaleDateList - val loadItemShelvingSaleDateList = Transformations.map(_itemShelvingSaleDateList) { Event(it) } + val loadItemShelvingSaleDateList: LiveData> = _itemShelvingSaleDateList.map { Event(it) } fun itemShelvingGetSaleDate(vShelvingFK: String) { //salix falla fecha diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt index c838ba42..a4c8359c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.historicoarticulo.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Event @@ -17,7 +17,7 @@ class HistoricoArticuloViewModel(val context: Context) : BaseViewModel(context) val historicoList: LiveData get() = _historicoList - val loadHistoricoList = Transformations.map(_historicoList) { Event(it) } + val loadHistoricoList: LiveData> = _historicoList.map { Event(it) } fun itemGetBalance(itemFk: Int, vWarehouseFk: Int) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt index 5bc64597..cdd67b37 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt @@ -5,6 +5,7 @@ import android.view.inputmethod.EditorInfo import androidx.recyclerview.widget.LinearLayoutManager import es.verdnatura.R import es.verdnatura.databinding.FragmentItemshelvinglogBinding +import es.verdnatura.domain.notNull import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.view.component.CustomDialog @@ -67,23 +68,30 @@ class ItemShelvingLogFragment( override fun observeViewModel() { with(viewModel) { - itemShelvingLogList.observe(viewLifecycleOwner) { - if (it.list.isEmpty()) { - customDialog.setTitle(getString(R.string.noResults)) - .setDescription(getString(R.string.noDataLabelScanned)) - .setOkButton(getString(R.string.close)) { - customDialog.dismiss() - }.show() - } else { - adapter = ItemShelvingLogAdapter( - it.list, - onPasillerosItemClickListener = pasillerosItemClickListener!! - ) - binding.itemshelvinglogRecyclerview.adapter = adapter - binding.itemshelvinglogRecyclerview.layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) - setToolBar(getString(R.string.itemShelvingLog) + ":" + itemScan) + loadItemShelvingLogList.observe(viewLifecycleOwner) { event -> + event.getContentIfNotHandled().notNull { + + if (it.list.isEmpty()) { + customDialog.setTitle(getString(R.string.noResults)) + .setDescription(getString(R.string.noDataLabelScanned)) + .setOkButton(getString(R.string.close)) { + customDialog.dismiss() + }.show() + } else { + adapter = ItemShelvingLogAdapter( + it.list, + onPasillerosItemClickListener = pasillerosItemClickListener!! + ) + binding.itemshelvinglogRecyclerview.adapter = adapter + binding.itemshelvinglogRecyclerview.layoutManager = + LinearLayoutManager( + requireContext(), + LinearLayoutManager.VERTICAL, + false + ) + setToolBar(getString(R.string.itemShelvingLog) + ":" + itemScan) + } } } } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt index 2e76a58d..c2b6316a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt @@ -1,8 +1,9 @@ package es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment import android.content.Context +import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Event @@ -13,7 +14,7 @@ import retrofit2.Response class ShelvingLogViewModel(val context: Context) : BaseViewModel(context) { private val _itemShelvingLogSalixList by lazy { MutableLiveData() } - val loadShelvingLogSalixList = Transformations.map(_itemShelvingLogSalixList) { Event(it) } + val loadShelvingLogSalixList: LiveData> = _itemShelvingLogSalixList.map { Event(it) } fun shelvings(vShelvingFK: String) { salix.Shelvings("""{"where": {"code": "$vShelvingFK"}}""").enqueue(object : diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt index d8a4557a..967f7f14 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt @@ -1,8 +1,9 @@ package es.verdnatura.presentation.view.feature.historicovehiculo.fragment import android.content.Context +import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel @@ -14,7 +15,7 @@ import retrofit2.Response class HistoricoVehiculoViewModel(var context: Context) : BaseViewModel(context) { private val _historicovehiculoList by lazy { MutableLiveData() } - val loadHistoricoVehiculoList = Transformations.map(_historicovehiculoList) { Event(it) } + val loadHistoricoVehiculoList: LiveData> = _historicovehiculoList.map { Event(it) } fun machineWorkeGetHistorical(plateNumber: String, workerId:Int) { //salix falla fecha diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt deleted file mode 100644 index b6625a10..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt +++ /dev/null @@ -1,24 +0,0 @@ -package es.verdnatura.presentation.view.feature.imageview.activity - -import es.verdnatura.R -import es.verdnatura.databinding.ActivityImageviewBinding -import es.verdnatura.presentation.base.BaseActivity -import es.verdnatura.presentation.common.loadUrl - -class ImageViewActivity : BaseActivity(){ - - override fun getLayoutId(): Int = R.layout.activity_imageview - - - override fun init() { - binding.mainToolbar.toolbarTitle.text = intent.getStringExtra(getString(R.string.title)) - binding.imgView.loadUrl(intent.getStringExtra(getString(R.string.url))!!) - - binding.mainToolbar.backButton.setOnClickListener { - onBackPressed() - } - } - - - -} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt index 67a9e1f9..c08f975f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.inventario.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import com.google.gson.JsonObject import es.verdnatura.MobileApplication import es.verdnatura.domain.SalixCallback @@ -66,14 +66,12 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) { private val _inventoryListParking by lazy { MutableLiveData() } val inventoryListParking: LiveData get() = _inventoryListParking - - val loadInventaryParkingList = Transformations.map(_inventoryListParking) { Event(it) } + val loadInventaryParkingList: LiveData> = _inventoryListParking.map { Event(it) } private val _responseCode by lazy { MutableLiveData() } val responseCode: LiveData get() = _responseCode - - val loadReponseCode = Transformations.map(_responseCode) { Event(it) } + val loadReponseCode: LiveData> = _responseCode.map { Event(it) } //sergio para obtener comprador fun itemShelvingBuyerGet() { @@ -85,8 +83,7 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) { }) } - - val loadInventaryList = Transformations.map(_inventaryList) { Event(it) } + val loadInventaryList: LiveData> = _inventaryList.map { Event(it) } fun getInventory(buyerFk: Int, warehouseFk: Int) { salix.itemShelvingFilterBuyer(params = arrayListOf(buyerFk, warehouseFk)) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt index 5ac34ae7..85aaa16d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.login.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import com.google.gson.Gson import com.google.gson.JsonObject import com.google.gson.reflect.TypeToken @@ -63,8 +63,7 @@ class LoginViewModel(val context: Context) : BaseViewModel(context) { private val _renewTokenResponse by lazy { MutableLiveData() } val renewTokenResponse: LiveData get() = _renewTokenResponse - - val loadAccessConfigSalixList = Transformations.map(_accessConfigSalixList) { Event(it) } + val loadAccessConfigSalixList: LiveData> = _accessConfigSalixList.map { Event(it) } fun loginSalix(user: String, password: String) { salix.login(LoginSalixVO(user, password)) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt index 4cc9234b..eec8b2f6 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.paletizador.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.presentation.base.BaseViewModel @@ -18,7 +18,7 @@ import retrofit2.Response class ExpeditionPalletDetailViewModel(var context: Context) : BaseViewModel(context) { private val _expeditionPalletList by lazy { MutableLiveData() } - val loadExpeditionPalletList = Transformations.map(_expeditionPalletList) { Event(it) } + val loadExpeditionPalletList: LiveData> = _expeditionPalletList.map { Event(it) } private val _response by lazy { MutableLiveData() } val response: LiveData diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt index e651489c..5ae32dfd 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.paletizador.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse @@ -20,10 +20,11 @@ import retrofit2.Response class ExpeditionPalletViewModel(val context: Context) : BaseViewModel(context) { private val _expeditionPalletList by lazy { MutableLiveData() } - val loadExpeditionPalletList = Transformations.map(_expeditionPalletList) { Event(it) } + val loadExpeditionPalletList: LiveData> = + _expeditionPalletList.map { Event(it) } private val _scanList by lazy { MutableLiveData() } - val loadScanList = Transformations.map(_scanList) { Event(it) } + val loadScanList: LiveData> = _scanList.map { Event(it) } private val _response by lazy { MutableLiveData() } val response: LiveData @@ -57,7 +58,7 @@ class ExpeditionPalletViewModel(val context: Context) : BaseViewModel(context) { .enqueue(object : SalixCallback>(context) { override fun onSuccess(response: Response>) { - _scanList.value = response.body()?.let { ItemScanList(it) } + _scanList.value = response.body()?.let { ItemScanList(it) } } }) @@ -84,11 +85,10 @@ class ExpeditionPalletViewModel(val context: Context) : BaseViewModel(context) { .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { - _responseCheckexpeditionScanPut.value = - ResponseItemVO(isError = false, response = response.body()!!) - - } + _responseCheckexpeditionScanPut.value = + ResponseItemVO(isError = false, response = response.body()!!) + } }) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt index de524169..caa34a74 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt @@ -3,7 +3,7 @@ package es.verdnatura.presentation.view.feature.paletizador.fragment import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse @@ -19,10 +19,10 @@ import retrofit2.Response class ExpeditionScanViewModel(val context: Context) : BaseViewModel(context) { private val _expeditionScanList by lazy { MutableLiveData() } - val loadExpeditionScanList = Transformations.map(_expeditionScanList) { Event(it) } + val loadExpeditionScanList: LiveData> = _expeditionScanList.map { Event(it) } private val _scanList by lazy { MutableLiveData() } - val loadScanList = Transformations.map(_scanList) { Event(it) } + val loadScanList: LiveData> = _scanList.map { Event(it) } private val _response by lazy { MutableLiveData() } val response: LiveData diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt index 423f4062..e92410ef 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt @@ -3,8 +3,9 @@ package es.verdnatura.presentation.view.feature.paletizador.fragment import android.content.Context import android.os.Build import androidx.annotation.RequiresApi +import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Event @@ -20,10 +21,10 @@ import java.time.LocalTime class ExpeditionTruckListViewModel(val context: Context) : BaseViewModel(context) { private val _expeditionTruckList by lazy { MutableLiveData() } - val loadExpeditionTruckList = Transformations.map(_expeditionTruckList) { Event(it) } + val loadExpeditionTruckList: LiveData> = _expeditionTruckList.map { Event(it) } private val _response by lazy { MutableLiveData() } - val loadResponseExpeditionAdd = Transformations.map(_response) { Event(it) } + val loadResponseExpeditionAdd: LiveData> = _response.map { Event(it) } @RequiresApi(Build.VERSION_CODES.O) fun expeditionTruckList() { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt index 443b6750..7519be43 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt @@ -20,6 +20,7 @@ import androidx.recyclerview.widget.RecyclerView import es.verdnatura.R import es.verdnatura.databinding.FragmentPreSacadorBinding import es.verdnatura.domain.ConstAndValues.SECTORFK +import es.verdnatura.domain.notNull import es.verdnatura.domain.toInt import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment @@ -256,342 +257,331 @@ class EndSacadorFragment( } }) + loadResponseSaleGropAdd.observe(viewLifecycleOwner) { event -> + event.getContentIfNotHandled().notNull { + binding.splashProgress.visibility = GONE - responseSaleGroupAdd.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE + if (!goBack) { + if (it.isError) { + ma.messageWithSound( + getString(R.string.errorTicketAdd) + it.errorMessage, + isError = true, + true, + isToasted = true + ) - if (!goBack) { - if (it.isError) { - ma.messageWithSound( - getString(R.string.errorTicketAdd) + it.errorMessage, - isError = true, - true, - isToasted = true - ) - - } else { - viewModel.sectorCollection_getSale( - collection.collectionFk, - mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK) - ) - } - } - }) - - responseSaleAddPrevOK.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - - if (!goBack) { - if (it.isError) { - ma.messageWithSound( - getString(R.string.errorChangeState) + it.errorMessage, - isError = true, - true - ) - - } else { - ma.messageWithSound(getString(R.string.previousOK), isError = false, false) - - } - } - goBack = false - }) - response.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - - if (!goBack) { - if (it.isError) { - ma.messageWithSound(it.errorMessage, isError = true, true) - - } else { - ma.messageWithSound(getString(R.string.previousOK), isError = false, false) - - } - } - goBack = false - }) - responseSaleupdateIsChecked.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - - - if (!goBack) { - if (it.isError) { - ma.messageWithSound( - getString(R.string.errorChangeState) + it.errorMessage, - isError = true, - true - ) - - } else { - if (positionUnmarked != -1) { - - searchSaleCollection() - saleAdapter!!.notifyDataSetChanged() - positionUnmarked = -1 - } - - } - } - goBack = false - - }) - responseItemShelvingSaleSupplyAdd.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - - if (!goBack) { - if (it.isError) { - ma.messageWithSound(it.errorMessage, isError = true, true) - searchSaleCollection() - } - } - goBack = false - - }) - - responseCode.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE - if (!goBack2) { - if (it.isError) { - customDialog.setTitle(getString(R.string.error)) - .setDescription(it.errorMessage) - .setKoButton(getString(R.string.close)) { - scanRequest() - customDialog.dismiss() - }.show() - } else { - if (checkItemScan(it.response)) { - scanRequest() - customDialogList.dismiss() - mpok?.start() - onQuantityOfShelvingSelected(itemShelvingFkStored) } else { - customDialogList.setValueTwo("") - showErrorMessage(getString(R.string.lineNotExist)) - if (mperror != null) { - mperror?.start() - } + viewModel.sectorCollection_getSale( + collection.collectionFk, + mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK) + ) } } } - - goBack2 = false - - }) - } - } - - private fun responseSaleMoveSuccesful() { - - try { - sales[positionCollectionSplit].saldo = quantityCollectionSplit.toInt() - } catch (e: Exception) { - sales[positionCollectionSplit].saldo = 0 - } - //sales[position].startQuantity = quantity - - if (quantityCollectionSplit == 0) - markLine(positionCollectionSplit) - saleAdapter!!.notifyDataSetChanged() - - } - - private fun incresaseSuccesful() { - - try { - sales[positionIncreaseQuantity].saldo = quantityIncrease.toInt() - } catch (e: Exception) { - sales[positionIncreaseQuantity].saldo = 0 - } - - saleAdapter?.notifyDataSetChanged() - - searchSaleCollection() - - } - - //CREATE LIST - - private fun searchSaleCollection() { - binding.splashProgress.visibility = VISIBLE - viewModel.sectorCollection_getSale( - collection.collectionFk, - sectorFk = mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK) - ) - } - - private fun searchTicket(ticketFk: Int) { - - ticket = ticketFk - - if (ticketFk != 0) - binding.splashProgress.visibility = VISIBLE - viewModel.sectorCollectionSaleGroupAdd( - ticketFk, - collection.collectionFk - ) - } - - private fun createSaleList(salesList: List) { - binding.splashProgress.visibility = GONE - if (salesList.isNullOrEmpty()) { - - ma.messageWithSound( - getString(R.string.scanTicketsForAdd), - false, - false, - getString(R.string.titlePrePicker), isToasted = true - ) - - } else { - if (ticket == 0) { - binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() - } - sales = ArrayList() - - salesList.forEach { - sales.add(it) } - //sergio: se tiene que ordenar por el pickingOrder del primer carro (Pako) - for (s in sales) { + /* responseSaleGroupAdd.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE - //sergio: para que no de error si no hay carros. Ya está asignado a 0 el pickingorder si no hay item en el carro - if (!s.carros.isNullOrEmpty()) { - /* s.carros = s.carros.sortedWith(compareBy{it.pickingOrder}).sortedWith( - compareByDescending{it.priority})*/ - s.pickingOrder = s.carros.get(0).pickingOrder + if (!goBack) { + if (it.isError) { + ma.messageWithSound( + getString(R.string.errorTicketAdd) + it.errorMessage, + isError = true, + true, + isToasted = true + ) + + } else { + viewModel.sectorCollection_getSale( + collection.collectionFk, + mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK) + ) + } + } + })*/ + + responseSaleAddPrevOK.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + + if (!goBack) { + if (it.isError) { + ma.messageWithSound( + getString(R.string.errorChangeState) + it.errorMessage, + isError = true, + true + ) + + } else { + ma.messageWithSound(getString(R.string.previousOK), isError = false, false) + + } + } + goBack = false + }) + response.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + + if (!goBack) { + if (it.isError) { + ma.messageWithSound(it.errorMessage, isError = true, true) + + } else { + ma.messageWithSound(getString(R.string.previousOK), isError = false, false) + + } + } + goBack = false + }) + responseSaleupdateIsChecked.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + + + if (!goBack) { + if (it.isError) { + ma.messageWithSound( + getString(R.string.errorChangeState) + it.errorMessage, + isError = true, + true + ) + + } else { + if (positionUnmarked != -1) { + + searchSaleCollection() + saleAdapter!!.notifyDataSetChanged() + positionUnmarked = -1 + } + + } + } + goBack = false + + }) + responseItemShelvingSaleSupplyAdd.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + + if (!goBack) { + if (it.isError) { + ma.messageWithSound(it.errorMessage, isError = true, true) + searchSaleCollection() + } + } + goBack = false + + }) + + responseCode.observe(viewLifecycleOwner, Observer { + binding.splashProgress.visibility = GONE + if (!goBack2) { + if (it.isError) { + customDialog.setTitle(getString(R.string.error)) + .setDescription(it.errorMessage) + .setKoButton(getString(R.string.close)) { + scanRequest() + customDialog.dismiss() + }.show() + } else { + if (checkItemScan(it.response)) { + scanRequest() + customDialogList.dismiss() + mpok?.start() + onQuantityOfShelvingSelected(itemShelvingFkStored) + } else { + customDialogList.setValueTwo("") + showErrorMessage(getString(R.string.lineNotExist)) + if (mperror != null) { + mperror?.start() + } + } } } - //sergio: Se ordena las sales por ellas mismas con With - sales.sortWith(compareBy { it.pickingOrder }) - lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + goBack2 = false - saleAdapter = PreSacadorAdapter( - sales, - pasillerosItemClickListener!!, - object : OnQuantityClickListener { - override fun onQuantityClick(sale: SaleVO) { - sales.forEachIndexed { index, saleVO -> - if (saleVO.idMovimiento == sale.saleFk) { - showQuantityDialog(index) - } - } - } - - }, - object : - OnSaleClickListener { - override fun onSaleClick(sale: SaleVO) { - //sales.forEachIndexed { index, saleVO -> - sales.forEachIndexed { index, saleVO -> - if (saleVO.idMovimiento == sale.saleFk) { - if (saleVO.quantity != saleVO.picked) { - showScanner(index, saleVO) - } else { - unMarkLine(index) - } - } - } - } - }) - binding.fragmentSacadorCollections.adapter = saleAdapter - binding.fragmentSacadorCollections.layoutManager = lm - - setTotalLines() - if (storedPosition != 0) - setListPosition(storedPosition) - else if (storedBackPosition != 0) - setListPosition(storedBackPosition) - - setScrollListener(lm!!) - } - } - - private fun setScrollListener(lm: LinearLayoutManager) { - binding.fragmentSacadorCollections.addOnScrollListener(object : - RecyclerView.OnScrollListener() { - override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { - storedBackPosition = lm.findFirstVisibleItemPosition() - super.onScrolled(recyclerView, dx, dy) - } }) } +} - private fun setTotalLines() { - var totalMark = 0 - sales.forEach { - if (it.saldo == it.picked) - totalMark += 1 - } +private fun responseSaleMoveSuccesful() { + + try { + sales[positionCollectionSplit].saldo = quantityCollectionSplit.toInt() + } catch (e: Exception) { + sales[positionCollectionSplit].saldo = 0 + } + //sales[position].startQuantity = quantity + + if (quantityCollectionSplit == 0) + markLine(positionCollectionSplit) + saleAdapter!!.notifyDataSetChanged() + +} + +private fun incresaseSuccesful() { + + try { + sales[positionIncreaseQuantity].saldo = quantityIncrease.toInt() + } catch (e: Exception) { + sales[positionIncreaseQuantity].saldo = 0 + } + + saleAdapter?.notifyDataSetChanged() + + searchSaleCollection() + +} + +//CREATE LIST + +private fun searchSaleCollection() { + binding.splashProgress.visibility = VISIBLE + viewModel.sectorCollection_getSale( + collection.collectionFk, + sectorFk = mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK) + ) +} + +private fun searchTicket(ticketFk: Int) { + + ticket = ticketFk + + if (ticketFk != 0) + binding.splashProgress.visibility = VISIBLE + viewModel.sectorCollectionSaleGroupAdd( + ticketFk, + collection.collectionFk + ) +} + +private fun createSaleList(salesList: List) { + binding.splashProgress.visibility = GONE + if (salesList.isNullOrEmpty()) { + + ma.messageWithSound( + getString(R.string.scanTicketsForAdd), + false, + false, + getString(R.string.titlePrePicker), isToasted = true + ) + + } else { if (ticket == 0) { binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() } + sales = ArrayList() - binding.mainToolbar.toolbarSubtitle.text = "" + totalMark + "/" + sales.size - if (totalMark == sales.size) { - getString(R.string.ticketCompleted).toast(this.context, Toast.LENGTH_SHORT) - - binding.splashProgress.visibility = VISIBLE - viewModel.saleTrackingAddPrevOK( - sectorCollectionFk = collection.collectionFk - ) - + salesList.forEach { + sales.add(it) } - } + //sergio: se tiene que ordenar por el pickingOrder del primer carro (Pako) - private fun setListPosition(position: Int) { - storedPosition = position - binding.fragmentSacadorCollections.addViewObserver { - lm!!.scrollToPositionWithOffset(position, 0) + for (s in sales) { + //sergio: para que no de error si no hay carros. Ya está asignado a 0 el pickingorder si no hay item en el carro + if (!s.carros.isNullOrEmpty()) { + /* s.carros = s.carros.sortedWith(compareBy{it.pickingOrder}).sortedWith( + compareByDescending{it.priority})*/ + s.pickingOrder = s.carros.get(0).pickingOrder + } } - } + //sergio: Se ordena las sales por ellas mismas con With + sales.sortWith(compareBy { it.pickingOrder }) + lm = LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) - //SEARCH AND MARK - private fun findSale(txtscan: String) { - var index = 0 - var isBreak = false - var isOk = false - - for (saleVO in sales) { - if (saleVO.quantity != saleVO.picked) { - //1- Por carro - var shelvingIndex = 0 - for (placementVO in saleVO.carros) { - if (txtscan.uppercase() == placementVO.shelving.uppercase()) { - if (mpok != null) mpok!!.start() - isOk = true - showShelving(index, shelvingIndex) - isBreak = true - break + saleAdapter = PreSacadorAdapter( + sales, + pasillerosItemClickListener!!, + object : OnQuantityClickListener { + override fun onQuantityClick(sale: SaleVO) { + sales.forEachIndexed { index, saleVO -> + if (saleVO.idMovimiento == sale.saleFk) { + showQuantityDialog(index) + } } - shelvingIndex += 1 } - if (isBreak) break - } - index += 1 - } - if (!isOk) { - if (mperror != null) { - mperror!!.start() - } - (getString(R.string.itemScanetNotFound) + txtscan).toast(requireContext()) + }, + object : + OnSaleClickListener { + override fun onSaleClick(sale: SaleVO) { + //sales.forEachIndexed { index, saleVO -> + sales.forEachIndexed { index, saleVO -> + if (saleVO.idMovimiento == sale.saleFk) { + if (saleVO.quantity != saleVO.picked) { + showScanner(index, saleVO) + } else { + unMarkLine(index) + } + } + } + } + }) + binding.fragmentSacadorCollections.adapter = saleAdapter + binding.fragmentSacadorCollections.layoutManager = lm + + setTotalLines() + if (storedPosition != 0) + setListPosition(storedPosition) + else if (storedBackPosition != 0) + setListPosition(storedBackPosition) + + setScrollListener(lm!!) + } +} + +private fun setScrollListener(lm: LinearLayoutManager) { + binding.fragmentSacadorCollections.addOnScrollListener(object : + RecyclerView.OnScrollListener() { + override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) { + storedBackPosition = lm.findFirstVisibleItemPosition() + super.onScrolled(recyclerView, dx, dy) } + }) +} + +private fun setTotalLines() { + var totalMark = 0 + sales.forEach { + if (it.saldo == it.picked) + totalMark += 1 + } + if (ticket == 0) { + binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() + } + + binding.mainToolbar.toolbarSubtitle.text = "" + totalMark + "/" + sales.size + if (totalMark == sales.size) { + getString(R.string.ticketCompleted).toast(this.context, Toast.LENGTH_SHORT) + + binding.splashProgress.visibility = VISIBLE + viewModel.saleTrackingAddPrevOK( + sectorCollectionFk = collection.collectionFk + ) } - private fun findSale(txtscan: String, position: Int) { - var index = 0 - var isBreak = false - var isOk = false +} - val saleVO = sales[position] +private fun setListPosition(position: Int) { + storedPosition = position + binding.fragmentSacadorCollections.addViewObserver { + lm!!.scrollToPositionWithOffset(position, 0) + } + +} + +//SEARCH AND MARK +private fun findSale(txtscan: String) { + var index = 0 + var isBreak = false + var isOk = false + + for (saleVO in sales) { if (saleVO.quantity != saleVO.picked) { //1- Por carro var shelvingIndex = 0 @@ -599,448 +589,482 @@ class EndSacadorFragment( if (txtscan.uppercase() == placementVO.shelving.uppercase()) { if (mpok != null) mpok!!.start() isOk = true - showShelving(position, shelvingIndex) + showShelving(index, shelvingIndex) isBreak = true break } shelvingIndex += 1 } + if (isBreak) break } index += 1 + } + if (!isOk) { + if (mperror != null) { + mperror!!.start() + } + (getString(R.string.itemScanetNotFound) + txtscan).toast(requireContext()) + } - if (!isOk) { - if (mperror != null) { - mperror!!.start() +} + +private fun findSale(txtscan: String, position: Int) { + var index = 0 + var isBreak = false + var isOk = false + + val saleVO = sales[position] + + if (saleVO.quantity != saleVO.picked) { + //1- Por carro + var shelvingIndex = 0 + for (placementVO in saleVO.carros) { + if (txtscan.uppercase() == placementVO.shelving.uppercase()) { + if (mpok != null) mpok!!.start() + isOk = true + showShelving(position, shelvingIndex) + isBreak = true + break } - ("getString(R.string.itemScanetNotFound)" + txtscan).toast(requireContext()) + shelvingIndex += 1 } + } + index += 1 + + if (!isOk) { + if (mperror != null) { + mperror!!.start() + } + ("getString(R.string.itemScanetNotFound)" + txtscan).toast(requireContext()) } - private fun markLine(position: Int) { +} - saleAdapter!!.notifyDataSetChanged() - setListPosition(position) - saleTrackingReplace(position) - setTotalLines() - } +private fun markLine(position: Int) { - private fun saleTrackingReplace(position: Int) { + saleAdapter!!.notifyDataSetChanged() + setListPosition(position) + saleTrackingReplace(position) + setTotalLines() +} - if (sales[position].picked == sales[position].quantity || sales[position].picked == 0) { +private fun saleTrackingReplace(position: Int) { - viewModel.saleTrackingUpdateIsChecked( - vSaleFk = sales[position].idMovimiento, - vIsChecked = sales[position].picked == sales[position].quantity, - vIsScanned = isScanned + if (sales[position].picked == sales[position].quantity || sales[position].picked == 0) { - ) - } + viewModel.saleTrackingUpdateIsChecked( + vSaleFk = sales[position].idMovimiento, + vIsChecked = sales[position].picked == sales[position].quantity, + vIsScanned = isScanned - isScanned = null - } - - private fun unMarkLine(position: Int) { - - if (sales[position].quantity == sales[position].picked) { - customDialog.setTitle(getString(R.string.unmarkLine)) - .setDescription(getString(R.string.goUnmark) + sales[position].itemFk + getString(R.string.sure)) - .setOkButton(getString(R.string.unmark)) { - sales[position].picked = 0 - saleAdapter!!.notifyDataSetChanged() - setListPosition(position) - - viewModel.itemShelving_updateFromSale( - saleFk = sales[position].idMovimiento - ) - positionUnmarked = position - scanRequest() - customDialog.dismiss() - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialog.dismiss() - }.show() - } - - } - - //SHELVINGS - private fun showShelving(position: Int, shelvingPosition: Int) { - storedShelvingPosition = shelvingPosition - storedPosition = position - binding.splashProgress.visibility = VISIBLE - var quantityGet = 0 - try { - quantityGet = (sales[position].saldo!! - sales[position].picked!!) - } catch (e: Exception) { - } - viewModel.itemPlacementSupplyAiming( - itemFk = sales[position].itemFk, - quantity = quantityGet, - shelvingFk = sales[position].carros[shelvingPosition].shelving ) } - @RequiresApi(Build.VERSION_CODES.O) - private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO) { - var shelving = "" - var item = "" - var longName = "" - var total = "0" - var itemShelvingFk = 0 - if (!placementSupplyListVO.list.isEmpty()) { - val placement = placementSupplyListVO.list[0] - shelving = placement.shelving - item = placement.itemFk - longName = placement.longName - total = placement.total - itemShelvingFk = placement.itemShelvingFk - } - listPlacementSupply = ArrayList() - placementSupplyListVO.list.forEach { - listPlacementSupply.add(BarcodeVO(code = it.proposal)) - } + isScanned = null +} - customDialogList.setTitle("$shelving($item) $total del $longName") - .setOkButton(getString(R.string.take)) { - isScanned = false +private fun unMarkLine(position: Int) { - if (customDialogList.getValueTwo().isNotEmpty()) { - /*Tarea 5109*/ - try { - customDialogList.setValueTwo( - itemScanValue( - customDialogList.getValueTwo(), - "buy", - "more" - ).toString() - ) + if (sales[position].quantity == sales[position].picked) { + customDialog.setTitle(getString(R.string.unmarkLine)) + .setDescription(getString(R.string.goUnmark) + sales[position].itemFk + getString(R.string.sure)) + .setOkButton(getString(R.string.unmark)) { + sales[position].picked = 0 + saleAdapter!!.notifyDataSetChanged() + setListPosition(position) - - if (checkItemScan(customDialogList.getValueTwo())) { - onQuantityOfShelvingSelected(itemShelvingFk) - mpok?.start() - customDialogList.dismiss() - } else { - itemShelvingFkStored = itemShelvingFk - binding.splashProgress.visibility = View.VISIBLE - viewModel.getIdFromCode( - code = customDialogList.getValueTwo() - ) - customDialogList.dismiss() - } - } catch (Ex: Exception) { - ma.messageWithSound(Ex.message.toString(), true, true) - } - scanRequest() - hideKeyboards() - - } else { - getString(R.string.scanItemValidate).toast(requireContext()) - } - - }.setKoButton(getString(R.string.close)) { + viewModel.itemShelving_updateFromSale( + saleFk = sales[position].idMovimiento + ) + positionUnmarked = position scanRequest() - hideKeyboards() - customDialogList.dismiss() - }.setHintValue(getString(R.string.quantitySelect)).setValue(total) - .setHintValueTwo(getString(R.string.scanItem)) - .setValueTwo("").show() - - - customDialogList.getEditTextTwo().post(Runnable { - customDialogList.getEditTextTwo().requestFocusFromTouch() - val lManager: InputMethodManager = - requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager - lManager.hideSoftInputFromWindow( - customDialogList.getEditTextTwo().windowToken, - InputMethodManager.SHOW_FORCED - ) - }) - - customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { - try { - isScanned = - event != null && event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER - - customDialogList.setValueTwo( - itemScanValue( - customDialogList.getValueTwo(), - "buy", - "id" - ).toString() - ) - originalItemScan = customDialogList.getValueTwo() - - - if (customDialogList.getValueTwo().isNotEmpty()) { - if (checkItemScan(customDialogList.getValueTwo())) { - onQuantityOfShelvingSelected(itemShelvingFk) - mpok?.start() - customDialogList.dismiss() - } else { - itemShelvingFkStored = itemShelvingFk - binding.splashProgress.visibility = View.VISIBLE - viewModel.getIdFromCode( - code = customDialogList.getValueTwo() - ) - customDialogList.dismiss() - } - } else { - getString(R.string.scanItemValidate).toast(requireContext()) - } - } catch (Ex: Exception) { - ma.messageWithSound(Ex.message.toString(), true, true) - - } - scanRequest() - hideKeyboards() - return@setOnEditorActionListener true - - } - false - } - - placementSupplyAdapter = - BarcodeAdapter(listPlacementSupply, object : OnBarcodeRowClickListener { - override fun onBarcodeRowClickListener(item: BarcodeVO) { - placementSupplyListVO.list.forEach { - if (it.proposal == item.code) { - customDialogList.setValue(it.total) - total = it.total - itemShelvingFk = it.itemShelvingFk - } - } - - } - }, showDelete = false) - - customDialogList.getRecyclerView().adapter = placementSupplyAdapter - - customDialogList.getRecyclerView().layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) - - } - - private fun onQuantityOfShelvingSelected(itemShelvingFk: Int) { - //1 - MODIFICAR CANTIDAD DEL CARRO - try { - val shelvingVisible = sales[storedPosition].carros[storedShelvingPosition].stockTotal - - sales[storedPosition].carros[storedShelvingPosition].stockTotal = - (shelvingVisible.toInt() - customDialogList.getValue().toInt()).toString() - - //sergio: se añade línea que actualiza la pantalla. Es posible que falle - // el itemShelvingSaleSupplyAdd que se actualiza pantalla si falla se actualizará todo - - sales[storedPosition].carros[storedShelvingPosition].visible = - "(" + (shelvingVisible.toInt() - customDialogList.getValue() - .toInt()).toString() + ")" - - - viewModel.itemShelvingSaleAdd( - itemShelvingFk = itemShelvingFk, - saleFk = sales[storedPosition].idMovimiento, - quantity = customDialogList.getValue().toInt() - ) - - } catch (e: Exception) { - } - - //2- MODIFICAR EL PICKED DEL SALE - try { - sales[storedPosition].picked = - sales[storedPosition].picked!! + customDialogList.getValue().toInt() - } catch (e: Exception) { - } - - //3- MARCAR LINEA - markLine(storedPosition) - - } - - private fun checkItemScan(valueToCheck: String): Boolean { - val saleToCheck = sales[storedPosition] - return saleToCheck.itemFk.toDouble() == valueToCheck.toDouble() - } - - private fun showScanner(index: Int, sale: PreSacadorItemVO) { - - customDialogInput.setTitle("" + sale.itemFk) - .setDescription(getString(R.string.scanWagonForItem)) - .setOkButton(getString(R.string.accept)) { - customDialogInputAction(index) + customDialog.dismiss() }.setKoButton(getString(R.string.cancel)) { - customDialogInput.dismiss() - }.setValue("").show() - customDialogInput.getEditText().requestFocus() - customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { - customDialogInputAction(index) - return@setOnEditorActionListener true - } - false - } - - } - - private fun customDialogInputAction(index: Int) { - if (!customDialogInput.getValue().isNullOrEmpty()) { - findSale(customDialogInput.getValue(), index) - customDialogInput.setValue("") - scanRequest() - customDialogInput.dismiss() - hideKeyboards() - } - } - - //OTROS - private fun setToolBar() { - binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE - binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() - - val listIcons: ArrayList = ArrayList() - - val iconParking = ImageView(context) - iconParking.setImageResource(R.drawable.ic_local_parking_black_24dp) - - val iconEraser = ImageView(context) - iconEraser.setImageResource(R.drawable.previous_delete) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp) - iconEraser.tooltipText = getTooltip(R.drawable.previous_delete) - - } - - //listIcons.add(iconEraser) - listIcons.add(iconParking) - - - binding.mainToolbar.toolbarIcons.adapter = - ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener { - override fun onOptionsItemSelected(item: Drawable) { - - goBack = false - /*if (item == iconEraser) { - - } else*/ - when (item) { - iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( - PasillerosItemVO( - title = getString(R.string.parking) - ), "" - ) - - } - - } - }) - binding.mainToolbar.toolbarIcons.layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) - } - - private fun scanRequest() { - binding.scanInput.requestFocus() - hideKeyboards() - } - - private fun hideKeyboards() { - requireActivity().hideKeyboard() - } - - companion object { - fun newInstance(collection: CollectionVO?, entrypoint: String) = EndSacadorFragment( - collection!!, entrypoint - ) - } - - override fun getLayoutId(): Int = R.layout.fragment_pre_sacador - - override fun onPause() { - goBack = true //SERGIO: se quita porque si no no entra la primera vez - goBack2 = true - super.onPause() - } - - override fun onResume() { - goBack = false - super.onResume() - } - - private fun showErrorMessage(text: String) { - customDialog.setTitle(getString(R.string.errorMarkLine)).setDescription(text) - .setKoButton(getString(R.string.close)) { + scanRequest() customDialog.dismiss() }.show() } - private fun showQuantityDialog(position: Int) { - try { - customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) - .setValue("") - /* .setOkButton(getString(R.string.titleFaults)) { - checkAndCall( - position, - customDialogThreeButtons.getValue().toInt(), - getString(R.string.titleFaults) - ) +} - }.setOkButtonTwo(getString(R.string.BasuraRechazar)) { +//SHELVINGS +private fun showShelving(position: Int, shelvingPosition: Int) { + storedShelvingPosition = shelvingPosition + storedPosition = position + binding.splashProgress.visibility = VISIBLE + var quantityGet = 0 + try { + quantityGet = (sales[position].saldo!! - sales[position].picked!!) + } catch (e: Exception) { + } + viewModel.itemPlacementSupplyAiming( + itemFk = sales[position].itemFk, + quantity = quantityGet, + shelvingFk = sales[position].carros[shelvingPosition].shelving + ) +} - checkAndCall( - position, - customDialogThreeButtons.getValue().toInt(), - getString(R.string.BasuraRechazar) - ) - - }.setOkButtonThree(getString(R.string.Reject)) { - checkAndCall( - position, - customDialogThreeButtons.getValue().toInt(), - getString(R.string.Reject) - ) - - }.setOkButtonFour(getString(R.string.Split)) { - checkAndCall( - position, - customDialogThreeButtons.getValue().toInt(), - getString(R.string.Split) - ) - - */ - .setOkButtonAdd(getString(R.string.Agregar)) { - increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) - scanRequest() - customDialogThreeButtons.dismiss() - - /* checkAndCall( - position, - customDialogThreeButtons.getValue().toInt(), - getString(R.string.Agregar) - )*/ - - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialogThreeButtons.dismiss() - }.show() - customDialogThreeButtons.setFocusDialogValue() - } catch (ex: Exception) { - getString(R.string.errorQuantity).toast(context) - } +@RequiresApi(Build.VERSION_CODES.O) +private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO) { + var shelving = "" + var item = "" + var longName = "" + var total = "0" + var itemShelvingFk = 0 + if (!placementSupplyListVO.list.isEmpty()) { + val placement = placementSupplyListVO.list[0] + shelving = placement.shelving + item = placement.itemFk + longName = placement.longName + total = placement.total + itemShelvingFk = placement.itemShelvingFk + } + listPlacementSupply = ArrayList() + placementSupplyListVO.list.forEach { + listPlacementSupply.add(BarcodeVO(code = it.proposal)) } - private fun increaseQuantity(position: Int, quantity: Int) { - positionIncreaseQuantity = position - quantityIncrease = quantity + customDialogList.setTitle("$shelving($item) $total del $longName") + .setOkButton(getString(R.string.take)) { + isScanned = false - viewModel.collectionIncreaseQuantity( - saleFk = sales[position].idMovimiento, - quantity = quantity + if (customDialogList.getValueTwo().isNotEmpty()) { + /*Tarea 5109*/ + try { + customDialogList.setValueTwo( + itemScanValue( + customDialogList.getValueTwo(), + "buy", + "more" + ).toString() + ) + + + if (checkItemScan(customDialogList.getValueTwo())) { + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + } else { + itemShelvingFkStored = itemShelvingFk + binding.splashProgress.visibility = View.VISIBLE + viewModel.getIdFromCode( + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + } catch (Ex: Exception) { + ma.messageWithSound(Ex.message.toString(), true, true) + } + scanRequest() + hideKeyboards() + + } else { + getString(R.string.scanItemValidate).toast(requireContext()) + } + + }.setKoButton(getString(R.string.close)) { + scanRequest() + hideKeyboards() + customDialogList.dismiss() + }.setHintValue(getString(R.string.quantitySelect)).setValue(total) + .setHintValueTwo(getString(R.string.scanItem)) + .setValueTwo("").show() + + + customDialogList.getEditTextTwo().post(Runnable { + customDialogList.getEditTextTwo().requestFocusFromTouch() + val lManager: InputMethodManager = + requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + lManager.hideSoftInputFromWindow( + customDialogList.getEditTextTwo().windowToken, + InputMethodManager.SHOW_FORCED + ) + }) + + customDialogList.getEditTextTwo().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { + try { + isScanned = + event != null && event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER + + customDialogList.setValueTwo( + itemScanValue( + customDialogList.getValueTwo(), + "buy", + "id" + ).toString() + ) + originalItemScan = customDialogList.getValueTwo() + + + if (customDialogList.getValueTwo().isNotEmpty()) { + if (checkItemScan(customDialogList.getValueTwo())) { + onQuantityOfShelvingSelected(itemShelvingFk) + mpok?.start() + customDialogList.dismiss() + } else { + itemShelvingFkStored = itemShelvingFk + binding.splashProgress.visibility = View.VISIBLE + viewModel.getIdFromCode( + code = customDialogList.getValueTwo() + ) + customDialogList.dismiss() + } + } else { + getString(R.string.scanItemValidate).toast(requireContext()) + } + } catch (Ex: Exception) { + ma.messageWithSound(Ex.message.toString(), true, true) + + } + scanRequest() + hideKeyboards() + return@setOnEditorActionListener true + + } + false + } + + placementSupplyAdapter = + BarcodeAdapter(listPlacementSupply, object : OnBarcodeRowClickListener { + override fun onBarcodeRowClickListener(item: BarcodeVO) { + placementSupplyListVO.list.forEach { + if (it.proposal == item.code) { + customDialogList.setValue(it.total) + total = it.total + itemShelvingFk = it.itemShelvingFk + } + } + + } + }, showDelete = false) + + customDialogList.getRecyclerView().adapter = placementSupplyAdapter + + customDialogList.getRecyclerView().layoutManager = + LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false) + +} + +private fun onQuantityOfShelvingSelected(itemShelvingFk: Int) { + //1 - MODIFICAR CANTIDAD DEL CARRO + try { + val shelvingVisible = sales[storedPosition].carros[storedShelvingPosition].stockTotal + + sales[storedPosition].carros[storedShelvingPosition].stockTotal = + (shelvingVisible.toInt() - customDialogList.getValue().toInt()).toString() + + //sergio: se añade línea que actualiza la pantalla. Es posible que falle + // el itemShelvingSaleSupplyAdd que se actualiza pantalla si falla se actualizará todo + + sales[storedPosition].carros[storedShelvingPosition].visible = + "(" + (shelvingVisible.toInt() - customDialogList.getValue() + .toInt()).toString() + ")" + + + viewModel.itemShelvingSaleAdd( + itemShelvingFk = itemShelvingFk, + saleFk = sales[storedPosition].idMovimiento, + quantity = customDialogList.getValue().toInt() ) + } catch (e: Exception) { + } + + //2- MODIFICAR EL PICKED DEL SALE + try { + sales[storedPosition].picked = + sales[storedPosition].picked!! + customDialogList.getValue().toInt() + } catch (e: Exception) { + } + + //3- MARCAR LINEA + markLine(storedPosition) + +} + +private fun checkItemScan(valueToCheck: String): Boolean { + val saleToCheck = sales[storedPosition] + return saleToCheck.itemFk.toDouble() == valueToCheck.toDouble() +} + +private fun showScanner(index: Int, sale: PreSacadorItemVO) { + + customDialogInput.setTitle("" + sale.itemFk) + .setDescription(getString(R.string.scanWagonForItem)) + .setOkButton(getString(R.string.accept)) { + customDialogInputAction(index) + }.setKoButton(getString(R.string.cancel)) { + customDialogInput.dismiss() + }.setValue("").show() + customDialogInput.getEditText().requestFocus() + customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { + customDialogInputAction(index) + return@setOnEditorActionListener true + } + false } } + +private fun customDialogInputAction(index: Int) { + if (!customDialogInput.getValue().isNullOrEmpty()) { + findSale(customDialogInput.getValue(), index) + customDialogInput.setValue("") + scanRequest() + customDialogInput.dismiss() + hideKeyboards() + } +} + +//OTROS +private fun setToolBar() { + binding.mainToolbar.toolbarSubtitle.visibility = VISIBLE + binding.mainToolbar.toolbarTitle.text = collection.collectionFk.toString() + + val listIcons: ArrayList = ArrayList() + + val iconParking = ImageView(context) + iconParking.setImageResource(R.drawable.ic_local_parking_black_24dp) + + val iconEraser = ImageView(context) + iconEraser.setImageResource(R.drawable.previous_delete) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp) + iconEraser.tooltipText = getTooltip(R.drawable.previous_delete) + + } + + //listIcons.add(iconEraser) + listIcons.add(iconParking) + + + binding.mainToolbar.toolbarIcons.adapter = + ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener { + override fun onOptionsItemSelected(item: Drawable) { + + goBack = false + /*if (item == iconEraser) { + + } else*/ + when (item) { + iconParking.drawable -> pasillerosItemClickListener?.onPasillerosItemClickListener( + PasillerosItemVO( + title = getString(R.string.parking) + ), "" + ) + + } + + } + }) + binding.mainToolbar.toolbarIcons.layoutManager = + LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) +} + +private fun scanRequest() { + binding.scanInput.requestFocus() + hideKeyboards() +} + +private fun hideKeyboards() { + requireActivity().hideKeyboard() +} + +companion object { + fun newInstance(collection: CollectionVO?, entrypoint: String) = EndSacadorFragment( + collection!!, entrypoint + ) +} + +override fun getLayoutId(): Int = R.layout.fragment_pre_sacador + +override fun onPause() { + goBack = true //SERGIO: se quita porque si no no entra la primera vez + goBack2 = true + super.onPause() +} + +override fun onResume() { + goBack = false + super.onResume() +} + +private fun showErrorMessage(text: String) { + customDialog.setTitle(getString(R.string.errorMarkLine)).setDescription(text) + .setKoButton(getString(R.string.close)) { + customDialog.dismiss() + }.show() +} + +private fun showQuantityDialog(position: Int) { + try { + customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad)) + .setValue("") + /* .setOkButton(getString(R.string.titleFaults)) { + checkAndCall( + position, + customDialogThreeButtons.getValue().toInt(), + getString(R.string.titleFaults) + ) + + }.setOkButtonTwo(getString(R.string.BasuraRechazar)) { + + checkAndCall( + position, + customDialogThreeButtons.getValue().toInt(), + getString(R.string.BasuraRechazar) + ) + + }.setOkButtonThree(getString(R.string.Reject)) { + checkAndCall( + position, + customDialogThreeButtons.getValue().toInt(), + getString(R.string.Reject) + ) + + }.setOkButtonFour(getString(R.string.Split)) { + checkAndCall( + position, + customDialogThreeButtons.getValue().toInt(), + getString(R.string.Split) + ) + +*/ + .setOkButtonAdd(getString(R.string.Agregar)) { + increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) + scanRequest() + customDialogThreeButtons.dismiss() + + /* checkAndCall( + position, + customDialogThreeButtons.getValue().toInt(), + getString(R.string.Agregar) + )*/ + + }.setKoButton(getString(R.string.cancel)) { + scanRequest() + customDialogThreeButtons.dismiss() + }.show() + customDialogThreeButtons.setFocusDialogValue() + } catch (ex: Exception) { + getString(R.string.errorQuantity).toast(context) + } +} + +private fun increaseQuantity(position: Int, quantity: Int) { + positionIncreaseQuantity = position + quantityIncrease = quantity + + viewModel.collectionIncreaseQuantity( + saleFk = sales[position].idMovimiento, + quantity = quantity + ) + +} + +}