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() {
parking = customDialogInput.getValue()
//Tarea 6964
/* viewModel.hasItemOlder(shelvingFk,customDialogInput.getValue(),
action = Action.PARKINEAR
)*/
viewModel.setParking(
shelvingFk, customDialogInput.getValue()
viewModel.hasItemOlder(
shelvingFk, customDialogInput.getValue(),
action = Action.PARKINEAR
)
customDialogInput.dismiss()
}
@ -523,37 +519,37 @@ class UbicadorFragmentNew(
}
})
loadResponseHasOlder.observe(viewLifecycleOwner) { event ->
event.getContentIfNotHandled().notNull {
responseHasOlder.observe(viewLifecycleOwner, Observer {
// ma.messageWithSound("", true, true, "", false)
customDialogOlder.setTitle(getString(R.string.info))
.setDescription(
getString(
R.string.itemOlderInfo,
responseHasOlder.value!!.action
customDialogOlder.setTitle(getString(R.string.info))
.setDescription(
getString(
R.string.itemOlderInfo,
responseHasOlder.value!!.action
)
)
)
.setOkButton(
getString(R.string.ok)
) {
when (responseHasOlder.value!!.action) {
Action.PARKINEAR -> viewModel.setParking(
responseHasOlder.value!!.shelvingFkIn,
parking
)
.setOkButton(
getString(R.string.ok)
) {
when (responseHasOlder.value!!.action) {
Action.PARKINEAR -> viewModel.setParking(
responseHasOlder.value!!.shelvingFkIn,
parking
)
Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
responseHasOlder.value!!.itemFk!!,
responseHasOlder.value!!.shelvingFkOut!!
)
}
customDialogOlder.dismiss()
Action.TRANSFERIR -> viewModel.itemShelvingTransfer(
responseHasOlder.value!!.itemFk!!,
responseHasOlder.value!!.shelvingFkOut!!
)
}
customDialogOlder.dismiss()
}.setKoButton(getString(R.string.cancel)) {
customDialogOlder.dismiss()
}.show()
})
}.setKoButton(getString(R.string.cancel)) {
customDialogOlder.dismiss()
}.show()
}
}
}
@ -856,12 +852,11 @@ class UbicadorFragmentNew(
private fun customDialogTransferAction(item: ItemUbicador) {
if (customDialogInput.getValue().isNotEmpty()) {
/* Tarea 6964
viewModel.hasItemOlder(shelvingFkIn = shelvingFk , shelvingFkOut = customDialogInput.getValue(),itemFk = item.id,
viewModel.hasItemOlder(
shelvingFkIn = shelvingFk,
shelvingFkOut = customDialogInput.getValue(),
itemFk = item.id,
action = Action.TRANSFERIR
)*/
viewModel.itemShelvingTransfer(
item.id, customDialogInput.getValue()
)
listItems.remove(item)
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>() }
val responseHasOlder: LiveData<ResponseHasOlder>
get() = _responseHasOlder
val loadResponseHasOlder: LiveData<Event<ResponseHasOlder>> = _responseHasOlder.map { Event(it) }
private val _responsepriority by lazy { MutableLiveData<ResponseItemVO>() }
val responsepriority: LiveData<ResponseItemVO>