diff --git a/app/src/main/java/es/verdnatura/di/viewModelModule.kt b/app/src/main/java/es/verdnatura/di/viewModelModule.kt index c56efb00..05c32a60 100644 --- a/app/src/main/java/es/verdnatura/di/viewModelModule.kt +++ b/app/src/main/java/es/verdnatura/di/viewModelModule.kt @@ -14,9 +14,7 @@ import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlV import es.verdnatura.presentation.view.feature.delivery.viewmodels.DeliveryViewModel import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleViewModel import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloViewModel -import es.verdnatura.presentation.view.feature.historicoshelving.fragment.ItemShelvingLogViewModel import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.ShelvingLogViewModel -import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoViewModel import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel import es.verdnatura.presentation.view.feature.login.fragment.LoginViewModel import es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewModel @@ -158,13 +156,6 @@ val viewModelModule = module { ControlVehiculoViewModel(androidContext()) } - viewModel { - HistoricoVehiculoViewModel(androidContext()) - } - - viewModel { - ItemShelvingLogViewModel(androidContext()) - } viewModel { ShelvingLogViewModel(androidContext()) } diff --git a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt index 24e0e07e..926e392d 100644 --- a/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt +++ b/app/src/main/java/es/verdnatura/presentation/common/UICallbacks.kt @@ -6,7 +6,6 @@ import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO import es.verdnatura.presentation.view.feature.articulo.model.ItemProposal -import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO import es.verdnatura.presentation.view.feature.claim.fragment.reubication.model.Reubication import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix import es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoSummary @@ -140,10 +139,6 @@ interface OnTrashItemRowClickListener { fun onTrashItemRowClickListener(item: WorkForms) } -interface OnLocationRowClickListener { - fun onLocationRowClickListener(item: ItemLocationVO) -} - interface OnInvetoryNichoClickListener { fun onInvetoryNichoClickListener(item: ItemInventaryVO) } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt index 36b8b877..0adf9ac9 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/adapter/LocationAdapter.kt @@ -2,41 +2,52 @@ package es.verdnatura.presentation.view.feature.buscaritem.adapter import android.view.LayoutInflater import android.view.ViewGroup +import android.widget.Toast import androidx.recyclerview.widget.RecyclerView import es.verdnatura.R import es.verdnatura.databinding.ItemLocationRowBinding +import es.verdnatura.domain.toast import es.verdnatura.presentation.common.OnPasillerosItemClickListener -import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemShelvings import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO -class LocationAdapter ( - private val items: List, +class LocationAdapter( + private val items: List, private val onPasillerosItemClickListener: OnPasillerosItemClickListener -): RecyclerView.Adapter () { - +) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { return ItemHolder( - ItemLocationRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) + ItemLocationRowBinding.inflate(LayoutInflater.from(parent.context), parent, false) ) } - override fun getItemCount() =items.size + override fun getItemCount() = items.size override fun onBindViewHolder(holder: ItemHolder, position: Int) { holder.bind(items[position]) holder.binding.root.setOnClickListener { - onPasillerosItemClickListener.onPasillerosItemClickListener(PasillerosItemVO(title = - R.string.titleUbicator),items[position].Matricula) + onPasillerosItemClickListener.onPasillerosItemClickListener( + PasillerosItemVO( + title = + R.string.titleUbicator + ), items[position].shelving.code + ) + } + holder.binding.root.setOnLongClickListener { + items[position].shelving.parking.sector.description.toast( + holder.binding.root.context, + Toast.LENGTH_SHORT + ) + true } } class ItemHolder( val binding: ItemLocationRowBinding - ) : RecyclerView.ViewHolder(binding.root){ - //private val res = binding.root.context.resources - fun bind(item: ItemLocationVO) { + ) : RecyclerView.ViewHolder(binding.root) { + fun bind(item: ItemShelvings) { binding.apply { this.item = item } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt index f95a65e5..99e5ab9f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt @@ -10,6 +10,7 @@ import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnPasillerosItemClickListener import es.verdnatura.presentation.common.itemScanValue import es.verdnatura.presentation.view.feature.buscaritem.adapter.LocationAdapter +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemShelvings class BuscarItemFragment( var itemFk: Any? = null @@ -33,7 +34,7 @@ class BuscarItemFragment( binding.mainToolbar.toolbarTitle.text = getString(R.string.getubicaition) setEvents() if (itemFk != null) { - getLocations(itemFk!!) + viewModel.getIdFromCodeSalix(itemFk!!.toString()) } super.init() } @@ -66,17 +67,22 @@ class BuscarItemFragment( private fun getLocations(itemFk: Any) { this.itemFk = itemFk - viewModel.itemshelvingGetInfo(itemFk) + viewModel.getIdFromCodeSalix(itemFk.toString()) } override fun observeViewModel() { with(viewModel) { - loadLocationList.observe(viewLifecycleOwner) { event -> + + loadItemShelvingsList.observe(viewLifecycleOwner) { event -> event.getContentIfNotHandled().notNull { itemResponse -> try { - adapter = LocationAdapter(itemResponse.list, pasillerosItemClickListener!!) + val sortedList = itemResponse.list.sortedWith( + compareByDescending { it.shelving.priority } + .thenBy { it.created } + ) + adapter = LocationAdapter(sortedList, pasillerosItemClickListener!!) binding.locationRecyclerview.adapter = adapter binding.locationRecyclerview.layoutManager = LinearLayoutManager( 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 7afd42dc..cf73ce8e 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 @@ -5,24 +5,44 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.formatWithQuotes +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Event -import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO -import es.verdnatura.presentation.view.feature.buscaritem.model.LocationListVO +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemShelvings +import es.verdnatura.presentation.view.feature.buscaritem.model.ItemShelvingsList import retrofit2.Response class BuscarItemViewModel(val context: Context) : BaseViewModel(context) { - private val _locationList by lazy { MutableLiveData() } - val locationList: LiveData - get() = _locationList - val loadLocationList: LiveData> = _locationList.map { Event(it) } - fun itemshelvingGetInfo(itemFk: Any) { - salix.itemshelvingGetInfo(params = arrayListOf(itemFk).formatWithQuotes()) - .enqueue(object : SalixCallback>(context) { - override fun onSuccess(response: Response>) { - _locationList.value = response.body()?.let { LocationListVO(it) } + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) + + private val _itemShelvingsList by lazy { MutableLiveData() } + val itemShelvingsList: LiveData = _itemShelvingsList + val loadItemShelvingsList: LiveData> = + _itemShelvingsList.map { Event(it) } + + fun getIdFromCodeSalix(code: String) { + getItemFromBarcodeUseCase.execute(code) + .enqueue(object : SalixCallback(context) { + + override fun onSuccess(response: Response) { + if (response.body() != null) { + itemshelvingsGet(response.body()!!) + } + + } + }) + } + + fun itemshelvingsGet(itemFk: Any) { + salix.itemShelvingsGet( + filter = """{"where":{"itemFk":$itemFk},"fields":["created","visible","available","shelvingFk"], + |"include":[{"relation":"shelving","scope":{"fields":["code","priority","parkingFk"], + |"include":{"relation":"parking","scope":{"fields":["code","sectorFk"]}}}}]}""".trimMargin() + ) + .enqueue(object : SalixCallback>(context) { + override fun onSuccess(response: Response>) { + _itemShelvingsList.value = response.body()?.let { ItemShelvingsList(it) } } }) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt index 7103d8d4..429b1156 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/model/ItemLocationVO.kt @@ -2,21 +2,27 @@ package es.verdnatura.presentation.view.feature.buscaritem.model import es.verdnatura.domain.isoToString -class ItemLocationVO( - var Parking: String = "", - var Matricula: String = "", - var visible: Int = 0, - var itemFk: Int = 0, - var priority: Int = 0 +class ItemShelvingsList( + var list: List = listOf() +) +data class ItemShelvings( + val visible: Int, val available: Int, val shelving: Shelving ) { var created: String = "" get() { return field.isoToString() } - } -class LocationListVO( - var list: List = listOf() +data class Shelving( + val code: String, val priority: Int, val parking: Parking +) + +data class Parking( + val code: String, val sector: Sector +) + +data class Sector( + val description: String ) \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt deleted file mode 100644 index 975256bc..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt +++ /dev/null @@ -1,356 +0,0 @@ -package es.verdnatura.presentation.view.feature.controlvehiculo.fragment - -import android.content.Context -import android.graphics.drawable.Drawable -import android.util.TypedValue -import android.view.View.GONE -import android.view.inputmethod.EditorInfo -import android.widget.ImageView -import androidx.recyclerview.widget.LinearLayoutManager -import es.verdnatura.R -import es.verdnatura.databinding.FragmentVehiclecontrolBinding -import es.verdnatura.domain.toast -import es.verdnatura.presentation.base.BaseFragment -import es.verdnatura.presentation.common.OnCollectionSelectedListener -import es.verdnatura.presentation.common.OnOptionsSelectedListener -import es.verdnatura.presentation.common.TAG -import es.verdnatura.presentation.common.ToolBarAdapterTooltip -import es.verdnatura.presentation.common.hideKeyboard -import es.verdnatura.presentation.view.component.CustomDialog -import es.verdnatura.presentation.view.component.CustomDialogInput -import es.verdnatura.presentation.view.component.CustomDialogThreeButtons -import es.verdnatura.presentation.view.feature.historicovehiculo.fragment.HistoricoVehiculoFragment -import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO -import es.verdnatura.presentation.view.feature.sacador.fragment.SacadorFragment - -@Suppress("UNUSED_ANONYMOUS_PARAMETER") -class ControlVehiculoFragment( - private var tagName: String = "" -) : BaseFragment( - ControlVehiculoViewModel::class -) { - - private var goBack: Boolean = false - private var onCollectionSelectedListener: OnCollectionSelectedListener? = null - override fun getLayoutId(): Int = R.layout.fragment_vehiclecontrol - private lateinit var customDialog: CustomDialog - private var isWorkedTimed = "UNREGISTERED" - private lateinit var customDialogInput: CustomDialogInput - private lateinit var customDialogThreeButtons: CustomDialogThreeButtons - - companion object { - fun newInstance(tagName: String) = ControlVehiculoFragment(tagName) - } - - override fun onAttach(context: Context) { - super.onAttach(context) - if (context is OnCollectionSelectedListener) onCollectionSelectedListener = context - } - - override fun init() { - - customDialog = CustomDialog(requireContext()) - customDialogInput = CustomDialogInput(requireContext()) - customDialogThreeButtons = CustomDialogThreeButtons(requireContext()) - goBack = false - if (tagName == HistoricoVehiculoFragment.TAG) { - setToolBar("HISTORY") - showScanner(getString(R.string.scanShelvingHistorical), "HISTORY") - } else { - - checkControlTimeVehicle() - setToolBar("ALL") - } - - - setEvents() - super.init() - } - - override fun onPause() { - goBack = true - super.onPause() - } - - private fun setToolBar(direction: String?) { - - binding.mainToolbar.toolbarTitle.text = getString(R.string.vehiclecontrol) - binding.mainToolbar.toolbarTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13F) - - val listIcons: ArrayList = ArrayList() - val iconHistory = ImageView(context) - iconHistory.setImageResource(R.drawable.ic_history_black_24dp) - val iconVehicleIn = ImageView(context) - iconVehicleIn.setImageResource(R.drawable.car) - val iconVehicleOut = ImageView(context) - iconVehicleOut.setImageResource(R.drawable.car_off) - - iconHistory.tooltipText = getTooltip(R.drawable.ic_history_black_24dp) - iconVehicleIn.tooltipText = getTooltip(R.drawable.car) - iconVehicleOut.tooltipText = getTooltip(R.drawable.car_off) - - when (direction) { - "OUT" -> { - listIcons.remove(iconVehicleIn) - listIcons.add(iconVehicleOut) - listIcons.add(iconHistory) - } - - "IN" -> { - listIcons.remove(iconVehicleOut) - listIcons.add(iconVehicleIn) - listIcons.add(iconHistory) - } - } - - - binding.mainToolbar.toolbarIcons.adapter = - ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener { - override fun onOptionsItemSelected(item: Drawable) { - - when (item) { - iconHistory.drawable -> showScanner( - getString(R.string.scanShelvingHistorical), "HISTORY" - ) - - iconVehicleIn.drawable -> showScanner(getString(R.string.scanPlate), "IN") - iconVehicleOut.drawable -> showScanner( - getString(R.string.scanPlateTakeoff), "OUT" - ) - } - } - }) - binding.mainToolbar.toolbarIcons.layoutManager = - LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) - } - - private fun showScanner(description: String, action: String) { - - customDialogInput.setTitle(getString(R.string.vehiclecontrol)).setDescription(description) - .setOkButton(getString(R.string.accept)) { - if (customDialogInput.getValue().isNotEmpty()) { - insertControlTimeVehicle(customDialogInput.getValue(), action) - } - } - - .setKoButton(getString(R.string.cancel)) { - customDialogInput.dismiss() - if (tagName == HistoricoVehiculoFragment.TAG) { - ma.onMyBackPressed() - } - - }.setValue("").show() - - customDialogInput.setFocusText() - - customDialogInput.getEditText().setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { - - if (customDialogInput.getValue().isNotEmpty()) { - insertControlTimeVehicle(customDialogInput.getValue(), action) - } - return@setOnEditorActionListener true - } - false - } - - } - - private fun checkControlTimeVehicle() { - - if (!goBack) { - try { - viewModel.workerMachineryIsRegistered(mobileApplication.userId!!) - } catch (ex: Exception) { - ma.messageWithSound( - message = getString(R.string.errorUserId), - isError = true, - isToasted = true, - isPlayed = true - ) - } - - } - } - - private fun insertControlTimeVehicle(plateNumber: String, direction: String) { - - when (direction) { - "HISTORY" -> { - ma.onPasillerosItemClickListener( - PasillerosItemVO(title = R.string.titleHistoricalHide), plateNumber - ) - } - - "IN" -> { - viewModel.machineWorkerUpdate(plateNumber) - } - - "OUT" -> { - viewModel.machineWorkerUpdate(plateNumber) - } - - "" -> { - ma.openFragmentPickers(true) - } - } - - customDialogInput.setValue("") - scanRequest() - customDialogInput.dismiss() - hideKeyboards() - } - - private fun scanRequest() { - binding.scanInput.requestFocus() - hideKeyboards() - } - - private fun hideKeyboards() { - try { - requireActivity().hideKeyboard() - } catch (e: Exception) { - println(e.message) - } - } - - private fun setEvents() { - - binding.mainToolbar.backButton.setOnClickListener { - ma.openFragmentPickers(true) - - } - - binding.scanInput.requestFocus() - binding.scanInput.setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) { - if (!binding.scanInput.text.isNullOrEmpty()) { - - if (tagName == HistoricoVehiculoFragment.TAG) { - showOptionsHistorical(binding.scanInput.text.toString()) - } else { - showOptionsVehicleControl(binding.scanInput.text.toString()) - } - } - binding.scanInput.setText("") - ma.hideKeyboard(binding.scanInput) - return@setOnEditorActionListener true - } - false - } - } - - private fun showOptionsVehicleControl(plate: String) { - - customDialogThreeButtons.setCustomDialogValue(GONE) - - customDialogThreeButtons.setDescription(getString(R.string.doVehiclePlate) + plate + "?") - .setValue(plate) - if (isWorkedTimed == "UNREGISTERED") { - customDialogThreeButtons.setOkButtonTwo("COGER") { - if (customDialogThreeButtons.getValue().trim().isEmpty()) { - getString(R.string.returnScan).toast(requireContext()) - } else { - customDialogThreeButtons.dismiss() - insertControlTimeVehicle(customDialogThreeButtons.getValue(), "IN") - } - } - } else { - - customDialogThreeButtons.setOkButtonThree("DEJAR") { - if (customDialogThreeButtons.getValue().trim().isEmpty()) { - getString(R.string.returnScan).toast(requireContext()) - } else { - customDialogThreeButtons.dismiss() - insertControlTimeVehicle(customDialogThreeButtons.getValue(), "OUT") - } - } - }.setOkButtonFour(getString(R.string.historical)) { - if (customDialogThreeButtons.getValue().trim().isEmpty()) { - getString(R.string.returnScan).toast(requireContext()) - } else { - customDialogThreeButtons.dismiss() - insertControlTimeVehicle(customDialogThreeButtons.getValue(), "HISTORY") - - } - - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialogThreeButtons.dismiss() - }.show() - } - - private fun showOptionsHistorical(plate: String) { - - customDialogThreeButtons.setCustomDialogValue(GONE) - - customDialogThreeButtons.setDescription(getString(R.string.doVehiclePlate) + plate + "?") - - .setValue(plate) - - .setOkButtonFour(getString(R.string.historical)) { - if (customDialogThreeButtons.getValue().trim().isEmpty()) { - getString(R.string.returnScan).toast(requireContext()) - } else { - customDialogThreeButtons.dismiss() - insertControlTimeVehicle(customDialogThreeButtons.getValue(), "HISTORY") - - } - - }.setKoButton(getString(R.string.cancel)) { - scanRequest() - customDialogThreeButtons.dismiss() - }.show() - } - - override fun observeViewModel() { - - with(viewModel) { - responseUpdate.observe(viewLifecycleOwner) { - ma.openFragmentPickers(false) - } - - responseControl.observe(viewLifecycleOwner) { - - if (it == "1") { - isWorkedTimed = "REGISTERED" - setToolBar("OUT") - - if (tagName != SacadorFragment.TAG) { - ma.openFragmentPickers(false) - } - - } else { - - if (it == "0") { - setToolBar("IN") - - customDialogInput.setTitle(getString(R.string.vehiclecontrol)) - .setDescription(getString(R.string.scanPlate)) - .setOkButton(getString(R.string.takeVehicle)) { - if (customDialogInput.getValue().isNotEmpty()) { - insertControlTimeVehicle(customDialogInput.getValue(), "IN") - } - customDialogInput.setValue("") - scanRequest() - customDialogInput.dismiss() - hideKeyboards() - } - - .setKoButton(getString(R.string.noVehicle)) { - customDialogInput.dismiss() - ma.openFragmentPickers(true) - - }.setValue("").show() - - customDialogInput.setFocusText() - - } - } - } - - } - - } - -} \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt index 75f67e11..11b7d6a3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt @@ -16,44 +16,12 @@ import retrofit2.Response class ControlVehiculoViewModel(val context: Context) : BaseViewModel(context) { - private val _responseUpdate by lazy { MutableLiveData() } - val responseUpdate: LiveData - get() = _responseUpdate - - private val _responseControl by lazy { MutableLiveData() } - val responseControl: LiveData - get() = _responseControl - private val _responseMachine by lazy { MutableLiveData() } val responseMachine: LiveData get() = _responseMachine private val _responseGetName by lazy { MutableLiveData() } val responseGetName: LiveData = _responseGetName - fun machineWorkerUpdate( - plate: String - ) { - salix.machineWorkerUpdateInTime(hashMapOf("plate" to plate)) - .enqueue(object : SalixCallback(context) { - - override fun onSuccess(response: Response) { - - _responseUpdate.value = response.body() - - } - - }) - } - - fun workerMachineryIsRegistered(userId: Int) { - salix.workerMachineryIsRegistered(arrayListOf(userId)) - .enqueue(object : SalixCallback(context) { - override fun onSuccess(response: Response) { - _responseControl.value = - response.body()!! - } - }) - } fun deviceProductionGetnameDevice(androidId: String) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt deleted file mode 100644 index aaac2c37..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt +++ /dev/null @@ -1,73 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicoshelving.adapter - -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView -import es.verdnatura.R -import es.verdnatura.databinding.ItemShelvinglogRowBinding -import es.verdnatura.presentation.common.OnPasillerosItemClickListener -import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog -import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO - -class ItemShelvingLogAdapter( - private var items: List, - private val onPasillerosItemClickListener: OnPasillerosItemClickListener -) : RecyclerView.Adapter() { - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { - return ItemHolder( - ItemShelvinglogRowBinding.inflate(LayoutInflater.from(parent.context), parent, false) - ) - } - - override fun getItemCount() = items.size - - override fun onBindViewHolder(holder: ItemHolder, position: Int) { - holder.bind(items[position]) - holder.binding.root.setOnClickListener { - - if (!items[position].shelvingFk.isNullOrEmpty()) { - - onPasillerosItemClickListener.onPasillerosItemClickListener( - PasillerosItemVO( - title = - R.string.titleUbicator - ), items[position].shelvingFk!! - ) - } - - } - } - fun addList(list:List){ - items = list - notifyDataSetChanged() - - } - inner class ItemHolder( - val binding: ItemShelvinglogRowBinding - ) : RecyclerView.ViewHolder(binding.root) { - private val res = binding.root.context.resources - fun bind(item: ItemShelvingLog) { - binding.apply { - - binding.txtNickname.setOnClickListener { - if (item.worker?.id != null) openWorker(binding, item.worker?.id!!) - } - binding.txtVisible.setOnClickListener { - if (item.worker?.id != null) openWorker(binding, item.worker?.id!!) - } - - - this.item = item - - } - } - } - - private fun openWorker(binding: ItemShelvinglogRowBinding, id: Int) { - onPasillerosItemClickListener.onPasillerosItemClickListener( - PasillerosItemVO(title = R.string.titleUserControlVehicle), - id.toString() - ) - } -} 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 deleted file mode 100644 index 48a1e8b8..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt +++ /dev/null @@ -1,153 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicoshelving.fragment - -import android.content.Context -import android.os.Handler -import android.os.Looper -import android.view.View -import android.view.inputmethod.EditorInfo -import androidx.recyclerview.widget.LinearLayoutManager -import es.verdnatura.R -import es.verdnatura.databinding.FragmentItemshelvinglogBinding -import es.verdnatura.domain.ConstAndValues.LIMITRECORDSSHELVINGLOG -import es.verdnatura.domain.toLong -import es.verdnatura.presentation.base.BaseFragment -import es.verdnatura.presentation.common.OnPasillerosItemClickListener -import es.verdnatura.presentation.view.component.CustomDialog -import es.verdnatura.presentation.view.feature.historicoshelving.adapter.ItemShelvingLogAdapter - -@Suppress("UNUSED_ANONYMOUS_PARAMETER") -class ItemShelvingLogFragment( - var entryPoint: String = "" -) : BaseFragment(ItemShelvingLogViewModel::class) { - - private var adapter: ItemShelvingLogAdapter? = null - private var itemScan = "" - private var pasillerosItemClickListener: OnPasillerosItemClickListener? = null - private var records: Int = LIMITRECORDSSHELVINGLOG - private var shelving: String = "" - private var positionScroll = 0 - private var positionToReturn = 0 - - companion object { - fun newInstance(entryPoint: String) = ItemShelvingLogFragment(entryPoint) - } - - private lateinit var customDialog: CustomDialog - - override fun getLayoutId(): Int = R.layout.fragment_itemshelvinglog - - override fun init() { - - customDialog = CustomDialog(requireContext()) - setEvents() - setToolBar(getString(R.string.itemShelvingLog)) - setAdapter() - super.init() - - } - - private fun setAdapter() { - binding.itemshelvinglogRecyclerview.layoutManager = - LinearLayoutManager( - requireContext(), - LinearLayoutManager.VERTICAL, - false - ) - adapter = ItemShelvingLogAdapter( - listOf(), - onPasillerosItemClickListener = pasillerosItemClickListener!! - ) - binding.itemshelvinglogRecyclerview.adapter = adapter - } - - override fun onAttach(context: Context) { - if (context is OnPasillerosItemClickListener) pasillerosItemClickListener = context - super.onAttach(context) - } - - private fun setToolBar(title: String) { - binding.mainToolbar.toolbarTitle.text = title - } - - private fun setEvents() { - val scrollView = binding.scrollView - scrollView.setOnScrollChangeListener { _, _, scrollY, _, _-> - positionScroll = scrollY - } - - - binding.scanInput.requestFocus() - binding.loadMoreButton.setOnClickListener { - positionToReturn = positionScroll - records += LIMITRECORDSSHELVINGLOG - try { - viewModel.getIdFromCodeSalix(shelving.toLong().toString(), records) - } catch (ex: Exception) { - - viewModel.itemShelvingLogGet( - shelving, - records - ) - } - } - binding.scanInput.setOnEditorActionListener { v, actionId, event -> - if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { - if (binding.scanInput.text.toString().isNotEmpty()) { - //Tarea 7168 - shelving = binding.scanInput.text.toString() - records = LIMITRECORDSSHELVINGLOG - try { - viewModel.getIdFromCodeSalix(binding.scanInput.toLong().toString(), records) - } catch (ex: Exception) { - viewModel.itemShelvingLogGet( - shelving, - records - ) - } - } - binding.scanInput.setText("") - ma.hideKeyboard(binding.scanInput) - return@setOnEditorActionListener true - } - false - } - binding.mainToolbar.backButton.setOnClickListener { - ma.onMyBackPressed() - } - - } - - 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 { - - //TAREA 7168 - if (it.list.size == records) { - binding.loadMoreButton.visibility = View.VISIBLE - } else { - binding.loadMoreButton.visibility = View.GONE - } - adapter!!.addList(it.list) - setToolBar(getString(R.string.itemShelvingLog) + ":" + itemScan) - - val handler = Handler(Looper.getMainLooper()) - handler.postDelayed({ - binding.scrollView.smoothScrollTo(0, positionToReturn) - }, 1000) - - - } - } - } - } - -} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt deleted file mode 100644 index 34690514..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt +++ /dev/null @@ -1,64 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicoshelving.fragment - -import android.content.Context -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import es.verdnatura.domain.ConstAndValues.LIMITRECORDSSHELVINGLOG -import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase -import es.verdnatura.presentation.base.BaseViewModel -import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLog -import es.verdnatura.presentation.view.feature.historicoshelving.model.ItemShelvingLogList -import retrofit2.Response - -class ItemShelvingLogViewModel(val context: Context) : BaseViewModel(context) { - - private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) - - private val _itemShelvingLogList by lazy { MutableLiveData() } - val itemShelvingLogList: LiveData = _itemShelvingLogList - - private val _responseCode by lazy { MutableLiveData() } - val responseCode: LiveData = _responseCode - - fun itemShelvingLogGet(shelvingOrItem: String, records: Int = LIMITRECORDSSHELVINGLOG) { - //tarea 7168 - salix.itemShelvingLogGet( - filter = """{ "where": { "or": [ {"shelvingFk": "$shelvingOrItem"}, {"itemFk": "$shelvingOrItem"} ] }, - "limit": $records, - "order": "created DESC", - "include": [ { "relation": "worker", "scope": { "fields": ["code"]} }, - { "relation": "item", "scope": { "fields": ["longName"] } } ] } -""".trim() - ) - .enqueue(object : - SalixCallback>(context) { - override fun onSuccess(response: Response>) { - _itemShelvingLogList.value = response.body()?.let { - ItemShelvingLogList(it) - } - } - - }) - } - - fun getIdFromCodeSalix(code: String, records: Int) { - getItemFromBarcodeUseCase.execute (code) - .enqueue(object : SalixCallback(context) { - - override fun onSuccess(response: Response) { - itemShelvingLogGet(response.body()!!.toString(), records) - - } - }) - } - -} - - - - - - - - diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt deleted file mode 100644 index 289e9cf3..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/model/ItemShelvingLog.kt +++ /dev/null @@ -1,36 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicoshelving.model - -import es.verdnatura.domain.isoToString - - -data class ItemShelvingLog( - var itemFk: Int? = null, - var longName: String? = null, - var shelvingFk: String? = null, - var visible: Int? = null, - var accion: String? = null, - var code: String? = null, - var worker: Worker? = null, - var item:ItemSalix? = null -) { - var created: String = "" - get() { - return field.isoToString(returnOnlyDate = false) - } - -} - -data class ItemSalix(var longName: String?) - -data class ItemShelvingSaleDateList( - var list: List = listOf() -) - -data class ItemShelvingLogList( - var list: List = listOf() -) - -data class Worker( - var id:Int? , - var code: String, -) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt deleted file mode 100644 index 5541a237..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/adapter/HistoricoVehiculoAdapter.kt +++ /dev/null @@ -1,48 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicovehiculo.adapter -import android.view.LayoutInflater -import android.view.ViewGroup -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.RecyclerView -import es.verdnatura.R -import es.verdnatura.databinding.ItemHistoricovehiculoRowBinding -import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo -import java.text.SimpleDateFormat -import java.util.* - - - -class HistoricoVehiculoAdapter ( - private val items: List -): RecyclerView.Adapter () { - - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { - return ItemHolder( - ItemHistoricovehiculoRowBinding.inflate(LayoutInflater.from(parent.context),parent,false) - ) - } - - override fun getItemCount() =items.size - - override fun onBindViewHolder(holder: ItemHolder, position: Int) { - holder.bind(items[position]) - } - - inner class ItemHolder( - val binding: ItemHistoricovehiculoRowBinding - ) : RecyclerView.ViewHolder(binding.root){ - private val res = binding.root.context.resources - fun bind(item: ItemHistoricoVehiculo) { - binding.apply { - this.item = item - val sdf = SimpleDateFormat(binding.root.context.getString(R.string.dateFormat)) - val currentDate = sdf.format(Date()) - if (currentDate == item.inTimed){ - historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context,R.color.verdnatura_pumpkin_orange)) - }else{ - historicoDate.setBackgroundColor(ContextCompat.getColor(historicoDate.context,R.color.verdnatura_black_5)) - } - } - } - } -} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt deleted file mode 100644 index 6b85f725..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt +++ /dev/null @@ -1,93 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicovehiculo.fragment - -import android.view.View -import androidx.recyclerview.widget.LinearLayoutManager -import es.verdnatura.R -import es.verdnatura.databinding.FragmentHistoricovehiculoBinding -import es.verdnatura.domain.notNull -import es.verdnatura.presentation.base.BaseFragment -import es.verdnatura.presentation.view.feature.historicovehiculo.adapter.HistoricoVehiculoAdapter -import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculoList -import java.text.SimpleDateFormat -import java.util.Date -import java.util.Locale - -class HistoricoVehiculoFragment( - private var numberPlate: String = "" -) : BaseFragment( - HistoricoVehiculoViewModel::class -) { - - private var adapter: HistoricoVehiculoAdapter? = null - - companion object { - fun newInstance(entryPoint: String) = HistoricoVehiculoFragment(entryPoint) - } - - override fun getLayoutId(): Int = R.layout.fragment_historicovehiculo - - - override fun init() { - - ma.hideBottomNavigation(View.GONE) - viewModel.machineWorkeGetHistorical(numberPlate,mobileApplication.userId!!) - binding.mainToolbar.toolbarTitle.text = getString(R.string.vehiclediary) - setEvents() - super.init() - } - - private fun setEvents() { - binding.mainToolbar.backButton.setOnClickListener { - ma.onMyBackPressed() - } - } - - override fun observeViewModel() { - with(viewModel) { - loadHistoricoVehiculoList.observe(viewLifecycleOwner) { event -> - event.getContentIfNotHandled().notNull { - - if (it.list.isEmpty()) { - ma.messageWithSound( - getString(R.string.lookWithpermission), - isError = true, - isPlayed = true, - getString( - R.string.info - ) - ) - } else { - adapter = HistoricoVehiculoAdapter(it.list) - binding.historicovehiculoRecyclerview.adapter = adapter - binding.historicovehiculoRecyclerview.layoutManager = - LinearLayoutManager( - requireContext(), - LinearLayoutManager.VERTICAL, - false - ) - navigateToToday(it) - } - - } - } - } - } - - - private fun navigateToToday(it: ItemHistoricoVehiculoList) { - var positionToday = 0 - val sdf = SimpleDateFormat(getString(R.string.dateFormat), Locale.getDefault()) - val currentDate = sdf.format(Date()) - - for (item in it.list) { - if (currentDate == item.inTimed) { - break - } - positionToday += 1 - } - - binding.historicovehiculoRecyclerview.scrollToPosition(positionToday) - } - - -} \ No newline at end of file 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 deleted file mode 100644 index 31f26727..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt +++ /dev/null @@ -1,31 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicovehiculo.fragment - -import android.content.Context -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.map -import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.formatWithQuotes -import es.verdnatura.presentation.base.BaseViewModel -import es.verdnatura.presentation.common.Event -import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculo -import es.verdnatura.presentation.view.feature.historicovehiculo.model.ItemHistoricoVehiculoList -import retrofit2.Response - -class HistoricoVehiculoViewModel(var context: Context) : BaseViewModel(context) { - - private val _historicovehiculoList by lazy { MutableLiveData() } - val loadHistoricoVehiculoList: LiveData> = _historicovehiculoList.map { Event(it) } - - fun machineWorkeGetHistorical(plateNumber: String, workerId:Int) { - salix.machineWorkerGetHistorical(arrayListOf(plateNumber,workerId).formatWithQuotes()) - .enqueue(object : - SalixCallback>(context) { - override fun onSuccess(response: Response>) { - _historicovehiculoList.value = - response.body()?.let { ItemHistoricoVehiculoList(it) } - } - - }) - } -} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.kt deleted file mode 100644 index cbb6059d..00000000 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/model/ItemHistoricoVehiculo.kt +++ /dev/null @@ -1,22 +0,0 @@ -package es.verdnatura.presentation.view.feature.historicovehiculo.model - -import es.verdnatura.domain.isoToString - -class ItemHistoricoVehiculo( - var workerName: String? = null, - - ) { - var inTimed: String = "" - get() { - return field.isoToString() - } - var outTimed: String = "" - get() { - return field.isoToString() - } - -} - -class ItemHistoricoVehiculoList( - var list: List = listOf() -) 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 f2284b16..98ef724b 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 @@ -556,13 +556,6 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { ) ) - /* _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/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt index 8ea4852a..23258b51 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt @@ -16,7 +16,6 @@ import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnCollectionSelectedListener 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 @@ -131,8 +130,7 @@ class SacadorFragment( } } - - iconVehicleIn.drawable -> ma.onVehicleSelected(SacadorFragment.TAG) + iconPrint.drawable -> { showPrintPrevious() } 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 325fca9c..7703e0b2 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 @@ -16,7 +16,6 @@ import es.verdnatura.domain.toast 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.common.convertToDateString import es.verdnatura.presentation.view.component.CustomDialog @@ -134,7 +133,6 @@ class SacadorFragmentNew( } - iconVehicleIn.drawable -> ma.onVehicleSelected(SacadorFragment.TAG) iconPrint.drawable -> { showPrintPrevious() } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index 5b739ec7..96e5b85d 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -258,47 +258,6 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { }) } - fun hasItemOlder( - shelvingFk: String, - parking: String?, - itemFk: Int?, - action: Action?, - itemShelvingFk: Number? = null - - ) { - salix.getListItemNewerNew(shelvingFk, parking, itemFk) - //salix.getListItemNewer(shelvingFk, parking) - .enqueue(object : SalixCallback>(context) { - - override fun onSuccess(response: Response>) { - - if (response.body()!!.isEmpty()) { - when (action) { - Action.PARKINEAR -> setParking(shelvingFk, parking!!) - Action.TRANSFERIR -> { - itemShelvingTransfer(itemShelvingFk!!, shelvingFk) - } - - null -> setParking(shelvingFk, parking!!) - } - } else { - _shelvingListItemNewer.value = - response.body()?.let { - ItemShelvingNewerList( - it, - originalShelvingFk = shelvingFk, - originalParking = parking!!, - originalItem = itemFk, - originalAction = action - ) - } - } - - } - - }) - } - fun getItemsByReviewOrder( shelving: String, parking: String?, diff --git a/app/src/main/res/layout/fragment_buscar_item.xml b/app/src/main/res/layout/fragment_buscar_item.xml index 25e6c325..e5a0bb2a 100644 --- a/app/src/main/res/layout/fragment_buscar_item.xml +++ b/app/src/main/res/layout/fragment_buscar_item.xml @@ -63,6 +63,15 @@ android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> + + - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_itemshelvinglog.xml b/app/src/main/res/layout/fragment_itemshelvinglog.xml deleted file mode 100644 index 2eef8b24..00000000 --- a/app/src/main/res/layout/fragment_itemshelvinglog.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - -