verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #6964 feat:hasItemOlder

This commit is contained in:
Sergio De la torre 2024-04-19 10:02:04 +02:00
parent 01ca48a51c
commit a00bbce4aa
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
View File

@ -395,14 +395,10 @@ class UbicadorFragmentNew(
private fun customDialogActionParking() { private fun customDialogActionParking() {
parking = customDialogInput.getValue() parking = customDialogInput.getValue()
//Tarea 6964 viewModel.hasItemOlder(
/* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue(), shelvingFk, customDialogInput.getValue(),
action = Action.PARKINEAR action = Action.PARKINEAR
)*/
viewModel.setParking(
shelvingFk, customDialogInput.getValue()
) )
customDialogInput.dismiss() customDialogInput.dismiss()
} }
@ -523,37 +519,37 @@ class UbicadorFragmentNew(
} }
}) })
loadResponseHasOlder.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull {
responseHasOlder.observe(viewLifecycleOwner, Observer { customDialogOlder.setTitle(getString(R.string.info))
.setDescription(
// ma.messageWithSound("", true, true, "", false) getString(
customDialogOlder.setTitle(getString(R.string.info)) R.string.itemOlderInfo,
.setDescription( responseHasOlder.value!!.action
getString( )
R.string.itemOlderInfo,
responseHasOlder.value!!.action
) )
) .setOkButton(
.setOkButton( getString(R.string.ok)
getString(R.string.ok) ) {
) { when (responseHasOlder.value!!.action) {
when (responseHasOlder.value!!.action) { Action.PARKINEAR -> viewModel.setParking(
Action.PARKINEAR -> viewModel.setParking( responseHasOlder.value!!.shelvingFkIn,
responseHasOlder.value!!.shelvingFkIn, parking
parking )
)
Action.TRANSFERIR -> viewModel.itemShelvingTransfer( Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
responseHasOlder.value!!.itemFk!!, responseHasOlder.value!!.itemFk!!,
responseHasOlder.value!!.shelvingFkOut!! responseHasOlder.value!!.shelvingFkOut!!
) )
} }
customDialogOlder.dismiss() customDialogOlder.dismiss()
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {
customDialogOlder.dismiss() customDialogOlder.dismiss()
}.show() }.show()
}) }
}
} }
@ -856,12 +852,11 @@ class UbicadorFragmentNew(
private fun customDialogTransferAction(item: ItemUbicador) { private fun customDialogTransferAction(item: ItemUbicador) {
if (customDialogInput.getValue().isNotEmpty()) { if (customDialogInput.getValue().isNotEmpty()) {
/* Tarea 6964 viewModel.hasItemOlder(
viewModel.hasItemOlder(shelvingFkIn = shelvingFk , shelvingFkOut = customDialogInput.getValue(),itemFk = item.id, shelvingFkIn = shelvingFk,
shelvingFkOut = customDialogInput.getValue(),
itemFk = item.id,
action = Action.TRANSFERIR action = Action.TRANSFERIR
)*/
viewModel.itemShelvingTransfer(
item.id, customDialogInput.getValue()
) )
listItems.remove(item) listItems.remove(item)
adapter!!.notifyDataSetChanged() adapter!!.notifyDataSetChanged()

1
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt
View File

@ -36,6 +36,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) {
private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() } private val _responseHasOlder by lazy { MutableLiveData<ResponseHasOlder>() }
val responseHasOlder: LiveData<ResponseHasOlder> val responseHasOlder: LiveData<ResponseHasOlder>
get() = _responseHasOlder get() = _responseHasOlder
val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> = _responseHasOlder.map { Event(it) }
private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() } private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() }
val responsepriority: LiveData<ResponseItemVO> val responsepriority: LiveData<ResponseItemVO>